Changeset 57524

Timestamp:

02/02/2024 05:46:50 PM (6 months ago)

Author:

adamsilverstein

Message:

Media: enable AVIF support.

Add support for uploading, editing and saving AVIF images when supported by the server.

Add 'image/avif' to supported mime types. Correctly identify AVIF images and sizes even when PHP doesn't support AVIF. Resize uploaded AVIF files (when supported) and use for front end markup.

Props adamsilverstein, lukefiretoss, ayeshrajans, navjotjsingh, Tyrannous, jb510, gregbenz, nickpagz, JavierCasares, mukesh27, yguyon, swissspidy.
Fixes #51228.

Location:

trunk

Files:

• phpcs.xml.dist (modified) (1 diff)
• src/js/_enqueues/vendor/plupload/handlers.js (modified) (1 diff)
• src/js/_enqueues/vendor/plupload/wp-plupload.js (modified) (1 diff)
• src/js/_enqueues/vendor/thickbox/thickbox.js (modified) (2 diffs)
• src/js/media/controllers/library.js (modified) (1 diff)
• src/wp-admin/includes/image-edit.php (modified) (2 diffs)
• src/wp-admin/includes/image.php (modified) (1 diff)
• src/wp-admin/includes/media.php (modified) (1 diff)
• src/wp-admin/includes/schema.php (modified) (1 diff)
• src/wp-includes/class-avif-info.php (added)
• src/wp-includes/class-wp-image-editor-gd.php (modified) (4 diffs)
• src/wp-includes/class-wp-image-editor-imagick.php (modified) (2 diffs)
• src/wp-includes/class-wp-image-editor.php (modified) (1 diff)
• src/wp-includes/class-wp-theme.php (modified) (1 diff)
• src/wp-includes/compat.php (modified) (1 diff)
• src/wp-includes/customize/class-wp-customize-media-control.php (modified) (1 diff)
• src/wp-includes/deprecated.php (modified) (2 diffs)
• src/wp-includes/formatting.php (modified) (1 diff)
• src/wp-includes/functions.php (modified) (5 diffs)
• src/wp-includes/media.php (modified) (5 diffs)
• src/wp-includes/post.php (modified) (1 diff)
• src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php (modified) (1 diff)
• tests/phpunit/data/images/avif-animated.avif (added)
• tests/phpunit/data/images/avif-lossless.avif (added)
• tests/phpunit/data/images/avif-lossy.avif (added)
• tests/phpunit/data/images/avif-transparent.avif (added)
• tests/phpunit/data/images/color_grid_alpha_nogrid.avif (added)
• tests/phpunit/data/images/colors_hdr_p3.avif (added)
• tests/phpunit/tests/functions.php (modified) (2 diffs)
• tests/phpunit/tests/image/editor.php (modified) (2 diffs)
• tests/phpunit/tests/image/functions.php (modified) (2 diffs)
• tests/phpunit/tests/image/resize.php (modified) (1 diff)

trunk/phpcs.xml.dist

@@ -60 +60 @@
     <exclude-pattern>/src/wp-includes/class-simplepie\.php</exclude-pattern>
     <exclude-pattern>/src/wp-includes/class-snoopy\.php</exclude-pattern>
+
     <exclude-pattern>/src/wp-includes/deprecated\.php</exclude-pattern>
     <exclude-pattern>/src/wp-includes/ms-deprecated\.php</exclude-pattern>

trunk/src/js/_enqueues/vendor/plupload/handlers.js

@@ -609 +609 @@
                     up.removeFile( file );
                     return;
+
+
+
+
+
                 }
 

trunk/src/js/_enqueues/vendor/plupload/wp-plupload.js

@@ -364 +364 @@
                     up.removeFile( file );
                     return;
+
+
+
+
+
                 }
 

trunk/src/js/_enqueues/vendor/thickbox/thickbox.js

@@ -77 +77 @@
        }
 
-       var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$|\.webp$/;
+       var urlString = /\.jpg$|\.jpeg$|\.png$|\.gif$|\.bmp$|\.webp$/;
        var urlType = baseURL.toLowerCase().match(urlString);
 
@@ -85 +85 @@
             urlType == '.gif' ||
             urlType == '.bmp' ||
-            urlType == '.webp'
+            urlType == '.webp' ||
+            urlType == '.avif'
         ){//code to show images
 

trunk/src/js/media/controllers/library.js

@@ -197 +197 @@
         // If uploading, we know the filename but not the mime type.
         if ( attachment.get('uploading') ) {
-            return /\.(jpe?g|png|gif|webp)$/i.test( attachment.get('filename') );
+            return /\.(jpe?g|png|gif|webp)$/i.test( attachment.get('filename') );
         }
 

trunk/src/wp-admin/includes/image-edit.php

@@ -391 +391 @@
                 }
                 return false;
+
+
+
+
+
+
             default:
                 return false;
@@ -493 +499 @@
                 if ( function_exists( 'imagewebp' ) ) {
                     return imagewebp( $image, $filename );
+
+
+
+
+
                 }
                 return false;

trunk/src/wp-admin/includes/image.php

@@ -1007 +1007 @@
  */
 function file_is_displayable_image( $path ) {
-    $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO, IMAGETYPE_WEBP );
+    $displayable_image_types = array( IMAGETYPE_GIF, IMAGETYPE_JPEG, IMAGETYPE_PNG, IMAGETYPE_BMP, IMAGETYPE_ICO, IMAGETYPE_WEBP );
 
     $info = wp_getimagesize( $path );

trunk/src/wp-admin/includes/media.php

@@ -2199 +2199 @@
     }
 
+
+
+
+
+
     /**
      * Filters the default Plupload settings.

trunk/src/wp-admin/includes/schema.php

@@ -1251 +1251 @@
         'gif',
         'webp',
+
         // Video.
         'mov',

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

@@ -72 +72 @@
             case 'image/webp':
                 return ( $image_types & IMG_WEBP ) != 0;
+
+
         }
 
@@ -112 +114 @@
         }
 
+
+
+
+
+
+
+
+
+
+
         if ( ! is_gd_image( $this->image ) ) {
             return new WP_Error( 'invalid_image', __( 'File is not an image.' ), $this->file );
@@ -512 +524 @@
         } elseif ( 'image/webp' == $mime_type ) {
             if ( ! function_exists( 'imagewebp' ) || ! $this->make_image( $filename, 'imagewebp', array( $image, $filename, $this->get_quality() ) ) ) {
+
+
+
+
                 return new WP_Error( 'image_save_error', __( 'Image Editor Save Failed' ) );
             }
@@ -562 +578 @@
                     header( 'Content-Type: image/webp' );
                     return imagewebp( $this->image, null, $this->get_quality() );
+
+
+
+
                 }
-                // Fall back to the default if webp isn't supported.
+            case 'image/avif':
+                if ( function_exists( 'imageavif' ) ) {
+                    header( 'Content-Type: image/avif' );
+                    return imageavif( $this->image, null, $this->get_quality() );
+                }
+                // Fall back to JPEG.
             default:
                 header( 'Content-Type: image/jpeg' );

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

@@ -220 +220 @@
                     }
                     break;
+
                 default:
                     $this->image->setImageCompressionQuality( $quality );
@@ -255 +256 @@
         if ( ! $height ) {
             $height = $size['height'];
+
+
+
+
+
+
+
+
+
+
         }
 

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

@@ -319 +319 @@
                 break;
             case 'image/jpeg':
+
             default:
                 $quality = $this->default_quality;

trunk/src/wp-includes/class-wp-theme.php

@@ -1264 +1264 @@
         }
 
-        foreach ( array( 'png', 'gif', 'jpg', 'jpeg', 'webp' ) as $ext ) {
+        foreach ( array( 'png', 'gif', 'jpg', 'jpeg', 'webp' ) as $ext ) {
             if ( file_exists( $this->get_stylesheet_directory() . "/screenshot.$ext" ) ) {
                 $this->cache_add( 'screenshot', 'screenshot.' . $ext );

trunk/src/wp-includes/compat.php

@@ -530 +530 @@
     define( 'IMG_WEBP', IMAGETYPE_WEBP );
 }
+
+
+
+
+
+
+
+
+
+

trunk/src/wp-includes/customize/class-wp-customize-media-control.php

@@ -94 +94 @@
                  */
                 $ext  = substr( $this->setting->default, -3 );
-                $type = in_array( $ext, array( 'jpg', 'png', 'gif', 'bmp', 'webp' ), true ) ? 'image' : 'document';
+                $type = in_array( $ext, array( 'jpg', 'png', 'gif', 'bmp', 'webp' ), true ) ? 'image' : 'document';
 
                 $default_attachment = array(

trunk/src/wp-includes/deprecated.php

@@ -3337 +3337 @@
             case 'image/webp':
                 return (imagetypes() & IMG_WEBP) != 0;
-        }
+            case 'image/avif':
+                return (imagetypes() & IMG_AVIF) != 0;
+            }
     } else {
         switch( $mime_type ) {
@@ -3348 +3350 @@
             case 'image/webp':
                 return function_exists('imagecreatefromwebp');
+
+
         }
     }

trunk/src/wp-includes/formatting.php

@@ -3465 +3465 @@
     $matches    = array();
     $ext        = preg_match( '/\.([^.]+)$/', $img, $matches ) ? strtolower( $matches[1] ) : false;
-    $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
+    $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
 
     // Don't convert smilies that aren't images - they're probably emoji.

trunk/src/wp-includes/functions.php

@@ -3118 +3118 @@
                     'image/tiff' => 'tif',
                     'image/webp' => 'webp',
+
                 )
             );
@@ -3296 +3297 @@
  * @since 4.7.1
  * @since 5.8.0 Added support for WebP images.
+
  *
  * @param string $file Full path to the file.
@@ -3350 +3352 @@
             $mime = 'image/webp';
         }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     } catch ( Exception $e ) {
         $mime = false;
@@ -3389 +3410 @@
             'tiff|tif'                     => 'image/tiff',
             'webp'                         => 'image/webp',
+
             'ico'                          => 'image/x-icon',
             'heic'                         => 'image/heic',
@@ -3510 +3532 @@
         'ext2type',
         array(
-            'image'       => array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico', 'heic', 'webp' ),
+            'image'       => array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'bmp', 'tif', 'tiff', 'ico', 'heic', 'webp' ),
             'audio'       => array( 'aac', 'ac3', 'aif', 'aiff', 'flac', 'm3a', 'm4a', 'm4b', 'mka', 'mp1', 'mp2', 'mp3', 'ogg', 'oga', 'ram', 'wav', 'wma' ),
             'video'       => array( '3g2', '3gp', '3gpp', 'asf', 'avi', 'divx', 'dv', 'flv', 'm4v', 'mkv', 'mov', 'mp4', 'mpeg', 'mpg', 'mpv', 'ogm', 'ogv', 'qt', 'rm', 'vob', 'wmv' ),

trunk/src/wp-includes/media.php

@@ -4101 +4101 @@
     require_once ABSPATH . WPINC . '/class-wp-image-editor-gd.php';
     require_once ABSPATH . WPINC . '/class-wp-image-editor-imagick.php';
+
     /**
      * Filters the list of image editing library classes.
@@ -4203 +4204 @@
     if ( ! wp_image_editor_supports( array( 'mime_type' => 'image/webp' ) ) ) {
         $defaults['webp_upload_error'] = true;
+
+
+
+
+
     }
 
@@ -5481 +5487 @@
  * @since 5.7.0
  * @since 5.8.0 Added support for WebP images.
+
  *
  * @param string $filename   The file path.
@@ -5513 +5520 @@
     }
 
-    if ( false !== $info ) {
+    if (
+        ! empty( $info ) &&
+        // Some PHP versions return 0x0 sizes from `getimagesize` for unrecognized image formats, including AVIFs.
+        ! ( empty( $info[0] ) && empty( $info[1] ) )
+    ) {
         return $info;
     }
@@ -5542 +5553 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     // The image could not be parsed.
     return false;
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }
 

trunk/src/wp-includes/post.php

@@ -6701 +6701 @@
     switch ( $type ) {
         case 'image':
-            $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
+            $image_exts = array( 'jpg', 'jpeg', 'jpe', 'gif', 'png', 'webp' );
             return in_array( $ext, $image_exts, true );
 

trunk/src/wp-includes/rest-api/endpoints/class-wp-rest-attachments-controller.php

@@ -457 +457 @@
         }
 
-        $supported_types = array( 'image/jpeg', 'image/png', 'image/gif', 'image/webp' );
+        $supported_types = array( 'image/jpeg', 'image/png', 'image/gif', 'image/webp' );
         $mime_type       = get_post_mime_type( $attachment_id );
         if ( ! in_array( $mime_type, $supported_types, true ) ) {

trunk/tests/phpunit/tests/functions.php

@@ -1371 +1371 @@
                 false,
             ),
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
         );
 
@@ -1496 +1516 @@
                 DIR_TESTDATA . '/uploads/dashicons.woff',
                 false,
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
             ),
         );

trunk/tests/phpunit/tests/image/editor.php

@@ -293 +293 @@
      */
     public function test_wp_get_webp_info( $file, $expected ) {
-        $editor = wp_get_image_editor( $file );
-
-        if ( is_wp_error( $editor ) || ! $editor->supports_mime_type( 'image/webp' ) ) {
-            $this->markTestSkipped( sprintf( 'No WebP support in the editor engine %s on this system.', $this->editor_engine ) );
-        }
-
         $file_data = wp_get_webp_info( $file );
         $this->assertSame( $expected, $file_data );
@@ -364 +358 @@
         );
     }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 }

trunk/tests/phpunit/tests/image/functions.php

@@ -112 +112 @@
             'webp-lossy.webp',
             'webp-transparent.webp',
+
+
+
+
         );
 
@@ -185 +189 @@
             $files[] = 'webp-lossy.webp';
             $files[] = 'webp-transparent.webp';
+
+
+
+
+
+
+
+
+
+
+
         }
 

trunk/tests/phpunit/tests/image/resize.php

@@ -89 +89 @@
     }
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     public function test_resize_larger() {
         // image_resize() should refuse to make an image larger.