Changeset 59247

Timestamp:

10/17/2024 05:03:23 PM (7 weeks ago)

Author:

adamsilverstein

Message:

Media: Ensure Imagick quality is set correctly.

Fix an issue where Imagick did not properly set image quality for AVIF images. Adds a call to setCompressionQuality where we currently call setImageCompressionQuality

Props: jamesosborne, adamsilverstein, mukeshpanchal27.

Fixes: #61614.

Location:

trunk

Files:

• src/wp-includes/class-wp-image-editor-imagick.php (modified) (3 diffs)
• tests/phpunit/tests/media.php (modified) (3 diffs)

trunk/src/wp-includes/class-wp-image-editor-imagick.php

@@ -207 +207 @@
                 case 'image/jpeg':
                     $this->image->setImageCompressionQuality( $quality );
+                    $this->image->setCompressionQuality( $quality );
                     $this->image->setImageCompression( imagick::COMPRESSION_JPEG );
                     break;
@@ -215 +216 @@
                         // Use WebP lossless settings.
                         $this->image->setImageCompressionQuality( 100 );
+                        $this->image->setCompressionQuality( 100 );
                         $this->image->setOption( 'webp:lossless', 'true' );
                         parent::set_quality( 100 );
                     } else {
                         $this->image->setImageCompressionQuality( $quality );
+                        $this->image->setCompressionQuality( $quality );
                     }
                     break;
@@ -225 +228 @@
                     $this->image->setOption( 'heic:speed', 7 );
                     $this->image->setImageCompressionQuality( $quality );
+                    $this->image->setCompressionQuality( $quality );
                     break;
                 default:
                     $this->image->setImageCompressionQuality( $quality );
+                    $this->image->setCompressionQuality( $quality );
             }
         } catch ( Exception $e ) {

trunk/tests/phpunit/tests/media.php

@@ -5392 +5392 @@
 
     /**
+     * Test AVIF quality filters.
+     *
+     * @ticket 61614
+     */
+    public function test_quality_with_avif_conversion_file_sizes() {
+        $temp_dir = get_temp_dir();
+        $file     = $temp_dir . '/33772.jpg';
+        copy( DIR_TESTDATA . '/images/33772.jpg', $file );
+
+        $editor = wp_get_image_editor( $file );
+        // Only continue if the server supports AVIF.
+        if ( ! $editor->supports_mime_type( 'image/avif' ) ) {
+            $this->markTestSkipped( 'AVIF is not supported by the selected image editor.' );
+        }
+
+        $attachment_id = self::factory()->attachment->create_object(
+            array(
+                'post_mime_type' => 'image/jpeg',
+                'file'           => $file,
+            )
+        );
+
+        // Test sizes with AVIF images.
+        add_filter( 'image_editor_output_format', array( $this, 'image_editor_output_avif' ) );
+        $avif_sizes = wp_generate_attachment_metadata( $attachment_id, $file );
+        remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_avif' ) );
+
+        // Set the compression quality to a lower setting and test again, verifying that file sizes are all smaller.
+        add_filter( 'image_editor_output_format', array( $this, 'image_editor_output_avif' ) );
+        add_filter( 'wp_editor_set_quality', array( $this, 'image_editor_change_quality_low' ) );
+        $smaller_avif_sizes = wp_generate_attachment_metadata( $attachment_id, $file );
+        remove_filter( 'wp_editor_set_quality', array( $this, 'image_editor_change_quality_low' ) );
+        remove_filter( 'image_editor_output_format', array( $this, 'image_editor_output_avif' ) );
+
+        // Sub-sizes: for each size, the AVIF should be smaller than the JPEG.
+        $sizes_to_compare = array_intersect_key( $avif_sizes['sizes'], $smaller_avif_sizes['sizes'] );
+
+        foreach ( $sizes_to_compare as $size => $size_data ) {
+            $this->assertLessThan( $avif_sizes['sizes'][ $size ]['filesize'], $smaller_avif_sizes['sizes'][ $size ]['filesize'] );
+        }
+    }
+
+    /**
      * Test that an image size isn't generated if it matches the original image size.
      *
@@ -6443 +6486 @@
 
     /**
+     * Output AVIF images.
+     */
+    public function image_editor_output_avif() {
+        return array( 'image/jpeg' => 'image/avif' );
+    }
+
+    /**
      * Changes the quality using very low quality for JPEGs and very high quality
      * for WebPs, used to verify the filter is applying correctly.
@@ -6461 +6511 @@
 
     /**
+     * Output only low quality images.
+     */
+    public function image_editor_change_quality_low( $quality ) {
+        return 15;
+    }
+
+    /**
      * Change the omit loading attribute threshold value.
      *