Skip to content

Add AVIF Thumbnail Generation #40048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
JanisPlayer wants to merge 19 commits into
base: master
Choose a base branch
from
Open

Add AVIF Thumbnail Generation #40048

Changes from 1 commit
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
3ca2e2d
Create AVIF.php
JanisPlayer Aug 25, 2023
e4f0d9c
add AVIF
JanisPlayer Aug 25, 2023
4068ca3
add AVIF
JanisPlayer Aug 25, 2023
af2f4f6
add AVIF
JanisPlayer Aug 25, 2023
ddab01c
add AVIF
JanisPlayer Aug 25, 2023
aa3fb33
add AVIF
JanisPlayer Aug 25, 2023
497a641
add AVIF
JanisPlayer Aug 25, 2023
55d6973
Change mimeType for AVIF previews to JPEG
JanisPlayer Sep 10, 2023
59bb879
Template for AVIF as preview format removed
JanisPlayer Sep 10, 2023
276d473
Experimental support for WebP and AVIF as a preview
JanisPlayer Sep 10, 2023
0710c14
experimental default format for AVIF is JPEG
JanisPlayer Sep 11, 2023
c622c48
Remove Licence
JanisPlayer Oct 18, 2023
e8b23b5
Add AVIF
JanisPlayer Oct 18, 2023
45b5596
Set default AVIF quality to 50
JanisPlayer Oct 18, 2023
b5fa45a
Merge branch 'master' into JanisPlayer-patch-1
JanisPlayer Oct 18, 2023
bf0aa68
Merge branch 'master' into JanisPlayer-patch-1
JanisPlayer Apr 28, 2024
e5ac220
Add avif
JanisPlayer Apr 28, 2024
cd78b74
Fixed conflicts in Image.php and mimetypemapping.dist.json
Apr 11, 2025
c5a560e
Add irot-based rotation support for AVIF images
JanisPlayer May 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
experimental default format for AVIF is JPEG 
_output() is maybe useless
WebP have longer time to encode as PNG and JPEG, maybe remove it too by default for WebP.

Signed-off-by: JanisPlayer <[email protected]>
  • Loading branch information
@JanisPlayer
JanisPlayer authored Sep 11, 2023
commit 0710c149808d7fa5744e0ff092179d82456262d0
44 changes: 35 additions & 9 deletions lib/private/legacy/OC_Image.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -279,7 +279,7 @@ private function _output(?string $filePath = null, ?string $mimeType = null): bo
$imageType = IMAGETYPE_WEBP;
break;
case 'image/avif':
$imageType = IMAGETYPE_AVIF;
$imageType = IMAGETYPE_JPEG;
break;
case 'image/png':
$imageType = IMAGETYPE_PNG;
Expand All @@ -296,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;

Check failure

Code scanning / Psalm

UndefinedConstant

Const IMAGETYPE_AVIF is not defined
break;
default:
}
}

switch ($imageType) {
case IMAGETYPE_GIF:
$retVal = imagegif($this->resource, $filePath);
Expand All @@ -307,7 +320,7 @@ private function _output(?string $filePath = null, ?string $mimeType = null): bo
break;
case "image/webp":
/** @psalm-suppress InvalidScalarArgument */
imageinterlace($this->resource, (PHP_VERSION_ID >= 80100 ? true : 1));
imageinterlace($this->resource, (PHP_VERSION_ID >= 80000 ? true : 1));
$retVal = imagewebp($this->resource, $filePath, $this->getWebpQuality());
break;
case "image/avif":
Expand Down Expand Up @@ -379,15 +392,12 @@ public function dataMimeType(): ?string {
}

if ($this->mimeType !== 'image/gif') {
$preview_format = $this->config->getSystemValueString('preview_format', 'jpeg');

switch ($preview_format) { // Change the format to the correct one
$preview_format = $this->config->getSystemValueString('preview_format', '');
switch ($preview_format) {
case 'webp':
return 'image/webp';
break;
case 'avif':
return 'image/avif';
break;
default:
}
}
Expand All @@ -413,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;
Expand All @@ -425,7 +451,7 @@ public function data(): ?string {
break;
case "image/webp":
/** @psalm-suppress InvalidScalarArgument */
imageinterlace($this->resource, (PHP_VERSION_ID >= 80100 ? true : 1));
imageinterlace($this->resource, (PHP_VERSION_ID >= 80000 ? true : 1));
$res = imagewebp($this->resource, null, $this->getWebpQuality());
break;
case "image/avif":
Expand Down