Modern Image Formats: add AVIF output support

plugins/webp-uploads/helper.php

@@ -16,20 +16,24 @@
  * for example an image/jpeg can be converted into an image/webp.
  *
  * @since 1.0.0
+ * @since n.e.x.t Added support for AVIF.
  *
  * @return array<string, array<string>> An array of valid mime types, where the key is the mime type and the value is the extension type.
  */
 function webp_uploads_get_upload_image_mime_transforms() {
+
+	// Check the selected output format.
+	$output_format = get_option( 'perflab_generate_avif_and_webp', wp_image_editor_supports( array( 'mime_type' => 'image/avif' ) ) ?  'avif' : 'webp' );
+
 	$default_transforms = array(
-		'image/jpeg' => array( 'image/webp' ),
-		'image/webp' => array( 'image/webp' ),
+		'image/jpeg' => array( 'image/' . $output_format ),
 	);
 
-	// Check setting for whether to generate both JPEG and WebP.
+	// Check setting for whether to generate both JPEG and the modern output format.
 	if ( true === (bool) get_option( 'perflab_generate_webp_and_jpeg' ) ) {
 		$default_transforms = array(
-			'image/jpeg' => array( 'image/jpeg', 'image/webp' ),
-			'image/webp' => array( 'image/webp', 'image/jpeg' ),
+			'image/jpeg' => array( 'image/jpeg', 'image/' . $output_format ),
+			'image/' . $output_format => array( 'image/' . $output_format, 'image/jpeg' ),
 		);
 	}
 

plugins/webp-uploads/settings.php

@@ -12,11 +12,26 @@
 }
 
 /**
- * Registers setting for generating both JPEG and WebP versions for image uploads.
+ * Registers setting for generating JPEG in addition to the selected modern format for image uploads.
  *
  * @since 1.0.0
+ * @since n.e.x.t The setting was made more general to coveroutputting JPEG as a secondary type. The "webp" option naming
+ *        was left unchanged for backward compatibility.
+ * @since n.e.x.t The `perflab_generate_avif_and_webp` was added to enable selecting between AVIF and WebP output.
  */
 function webp_uploads_register_media_settings_field() {
+	if ( wp_image_editor_supports( array( 'mime_type' => 'image/avif' ) ) ) {
+		register_setting(
+			'media',
+			'perflab_generate_avif_and_webp',
+			array(
+				'type'         => 'string',
+				'default'      => 'avif',
+				'show_in_rest' => false,
+			)
+		);
+	}
+
 	register_setting(
 		'media',
 		'perflab_generate_webp_and_jpeg',
@@ -35,10 +50,24 @@ function webp_uploads_register_media_settings_field() {
  * @since 1.0.0
  */
 function webp_uploads_add_media_settings_field() {
+
+	// If AVIF is supported, add a dropdown to select the output format between AVIF and WebP.
+	if ( wp_image_editor_supports( array( 'mime_type' => 'image/avif' ) ) ) {
+		add_settings_field(
+			'perflab_generate_avif_and_webp',
+			__( 'Modern image format', 'webp-uploads' ),
+			'webp_uploads_generate_avif_webp_setting_callback',
+			'media',
+			is_multisite() ? 'default' : 'uploads',
+			array( 'class' => 'perflab-generate-avif-and-webp' )
+		);
+
+	}
+
 	// Add settings field.
 	add_settings_field(
 		'perflab_generate_webp_and_jpeg',
-		__( 'WebP and JPEG', 'webp-uploads' ),
+		__( 'Also output JPEG', 'webp-uploads' ),
 		'webp_uploads_generate_webp_jpeg_setting_callback',
 		'media',
 		is_multisite() ? 'default' : 'uploads',
@@ -48,45 +77,41 @@ function webp_uploads_add_media_settings_field() {
 add_action( 'admin_init', 'webp_uploads_add_media_settings_field' );
 
 /**
- * Renders the settings field for the 'perflab_generate_webp_and_jpeg' setting.
+ * Renders the settings field for the 'perflab_generate_avif_and_webp' setting.
  *
- * @since 1.0.0
+ * @since n.e.x.t
  */
-function webp_uploads_generate_webp_jpeg_setting_callback() {
-	if ( ! is_multisite() ) {
-		?>
-			</td>
-			<td class="td-full">
-		<?php
-	}
+function webp_uploads_generate_avif_webp_setting_callback() {
+
+	$selected = get_option( 'perflab_generate_avif_and_webp', 'avif' );
 	?>
-		<label for="perflab_generate_webp_and_jpeg">
-			<input name="perflab_generate_webp_and_jpeg" type="checkbox" id="perflab_generate_webp_and_jpeg" aria-describedby="perflab_generate_webp_and_jpeg_description" value="1"<?php checked( '1', get_option( 'perflab_generate_webp_and_jpeg' ) ); ?> />
-			<?php esc_html_e( 'Generate JPEG files in addition to WebP', 'webp-uploads' ); ?>
-		</label>
-		<p class="description" id="perflab_generate_webp_and_jpeg_description"><?php esc_html_e( 'Enabling JPEG in addition to WebP can improve compatibility, but will effectively double the filesystem storage use of your images.', 'webp-uploads' ); ?></p>
+			<label for="perflab_generate_avif_and_webp">
+				<select name="perflab_generate_avif_and_webp" id="perflab_generate_avif_and_webp" aria-describedby="perflab_generate_avif_and_webp_description">
+					<option value="webp"<?php selected( 'webp', $selected ); ?>><?php esc_html_e( 'WebP', 'webp-uploads' ); ?></option>
+					<option value="avif"<?php selected( 'avif', $selected ); ?>><?php esc_html_e( 'AVIF', 'webp-uploads' ); ?></option>
+				</select>
+				<?php esc_html_e( 'Generate images in this format', 'webp-uploads' ); ?>
+			</label>
+		<p class="description" id="perflab_generate_avif_and_webp_description"><?php esc_html_e( 'Select the format to use when generating new images from uploaded JPEGs.', 'webp-uploads' ); ?></p>
 	<?php
 }
 
 /**
- * Adds custom styles to hide specific elements in media settings.
+ * Renders the settings field for the 'perflab_generate_webp_and_jpeg' setting.
  *
  * @since 1.0.0
  */
-function webp_uploads_media_setting_style() {
-	if ( is_multisite() ) {
-		return;
-	}
+function webp_uploads_generate_webp_jpeg_setting_callback() {
+
 	?>
-	<style>
-		.form-table .perflab-generate-webp-and-jpeg th,
-		.form-table .perflab-generate-webp-and-jpeg td:not(.td-full) {
-			display: none;
-		}
-	</style>
+
+		<label for="perflab_generate_webp_and_jpeg">
+			<input name="perflab_generate_webp_and_jpeg" type="checkbox" id="perflab_generate_webp_and_jpeg" aria-describedby="perflab_generate_webp_and_jpeg_description" value="1"<?php checked( '1', get_option( 'perflab_generate_webp_and_jpeg' ) ); ?> />
+			<?php esc_html_e( 'Output JPEG images in addition to the modern format', 'webp-uploads' ); ?>
+		</label>
+		<p class="description" id="perflab_generate_webp_and_jpeg_description"><?php esc_html_e( 'Enabling JPEG in addition to AVIF or WebP can improve compatibility, but will increase the filesystem storage use of your images.', 'webp-uploads' ); ?></p>
 	<?php
 }
-add_action( 'admin_head-options-media.php', 'webp_uploads_media_setting_style' );
 
 /**
  * Adds a settings link to the plugin's action links.