Add AVIF Thumbnail Generation

lib/composer/composer/autoload_classmap.php

@@ -1506,6 +1506,7 @@
     'OC\\Preview\\Watcher' => $baseDir . '/lib/private/Preview/Watcher.php',
     'OC\\Preview\\WatcherConnector' => $baseDir . '/lib/private/Preview/WatcherConnector.php',
     'OC\\Preview\\WebP' => $baseDir . '/lib/private/Preview/WebP.php',
+    'OC\\Preview\\AVIF' => $baseDir . '/lib/private/Preview/AVIF.php',
     'OC\\Preview\\XBitmap' => $baseDir . '/lib/private/Preview/XBitmap.php',
     'OC\\Profile\\Actions\\EmailAction' => $baseDir . '/lib/private/Profile/Actions/EmailAction.php',
     'OC\\Profile\\Actions\\FediverseAction' => $baseDir . '/lib/private/Profile/Actions/FediverseAction.php',

lib/composer/composer/autoload_static.php

@@ -1539,6 +1539,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Preview\\Watcher' => __DIR__ . '/../../..' . '/lib/private/Preview/Watcher.php',
         'OC\\Preview\\WatcherConnector' => __DIR__ . '/../../..' . '/lib/private/Preview/WatcherConnector.php',
         'OC\\Preview\\WebP' => __DIR__ . '/../../..' . '/lib/private/Preview/WebP.php',
+        'OC\\Preview\\AVIF' => __DIR__ . '/../../..' . '/lib/private/Preview/AVIF.php',
         'OC\\Preview\\XBitmap' => __DIR__ . '/../../..' . '/lib/private/Preview/XBitmap.php',
         'OC\\Profile\\Actions\\EmailAction' => __DIR__ . '/../../..' . '/lib/private/Profile/Actions/EmailAction.php',
         'OC\\Profile\\Actions\\FediverseAction' => __DIR__ . '/../../..' . '/lib/private/Profile/Actions/FediverseAction.php',

lib/private/Collaboration/Reference/LinkReferenceProvider.php

@@ -51,7 +51,8 @@ class LinkReferenceProvider implements IReferenceProvider {
 		'image/jpeg',
 		'image/gif',
 		'image/svg+xml',
-		'image/webp'
+		'image/webp',
+		'image/avif'
 	];
 
 	private IClientService $clientService;

lib/private/Preview/AVIF.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/**
+ * @copyright Copyright (c) 2018 Roeland Jago Douma <[email protected]>
+ *
+ * @author Roeland Jago Douma <[email protected]>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OC\Preview;
+
+use OCP\Files\FileInfo;
+
+class AVIF extends Image {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType(): string {
+		return '/image\/avif/';
+	}
+
+	public function isAvailable(FileInfo $file): bool {
+		return (bool)(imagetypes() & IMG_AVIF);
+	}
+}

lib/private/PreviewManager.php

@@ -314,6 +314,7 @@ protected function getEnabledDefaultProvider() {
 			Preview\XBitmap::class,
 			Preview\Krita::class,
 			Preview\WebP::class,
+			Preview\AVIF::class,
 		];
 
 		$this->defaultProviders = $this->config->getSystemValue('enabledPreviewProviders', array_merge([
@@ -361,6 +362,7 @@ protected function registerCoreProviders() {
 		$this->registerCoreProvider(Preview\BMP::class, '/image\/bmp/');
 		$this->registerCoreProvider(Preview\XBitmap::class, '/image\/x-xbitmap/');
 		$this->registerCoreProvider(Preview\WebP::class, '/image\/webp/');
+		$this->registerCoreProvider(Preview\AVIF::class, '/image\/avif/');
 		$this->registerCoreProvider(Preview\Krita::class, '/application\/x-krita/');
 		$this->registerCoreProvider(Preview\MP3::class, '/audio\/mpeg/');
 		$this->registerCoreProvider(Preview\OpenDocument::class, '/application\/vnd.oasis.opendocument.*/');

lib/private/legacy/OC_Image.php

@@ -54,6 +54,8 @@ class OC_Image implements \OCP\IImage {
 
 	// Default quality for jpeg images
 	protected const DEFAULT_JPEG_QUALITY = 80;
+	protected const DEFAULT_WEBP_QUALITY = 80;
+	protected const DEFAULT_AVIF_QUALITY = 80;
 
 	/** @var false|resource|\GdImage */
 	protected $resource = false; // tmp resource.
@@ -273,6 +275,12 @@ private function _output(?string $filePath = null, ?string $mimeType = null): bo
 				case 'image/jpeg':
 					$imageType = IMAGETYPE_JPEG;
 					break;
+				case 'image/webp':
+					$imageType = IMAGETYPE_WEBP;
+					break;
+				case 'image/avif':
+					$imageType = IMAGETYPE_JPEG;
+					break;
 				case 'image/png':
 					$imageType = IMAGETYPE_PNG;
 					break;
@@ -288,6 +296,19 @@ private function _output(?string $filePath = null, ?string $mimeType = null): bo
 			}
 		}
 
+		if ($this->mimeType !== 'image/gif') {
+			$preview_format = $this->config->getSystemValueString('preview_format', '');
+			switch ($preview_format) {
+				case 'webp':
+					$imageType = IMAGETYPE_WEBP;
+					break;
+				case 'avif':
+					$imageType = IMAGETYPE_AVIF;
+					break;
+				default:
+			}
+		}
+
 		switch ($imageType) {
 			case IMAGETYPE_GIF:
 				$retVal = imagegif($this->resource, $filePath);
@@ -297,6 +318,16 @@ private function _output(?string $filePath = null, ?string $mimeType = null): bo
 				imageinterlace($this->resource, (PHP_VERSION_ID >= 80000 ? true : 1));
 				$retVal = imagejpeg($this->resource, $filePath, $this->getJpegQuality());
 				break;
+			case "image/webp":
+				/** @psalm-suppress InvalidScalarArgument */
+				imageinterlace($this->resource, (PHP_VERSION_ID >= 80000 ? true : 1));
+				$retVal = imagewebp($this->resource, $filePath, $this->getWebpQuality());
+				break;
+			case "image/avif":
+				/** @psalm-suppress InvalidScalarArgument */
+				imageinterlace($this->resource, (PHP_VERSION_ID >= 80100 ? true : 1));
+				$retVal = imageavif($this->resource, $filePath, $this->getAvifQuality(), 10);
+				break;
 			case IMAGETYPE_PNG:
 				$retVal = imagepng($this->resource, $filePath);
 				break;
@@ -360,9 +391,23 @@ public function dataMimeType(): ?string {
 			return null;
 		}
 
+		if ($this->mimeType !== 'image/gif') {
+			$preview_format = $this->config->getSystemValueString('preview_format', '');
+			switch ($preview_format) {
+				case 'webp':
+					return 'image/webp';
+				case 'avif':
+					return 'image/avif';
+				default:
+			}
+		}
+
 		switch ($this->mimeType) {
 			case 'image/png':
 			case 'image/jpeg':
+			case 'image/webp':
+			case 'image/avif':
+				return 'image/jpeg';
 			case 'image/gif':
 				return $this->mimeType;
 			default:
@@ -378,7 +423,23 @@ public function data(): ?string {
 			return null;
 		}
 		ob_start();
-		switch ($this->mimeType) {
+		$imageType = $this->imageType;
+		if ($imageType == 'image/avif') {
+			$imageType = 'image/jpeg';
+		}
+		if ($imageType !== 'image/gif') {
+			$preview_format = $this->config->getSystemValueString('preview_format', '');
+			switch ($preview_format) {
+				case 'webp':
+					$imageType = 'image/webp';
+					break;
+				case 'avif':
+					$imageType = 'image/avif';
+					break;
+				default:
+			}
+		}
+		switch ($imageType) {
 			case "image/png":
 				$res = imagepng($this->resource);
 				break;
@@ -388,6 +449,16 @@ public function data(): ?string {
 				$quality = $this->getJpegQuality();
 				$res = imagejpeg($this->resource, null, $quality);
 				break;
+			case "image/webp":
+				/** @psalm-suppress InvalidScalarArgument */
+				imageinterlace($this->resource, (PHP_VERSION_ID >= 80000 ? true : 1));
+				$res = imagewebp($this->resource, null, $this->getWebpQuality());
+				break;
+			case "image/avif":
+				/** @psalm-suppress InvalidScalarArgument */
+				imageinterlace($this->resource, (PHP_VERSION_ID >= 80100 ? true : 1));
+				$res = imageavif($this->resource, null, $this->getAvifQuality(), 10);
+				break;
 			case "image/gif":
 				$res = imagegif($this->resource);
 				break;
@@ -421,6 +492,24 @@ protected function getJpegQuality(): int {
 		return min(100, max(10, (int) $quality));
 	}
 
+	protected function getWebpQuality(): int {
+		$quality = $this->config->getAppValue('preview', 'webp_quality', (string) self::DEFAULT_WEBP_QUALITY);
+		// TODO: remove when getAppValue is type safe
+		if ($quality === null) {
+			$quality = self::DEFAULT_WEBP_QUALITY;
+		}
+		return min(100, max(10, (int) $quality));
+	}
+
+	protected function getAvifQuality(): int {
+		$quality = $this->config->getAppValue('preview', 'avif_quality', (string) self::DEFAULT_AVIF_QUALITY);
+		// TODO: remove when getAppValue is type safe
+		if ($quality === null) {
+			$quality = self::DEFAULT_AVIF_QUALITY;
+		}
+		return min(100, max(10, (int) $quality));
+	}
+
 	/**
 	 * (I'm open for suggestions on better method name ;)
 	 * Get the orientation based on EXIF data.
@@ -714,6 +803,16 @@ public function loadFromFile($imagePath = false) {
 					$this->logger->debug('OC_Image->loadFromFile, WBMP images not supported: ' . $imagePath, ['app' => 'core']);
 				}
 				break;
+			case IMAGETYPE_AVIF:
+				if (imagetypes() & IMG_AVIF) {
+					if (!$this->checkImageSize($imagePath)) {
+						return false;
+					}
+					$this->resource = @imagecreatefromavif($imagePath);
+				} else {
+					$this->logger->debug('OC_Image->loadFromFile, AVIF images not supported: ' . $imagePath, ['app' => 'core']);
+				}
+				break;
 			case IMAGETYPE_BMP:
 				$this->resource = imagecreatefrombmp($imagePath);
 				break;

resources/config/mimetypemapping.dist.json

@@ -207,6 +207,7 @@
 	"webloc": ["application/internet-shortcut"],
 	"webm": ["video/webm"],
 	"webp": ["image/webp"],
+	"avif": ["image/avif"],
 	"wmv": ["video/x-ms-wmv"],
 	"woff": ["application/font-woff"],
 	"wpd": ["application/vnd.wordperfect"],