[rpms/libavif] epel9-next: Fix build with SVT-AV1 2.0.0

A new commit has been pushed.

Repo   : rpms/libavif
Branch : epel9-next
Commit : 384761e159d781a4621d1127a5fd9ad2f355278b
Author : Robert-André Mauchin <zebob.m@gmail.com>
Date   : 2024-04-13T21:52:47+02:00
Stats  : +94/-16 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/libavif/c/384761e159d781a4621d1127a5fd9ad2f355278b?branch=epel9-next

Log:
Fix build with SVT-AV1 2.0.0

---
diff --git a/.gitignore b/.gitignore
index 2b4499f..51eaeea 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,3 @@
-/libavif-0.5.7.tar.gz
-/libavif-0.7.1.tar.gz
-/libavif-0.7.2.tar.gz
-/libavif-0.7.3.tar.gz
-/libavif-0.8.0.tar.gz
-/libavif-0.8.1.tar.gz
-/libavif-0.8.2.tar.gz
-/libavif-0.8.4.tar.gz
-/libavif-0.9.0.tar.gz
-/libavif-0.9.1.tar.gz
-/libavif-0.9.2.tar.gz
-/libavif-0.9.3.tar.gz
-/libavif-0.10.1.tar.gz
-/libavif-0.11.1.tar.gz
-/libavif-1.0.3.tar.gz
-/libavif-1.0.4.tar.gz
+/libavif-*.tar.gz
+/results_*
+/*.rpm

diff --git a/b10d2697e9ed2fb09cb722335ff4342c353612b8.patch b/b10d2697e9ed2fb09cb722335ff4342c353612b8.patch
new file mode 100644
index 0000000..eda87e2
--- /dev/null
+++ b/b10d2697e9ed2fb09cb722335ff4342c353612b8.patch
@@ -0,0 +1,88 @@
+From b10d2697e9ed2fb09cb722335ff4342c353612b8 Mon Sep 17 00:00:00 2001
+From: Yannis Guyon <yguyon@google.com>
+Date: Mon, 12 Feb 2024 10:29:02 +0000
+Subject: [PATCH] Encode alpha as 4:2:0 with SVT (#2004)
+
+---
+ src/codec_svt.c | 32 ++++++++++++++++++++++++++++++--
+ 1 file changed, 30 insertions(+), 2 deletions(-)
+
+diff --git a/src/codec_svt.c b/src/codec_svt.c
+index 58a92cdce..ea9efc2b5 100644
+--- a/src/codec_svt.c
++++ b/src/codec_svt.c
+@@ -7,6 +7,7 @@
+ 
+ #include "svt-av1/EbSvtAv1Enc.h"
+ 
++#include <stdint.h>
+ #include <string.h>
+ 
+ // The SVT_AV1_VERSION_MAJOR, SVT_AV1_VERSION_MINOR, SVT_AV1_VERSION_PATCHLEVEL, and
+@@ -76,6 +77,7 @@ static avifResult svtCodecEncodeImage(avifCodec * codec,
+ 
+     avifResult result = AVIF_RESULT_UNKNOWN_ERROR;
+     EbColorFormat color_format = EB_YUV420;
++    uint8_t * uvPlanes = NULL; // 4:2:0 U and V placeholder for alpha because SVT-AV1 does not support 4:0:0.
+     EbBufferHeaderType * input_buffer = NULL;
+     EbErrorType res = EB_ErrorNone;
+ 
+@@ -98,6 +100,7 @@ static avifResult svtCodecEncodeImage(avifCodec * codec,
+                 y_shift = 1;
+                 break;
+             case AVIF_PIXEL_FORMAT_YUV400:
++                // Setting color_format = EB_YUV400; results in "Svt[error]: Instance 1: Only support 420 now".
+             case AVIF_PIXEL_FORMAT_NONE:
+             case AVIF_PIXEL_FORMAT_COUNT:
+             default:
+@@ -198,16 +201,38 @@ static avifResult svtCodecEncodeImage(avifCodec * codec,
+     }
+     EbSvtIOFormat * input_picture_buffer = (EbSvtIOFormat *)input_buffer->p_buffer;
+ 
+-    int bytesPerPixel = image->depth > 8 ? 2 : 1;
++    const uint32_t bytesPerPixel = image->depth > 8 ? 2 : 1;
++    const uint32_t uvHeight = (image->height + y_shift) >> y_shift;
+     if (alpha) {
+         input_picture_buffer->y_stride = image->alphaRowBytes / bytesPerPixel;
+         input_picture_buffer->luma = image->alphaPlane;
+         input_buffer->n_filled_len = image->alphaRowBytes * image->height;
++
++#if SVT_AV1_CHECK_VERSION(1, 8, 0)
++        // Simulate 4:2:0 UV planes. SVT-AV1 does not support 4:0:0 samples.
++        const uint32_t uvWidth = (image->width + y_shift) >> y_shift;
++        const uint32_t uvRowBytes = uvWidth * bytesPerPixel;
++        const uint32_t uvSize = uvRowBytes * uvHeight;
++        uvPlanes = avifAlloc(uvSize);
++        if (uvPlanes == NULL) {
++            goto cleanup;
++        }
++        memset(uvPlanes, 0, uvSize);
++        input_picture_buffer->cb = uvPlanes;
++        input_buffer->n_filled_len += uvSize;
++        input_picture_buffer->cr = uvPlanes;
++        input_buffer->n_filled_len += uvSize;
++        input_picture_buffer->cb_stride = uvWidth;
++        input_picture_buffer->cr_stride = uvWidth;
++#else
++        // This workaround was not needed before SVT-AV1 1.8.0.
++        // See https://github.com/AOMediaCodec/libavif/issues/1992.
++        (void)uvPlanes;
++#endif
+     } else {
+         input_picture_buffer->y_stride = image->yuvRowBytes[0] / bytesPerPixel;
+         input_picture_buffer->luma = image->yuvPlanes[0];
+         input_buffer->n_filled_len = image->yuvRowBytes[0] * image->height;
+-        uint32_t uvHeight = (image->height + y_shift) >> y_shift;
+         input_picture_buffer->cb = image->yuvPlanes[1];
+         input_buffer->n_filled_len += image->yuvRowBytes[1] * uvHeight;
+         input_picture_buffer->cr = image->yuvPlanes[2];
+@@ -232,6 +257,9 @@ static avifResult svtCodecEncodeImage(avifCodec * codec,
+ 
+     result = dequeue_frame(codec, output, AVIF_FALSE);
+ cleanup:
++    if (uvPlanes) {
++        avifFree(uvPlanes);
++    }
+     if (input_buffer) {
+         if (input_buffer->p_buffer) {
+             avifFree(input_buffer->p_buffer);

diff --git a/libavif.spec b/libavif.spec
index 671cad2..f23d066 100644
--- a/libavif.spec
+++ b/libavif.spec
@@ -23,6 +23,9 @@ License:        BSD-2-Clause
 URL:            https://github.com/AOMediaCodec/libavif
 Source0:        %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
 
+# Encode alpha as 4:2:0 with SVT. Fix build with SVT-AV1 2.0.0
+Patch0:         https://github.com/AOMediaCodec/libavif/commit/b10d2697e9ed2fb09cb722335ff4342c353612b8.patch
+
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 %{?with_check:%{?with_gtest:BuildRequires:  gtest-devel}}