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

Timestamp:

02/02/2024 05:46:50 PM (8 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.

File:

• trunk/src/wp-includes/class-wp-image-editor-gd.php (modified) (4 diffs)

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

@@ -72 +72 @@
             case 'image/webp':
                 return ( $image_types & IMG_WEBP ) != 0;
+            case 'image/avif':
+                return ( $image_types & IMG_AVIF ) != 0;
         }
 
@@ -112 +114 @@
         }
 
+        // AVIF may not work with imagecreatefromstring().
+        if (
+            function_exists( 'imagecreatefromavif' ) &&
+            ( 'image/avif' === wp_get_image_mime( $this->file ) )
+        ) {
+            $this->image = @imagecreatefromavif( $this->file );
+        } else {
+            $this->image = @imagecreatefromstring( $file_contents );
+        }
+
         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' ) );
+            }
+        } elseif ( 'image/avif' == $mime_type ) {
+            if ( ! function_exists( 'imageavif' ) || ! $this->make_image( $filename, 'imageavif', 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() );
+                } else {
+                    // Fall back to JPEG.
+                    header( 'Content-Type: image/jpeg' );
+                    return imagejpeg( $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' );