[mesa-freeworld/f40] Revert "sync with master"
by Leigh Scott
commit 3e41571bdf9f3784ed82fa8b9be203bf7dcef985
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 21 01:55:05 2024 +0100
Revert "sync with master"
This reverts commit a3108bede443a9c3661bd0ceb9582047e9292ffd.
mesa-freeworld.spec | 9 +-
revert-6746d4df-to-fix-av1-slice_data_offset.patch | 106 ---------------------
2 files changed, 1 insertion(+), 114 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 2e69a22..2dc2b91 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -71,7 +71,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 24.1.4
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 2%{?dist}
+Release: 1%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
URL: http://www.mesa3d.org
@@ -83,10 +83,6 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt
Source2: org.mesa3d.vaapi.freeworld.metainfo.xml
Source3: org.mesa3d.vdpau.freeworld.metainfo.xml
-# https://bugzilla.rpmfusion.org/show_bug.cgi?id=7007
-# https://gitlab.freedesktop.org/mesa/mesa/-/issues/11533
-Patch99: revert-6746d4df-to-fix-av1-slice_data_offset.patch
-
BuildRequires: meson >= 1.3.0
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -345,9 +341,6 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%endif
%changelog
-* Fri Jul 19 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.4-2
-- add revert-6746d4df-to-fix-av1-slice_data_offset.patch
-
* Thu Jul 18 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.4-1
- Update to 24.1.4
- Drop upstreamed patched
4 months
[mesa-freeworld] Revert "add revert-6746d4df-to-fix-av1-slice_data_offset.patch"
by Leigh Scott
commit abf2d4b89e5d9098f3ab30a8887a3f7a13047ffc
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 21 01:53:44 2024 +0100
Revert "add revert-6746d4df-to-fix-av1-slice_data_offset.patch"
This reverts commit 38e1308944bda0d50e104423e3fc0f87c8105e63.
mesa-freeworld.spec | 9 +-
revert-6746d4df-to-fix-av1-slice_data_offset.patch | 106 ---------------------
2 files changed, 1 insertion(+), 114 deletions(-)
---
diff --git a/mesa-freeworld.spec b/mesa-freeworld.spec
index 2e69a22..2dc2b91 100644
--- a/mesa-freeworld.spec
+++ b/mesa-freeworld.spec
@@ -71,7 +71,7 @@ Name: %{srcname}-freeworld
Summary: Mesa graphics libraries
%global ver 24.1.4
Version: %{lua:ver = string.gsub(rpm.expand("%{ver}"), "-", "~"); print(ver)}
-Release: 2%{?dist}
+Release: 1%{?dist}
License: MIT AND BSD-3-Clause AND SGI-B-2.0
URL: http://www.mesa3d.org
@@ -83,10 +83,6 @@ Source1: Mesa-MLAA-License-Clarification-Email.txt
Source2: org.mesa3d.vaapi.freeworld.metainfo.xml
Source3: org.mesa3d.vdpau.freeworld.metainfo.xml
-# https://bugzilla.rpmfusion.org/show_bug.cgi?id=7007
-# https://gitlab.freedesktop.org/mesa/mesa/-/issues/11533
-Patch99: revert-6746d4df-to-fix-av1-slice_data_offset.patch
-
BuildRequires: meson >= 1.3.0
BuildRequires: gcc
BuildRequires: gcc-c++
@@ -345,9 +341,6 @@ rm -fr %{buildroot}%{_libdir}/libVkLayer_MESA_device_select.so
%endif
%changelog
-* Fri Jul 19 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.4-2
-- add revert-6746d4df-to-fix-av1-slice_data_offset.patch
-
* Thu Jul 18 2024 Thorsten Leemhuis <fedora(a)leemhuis.info> - 24.1.4-1
- Update to 24.1.4
- Drop upstreamed patched
4 months
[ffmpeg/f40] fix
by Leigh Scott
commit 774c3dd1b1ac2162a7348d4734551de8f3033e20
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 21 01:30:22 2024 +0100
fix
...decode-Make-it-possible-to-send-multiple-.patch | 74 ++++++++++++++++++----
...av1-Avoid-sending-the-same-slice-buffer-m.patch | 9 ++-
2 files changed, 65 insertions(+), 18 deletions(-)
---
diff --git a/0001-lavc-vaapi_decode-Make-it-possible-to-send-multiple-.patch b/0001-lavc-vaapi_decode-Make-it-possible-to-send-multiple-.patch
index 34bca43..0ae7a76 100644
--- a/0001-lavc-vaapi_decode-Make-it-possible-to-send-multiple-.patch
+++ b/0001-lavc-vaapi_decode-Make-it-possible-to-send-multiple-.patch
@@ -1,28 +1,28 @@
-From 5176821735c397de2a108cd266a6c6759a5e0ffe Mon Sep 17 00:00:00 2001
+From fe9d889dcd79ea18d4dfaa39df4ddbd4c8c3b15c Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep(a)gmail.com>
Date: Wed, 8 May 2024 09:11:11 +0200
-Subject: [PATCH 1/2] lavc/vaapi_decode: Make it possible to send multiple
- slice params buffers
+Subject: [PATCH] lavc/vaapi_decode: Make it possible to send multiple slice
+ params buffers
Reviewed-by: Neal Gompa <ngompa13(a)gmail.com>
Signed-off-by: David Rosca <nowrep(a)gmail.com>
Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com>
-(cherry picked from commit fe9d889dcd79ea18d4dfaa39df4ddbd4c8c3b15c)
-
-[modified to drop h264/hevc/vc1 parts stripped in Fedora Linux]
---
libavcodec/vaapi_av1.c | 2 +-
libavcodec/vaapi_decode.c | 3 ++-
libavcodec/vaapi_decode.h | 1 +
+ libavcodec/vaapi_h264.c | 2 +-
+ libavcodec/vaapi_hevc.c | 4 ++--
libavcodec/vaapi_mjpeg.c | 2 +-
libavcodec/vaapi_mpeg2.c | 2 +-
libavcodec/vaapi_mpeg4.c | 2 +-
+ libavcodec/vaapi_vc1.c | 2 +-
libavcodec/vaapi_vp8.c | 2 +-
libavcodec/vaapi_vp9.c | 2 +-
- 8 files changed, 9 insertions(+), 7 deletions(-)
+ 11 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c
-index 1f9a6071ba..03771dd3e0 100644
+index f61bf63098..e184d01a43 100644
--- a/libavcodec/vaapi_av1.c
+++ b/libavcodec/vaapi_av1.c
@@ -409,7 +409,7 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
@@ -35,10 +35,10 @@ index 1f9a6071ba..03771dd3e0 100644
buffer,
size);
diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
-index ceac769c52..9344c21fd2 100644
+index 7f2fe032db..7c91d50f7b 100644
--- a/libavcodec/vaapi_decode.c
+++ b/libavcodec/vaapi_decode.c
-@@ -62,6 +62,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx,
+@@ -63,6 +63,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx,
int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
VAAPIDecodePicture *pic,
const void *params_data,
@@ -46,7 +46,7 @@ index ceac769c52..9344c21fd2 100644
size_t params_size,
const void *slice_data,
size_t slice_size)
-@@ -90,7 +91,7 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+@@ -88,7 +89,7 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
VASliceParameterBufferType,
@@ -67,6 +67,41 @@ index 6beda14e52..702171e108 100644
size_t params_size,
const void *slice_data,
size_t slice_size);
+diff --git a/libavcodec/vaapi_h264.c b/libavcodec/vaapi_h264.c
+index 55cf5a05ee..b47531ce1c 100644
+--- a/libavcodec/vaapi_h264.c
++++ b/libavcodec/vaapi_h264.c
+@@ -375,7 +375,7 @@ static int vaapi_h264_decode_slice(AVCodecContext *avctx,
+ slice_param.chroma_offset_l1);
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_hevc.c b/libavcodec/vaapi_hevc.c
+index 3bdd2dd1b8..3937b7574a 100644
+--- a/libavcodec/vaapi_hevc.c
++++ b/libavcodec/vaapi_hevc.c
+@@ -353,7 +353,7 @@ static int vaapi_hevc_end_frame(AVCodecContext *avctx)
+ if (pic->last_size) {
+ last_slice_param->LongSliceFlags.fields.LastSliceOfPic = 1;
+ ret = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic,
+- &pic->last_slice_param, slice_param_size,
++ &pic->last_slice_param, 1, slice_param_size,
+ pic->last_buffer, pic->last_size);
+ if (ret < 0)
+ goto fail;
+@@ -471,7 +471,7 @@ static int vaapi_hevc_decode_slice(AVCodecContext *avctx,
+
+ if (!sh->first_slice_in_pic_flag) {
+ err = ff_vaapi_decode_make_slice_buffer(avctx, &pic->pic,
+- &pic->last_slice_param, slice_param_size,
++ &pic->last_slice_param, 1, slice_param_size,
+ pic->last_buffer, pic->last_size);
+ pic->last_buffer = NULL;
+ pic->last_size = 0;
diff --git a/libavcodec/vaapi_mjpeg.c b/libavcodec/vaapi_mjpeg.c
index 5b8d47bb2a..9557cf5f9b 100644
--- a/libavcodec/vaapi_mjpeg.c
@@ -106,6 +141,19 @@ index 363b686e42..612de10cd7 100644
buffer, size);
if (err < 0) {
ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_vc1.c b/libavcodec/vaapi_vc1.c
+index 5594118a69..abbe877dd8 100644
+--- a/libavcodec/vaapi_vc1.c
++++ b/libavcodec/vaapi_vc1.c
+@@ -490,7 +490,7 @@ static int vaapi_vc1_decode_slice(AVCodecContext *avctx, const uint8_t *buffer,
+ };
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err < 0) {
+ ff_vaapi_decode_cancel(avctx, pic);
diff --git a/libavcodec/vaapi_vp8.c b/libavcodec/vaapi_vp8.c
index 31137a45bd..66fdde1f39 100644
--- a/libavcodec/vaapi_vp8.c
@@ -120,7 +168,7 @@ index 31137a45bd..66fdde1f39 100644
goto fail;
diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c
-index 9dc7d5e72b..ff11022db7 100644
+index b8e760c807..a28fc75a59 100644
--- a/libavcodec/vaapi_vp9.c
+++ b/libavcodec/vaapi_vp9.c
@@ -158,7 +158,7 @@ static int vaapi_vp9_decode_slice(AVCodecContext *avctx,
@@ -133,5 +181,5 @@ index 9dc7d5e72b..ff11022db7 100644
if (err) {
ff_vaapi_decode_cancel(avctx, pic);
--
-2.45.1
+2.25.1
diff --git a/0002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-m.patch b/0002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-m.patch
index 91d018a..4d9af55 100644
--- a/0002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-m.patch
+++ b/0002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-m.patch
@@ -1,7 +1,7 @@
-From 1740980b070897fd147b2d1a5259c9d7957d58a8 Mon Sep 17 00:00:00 2001
+From d2d911eb9a2fc6eb8d86b3ae025a56c1a2692fba Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep(a)gmail.com>
Date: Wed, 8 May 2024 09:11:13 +0200
-Subject: [PATCH 2/2] lavc/vaapi_av1: Avoid sending the same slice buffer
+Subject: [PATCH 1/1] lavc/vaapi_av1: Avoid sending the same slice buffer
multiple times
When there are multiple tiles in one slice buffer, use multiple slice
@@ -11,13 +11,12 @@ increasing the bitstream size the driver will need to upload to hw.
Reviewed-by: Neal Gompa <ngompa13(a)gmail.com>
Signed-off-by: David Rosca <nowrep(a)gmail.com>
Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com>
-(cherry picked from commit d2d911eb9a2fc6eb8d86b3ae025a56c1a2692fba)
---
libavcodec/vaapi_av1.c | 47 +++++++++++++++++++++++++++++-------------
1 file changed, 33 insertions(+), 14 deletions(-)
diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c
-index 03771dd3e0..ea8dd4d93d 100644
+index e184d01a43..fe0852318d 100644
--- a/libavcodec/vaapi_av1.c
+++ b/libavcodec/vaapi_av1.c
@@ -19,6 +19,7 @@
@@ -108,5 +107,5 @@ index 03771dd3e0..ea8dd4d93d 100644
const FFHWAccel ff_av1_vaapi_hwaccel = {
--
-2.45.1
+2.25.1
4 months
[ffmpeg/f40] Backport fixes for Mesa 24.0.6+ / 21.1.4+ changes for VA-API
by Leigh Scott
commit 6d25ae7fe97955a55c758edfa9d7c7e849cc24ba
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sun Jul 21 00:34:37 2024 +0100
Backport fixes for Mesa 24.0.6+ / 21.1.4+ changes for VA-API
...decode-Make-it-possible-to-send-multiple-.patch | 137 +++++++++++++++++++++
...av1-Avoid-sending-the-same-slice-buffer-m.patch | 112 +++++++++++++++++
ffmpeg.spec | 8 +-
3 files changed, 256 insertions(+), 1 deletion(-)
---
diff --git a/0001-lavc-vaapi_decode-Make-it-possible-to-send-multiple-.patch b/0001-lavc-vaapi_decode-Make-it-possible-to-send-multiple-.patch
new file mode 100644
index 0000000..34bca43
--- /dev/null
+++ b/0001-lavc-vaapi_decode-Make-it-possible-to-send-multiple-.patch
@@ -0,0 +1,137 @@
+From 5176821735c397de2a108cd266a6c6759a5e0ffe Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep(a)gmail.com>
+Date: Wed, 8 May 2024 09:11:11 +0200
+Subject: [PATCH 1/2] lavc/vaapi_decode: Make it possible to send multiple
+ slice params buffers
+
+Reviewed-by: Neal Gompa <ngompa13(a)gmail.com>
+Signed-off-by: David Rosca <nowrep(a)gmail.com>
+Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com>
+(cherry picked from commit fe9d889dcd79ea18d4dfaa39df4ddbd4c8c3b15c)
+
+[modified to drop h264/hevc/vc1 parts stripped in Fedora Linux]
+---
+ libavcodec/vaapi_av1.c | 2 +-
+ libavcodec/vaapi_decode.c | 3 ++-
+ libavcodec/vaapi_decode.h | 1 +
+ libavcodec/vaapi_mjpeg.c | 2 +-
+ libavcodec/vaapi_mpeg2.c | 2 +-
+ libavcodec/vaapi_mpeg4.c | 2 +-
+ libavcodec/vaapi_vp8.c | 2 +-
+ libavcodec/vaapi_vp9.c | 2 +-
+ 8 files changed, 9 insertions(+), 7 deletions(-)
+
+diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c
+index 1f9a6071ba..03771dd3e0 100644
+--- a/libavcodec/vaapi_av1.c
++++ b/libavcodec/vaapi_av1.c
+@@ -409,7 +409,7 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
+ .tg_end = s->tg_end,
+ };
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param,
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, 1,
+ sizeof(VASliceParameterBufferAV1),
+ buffer,
+ size);
+diff --git a/libavcodec/vaapi_decode.c b/libavcodec/vaapi_decode.c
+index ceac769c52..9344c21fd2 100644
+--- a/libavcodec/vaapi_decode.c
++++ b/libavcodec/vaapi_decode.c
+@@ -62,6 +62,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx,
+ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+ VAAPIDecodePicture *pic,
+ const void *params_data,
++ int nb_params,
+ size_t params_size,
+ const void *slice_data,
+ size_t slice_size)
+@@ -90,7 +91,7 @@ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+
+ vas = vaCreateBuffer(ctx->hwctx->display, ctx->va_context,
+ VASliceParameterBufferType,
+- params_size, 1, (void*)params_data,
++ params_size, nb_params, (void*)params_data,
+ &pic->slice_buffers[index]);
+ if (vas != VA_STATUS_SUCCESS) {
+ av_log(avctx, AV_LOG_ERROR, "Failed to create slice "
+diff --git a/libavcodec/vaapi_decode.h b/libavcodec/vaapi_decode.h
+index 6beda14e52..702171e108 100644
+--- a/libavcodec/vaapi_decode.h
++++ b/libavcodec/vaapi_decode.h
+@@ -73,6 +73,7 @@ int ff_vaapi_decode_make_param_buffer(AVCodecContext *avctx,
+ int ff_vaapi_decode_make_slice_buffer(AVCodecContext *avctx,
+ VAAPIDecodePicture *pic,
+ const void *params_data,
++ int nb_params,
+ size_t params_size,
+ const void *slice_data,
+ size_t slice_size);
+diff --git a/libavcodec/vaapi_mjpeg.c b/libavcodec/vaapi_mjpeg.c
+index 5b8d47bb2a..9557cf5f9b 100644
+--- a/libavcodec/vaapi_mjpeg.c
++++ b/libavcodec/vaapi_mjpeg.c
+@@ -131,7 +131,7 @@ static int vaapi_mjpeg_decode_slice(AVCodecContext *avctx,
+ sp.components[i].ac_table_selector = s->ac_index[i];
+ }
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), buffer, size);
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, 1, sizeof(sp), buffer, size);
+ if (err)
+ goto fail;
+
+diff --git a/libavcodec/vaapi_mpeg2.c b/libavcodec/vaapi_mpeg2.c
+index eeb4e87321..171a742c7f 100644
+--- a/libavcodec/vaapi_mpeg2.c
++++ b/libavcodec/vaapi_mpeg2.c
+@@ -162,7 +162,7 @@ static int vaapi_mpeg2_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
+ };
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err < 0) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_mpeg4.c b/libavcodec/vaapi_mpeg4.c
+index 363b686e42..612de10cd7 100644
+--- a/libavcodec/vaapi_mpeg4.c
++++ b/libavcodec/vaapi_mpeg4.c
+@@ -169,7 +169,7 @@ static int vaapi_mpeg4_decode_slice(AVCodecContext *avctx, const uint8_t *buffer
+ };
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err < 0) {
+ ff_vaapi_decode_cancel(avctx, pic);
+diff --git a/libavcodec/vaapi_vp8.c b/libavcodec/vaapi_vp8.c
+index 31137a45bd..66fdde1f39 100644
+--- a/libavcodec/vaapi_vp8.c
++++ b/libavcodec/vaapi_vp8.c
+@@ -209,7 +209,7 @@ static int vaapi_vp8_decode_slice(AVCodecContext *avctx,
+ for (i = 0; i < 8; i++)
+ sp.partition_size[i+1] = s->coeff_partition_size[i];
+
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, sizeof(sp), data, data_size);
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &sp, 1, sizeof(sp), data, data_size);
+ if (err)
+ goto fail;
+
+diff --git a/libavcodec/vaapi_vp9.c b/libavcodec/vaapi_vp9.c
+index 9dc7d5e72b..ff11022db7 100644
+--- a/libavcodec/vaapi_vp9.c
++++ b/libavcodec/vaapi_vp9.c
+@@ -158,7 +158,7 @@ static int vaapi_vp9_decode_slice(AVCodecContext *avctx,
+ }
+
+ err = ff_vaapi_decode_make_slice_buffer(avctx, pic,
+- &slice_param, sizeof(slice_param),
++ &slice_param, 1, sizeof(slice_param),
+ buffer, size);
+ if (err) {
+ ff_vaapi_decode_cancel(avctx, pic);
+--
+2.45.1
+
diff --git a/0002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-m.patch b/0002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-m.patch
new file mode 100644
index 0000000..91d018a
--- /dev/null
+++ b/0002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-m.patch
@@ -0,0 +1,112 @@
+From 1740980b070897fd147b2d1a5259c9d7957d58a8 Mon Sep 17 00:00:00 2001
+From: David Rosca <nowrep(a)gmail.com>
+Date: Wed, 8 May 2024 09:11:13 +0200
+Subject: [PATCH 2/2] lavc/vaapi_av1: Avoid sending the same slice buffer
+ multiple times
+
+When there are multiple tiles in one slice buffer, use multiple slice
+params to avoid sending the same slice buffer multiple times and thus
+increasing the bitstream size the driver will need to upload to hw.
+
+Reviewed-by: Neal Gompa <ngompa13(a)gmail.com>
+Signed-off-by: David Rosca <nowrep(a)gmail.com>
+Signed-off-by: Haihao Xiang <haihao.xiang(a)intel.com>
+(cherry picked from commit d2d911eb9a2fc6eb8d86b3ae025a56c1a2692fba)
+---
+ libavcodec/vaapi_av1.c | 47 +++++++++++++++++++++++++++++-------------
+ 1 file changed, 33 insertions(+), 14 deletions(-)
+
+diff --git a/libavcodec/vaapi_av1.c b/libavcodec/vaapi_av1.c
+index 03771dd3e0..ea8dd4d93d 100644
+--- a/libavcodec/vaapi_av1.c
++++ b/libavcodec/vaapi_av1.c
+@@ -19,6 +19,7 @@
+ */
+
+ #include "libavutil/frame.h"
++#include "libavutil/mem.h"
+ #include "hwaccel_internal.h"
+ #include "vaapi_decode.h"
+ #include "internal.h"
+@@ -42,6 +43,9 @@ typedef struct VAAPIAV1DecContext {
+ */
+ VAAPIAV1FrameRef ref_tab[AV1_NUM_REF_FRAMES];
+ AVFrame *tmp_frame;
++
++ int nb_slice_params;
++ VASliceParameterBufferAV1 *slice_params;
+ } VAAPIAV1DecContext;
+
+ static VASurfaceID vaapi_av1_surface_id(AV1Frame *vf)
+@@ -97,6 +101,8 @@ static int vaapi_av1_decode_uninit(AVCodecContext *avctx)
+ for (int i = 0; i < FF_ARRAY_ELEMS(ctx->ref_tab); i++)
+ av_frame_free(&ctx->ref_tab[i].frame);
+
++ av_freep(&ctx->slice_params);
++
+ return ff_vaapi_decode_uninit(avctx);
+ }
+
+@@ -393,13 +399,24 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
+ {
+ const AV1DecContext *s = avctx->priv_data;
+ VAAPIDecodePicture *pic = s->cur_frame.hwaccel_picture_private;
+- VASliceParameterBufferAV1 slice_param;
+- int err = 0;
++ VAAPIAV1DecContext *ctx = avctx->internal->hwaccel_priv_data;
++ int err, nb_params;
++
++ nb_params = s->tg_end - s->tg_start + 1;
++ if (ctx->nb_slice_params < nb_params) {
++ ctx->slice_params = av_realloc_array(ctx->slice_params,
++ nb_params,
++ sizeof(*ctx->slice_params));
++ if (!ctx->slice_params) {
++ ctx->nb_slice_params = 0;
++ err = AVERROR(ENOMEM);
++ goto fail;
++ }
++ ctx->nb_slice_params = nb_params;
++ }
+
+ for (int i = s->tg_start; i <= s->tg_end; i++) {
+- memset(&slice_param, 0, sizeof(VASliceParameterBufferAV1));
+-
+- slice_param = (VASliceParameterBufferAV1) {
++ ctx->slice_params[i - s->tg_start] = (VASliceParameterBufferAV1) {
+ .slice_data_size = s->tile_group_info[i].tile_size,
+ .slice_data_offset = s->tile_group_info[i].tile_offset,
+ .slice_data_flag = VA_SLICE_DATA_FLAG_ALL,
+@@ -408,18 +425,20 @@ static int vaapi_av1_decode_slice(AVCodecContext *avctx,
+ .tg_start = s->tg_start,
+ .tg_end = s->tg_end,
+ };
+-
+- err = ff_vaapi_decode_make_slice_buffer(avctx, pic, &slice_param, 1,
+- sizeof(VASliceParameterBufferAV1),
+- buffer,
+- size);
+- if (err) {
+- ff_vaapi_decode_cancel(avctx, pic);
+- return err;
+- }
+ }
+
++ err = ff_vaapi_decode_make_slice_buffer(avctx, pic, ctx->slice_params, nb_params,
++ sizeof(VASliceParameterBufferAV1),
++ buffer,
++ size);
++ if (err)
++ goto fail;
++
+ return 0;
++
++fail:
++ ff_vaapi_decode_cancel(avctx, pic);
++ return err;
+ }
+
+ const FFHWAccel ff_av1_vaapi_hwaccel = {
+--
+2.45.1
+
diff --git a/ffmpeg.spec b/ffmpeg.spec
index b2adaca..ba4c88d 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -98,7 +98,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.1.1
-Release: 13%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 14%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -113,6 +113,9 @@ Patch0: ffmpeg-chromium.patch
Patch1: https://src.fedoraproject.org/rpms/ffmpeg/raw/774d42a0072430fdef97ce11b40...
Patch2: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/42982b5a5d46153...
Patch3: https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff_plain/fef22c87ada4517...
+# Fixes for Mesa 24.0.6+ / 24.1.4+ VA-API
+Patch4: 0001-lavc-vaapi_decode-Make-it-possible-to-send-multiple-.patch
+Patch5: 0002-lavc-vaapi_av1-Avoid-sending-the-same-slice-buffer-m.patch
Conflicts: %{name}-free
Provides: %{name}-bin = %{version}-%{release}
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
@@ -531,6 +534,9 @@ cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \
%changelog
+* Sat Jul 20 2024 Neal Gompa <ngompa(a)fedoraproject.org> - 6.1.1-14
+- Backport fixes for Mesa 24.0.6+ / 21.1.4+ changes for VA-API
+
* Sat Jul 20 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-13
- rebuilt
4 months
[HandBrake] Update to 1.8.1
by Dominik Mierzejewski
Summary of changes:
7b54ff1... Update to 1.8.1 (*)
(*) This commit already existed in another branch; no separate mail sent
4 months
[HandBrake/f40] Update to 1.8.1
by Dominik Mierzejewski
commit 7b54ff1dafc62341febc04381207c449ad32d467
Author: Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net>
Date: Sat Jul 20 23:13:56 2024 +0200
Update to 1.8.1
HandBrake.spec | 9 ++++++---
sources | 4 ++--
2 files changed, 8 insertions(+), 5 deletions(-)
---
diff --git a/HandBrake.spec b/HandBrake.spec
index 072cc60..656d9bd 100644
--- a/HandBrake.spec
+++ b/HandBrake.spec
@@ -1,5 +1,5 @@
-%global commit0 86156a66c0d5ccc306487c1ff961a7b2328961b3
-%global date 20240210
+%global commit0 e9ff2bdf1ac670eb9c6d6170e27c999c05535127
+%global date 20240621
%global shortcommit0 %(c=%{commit0}; echo ${c:0:7})
%global tag %{version}
@@ -15,7 +15,7 @@
%global desktop_id fr.handbrake.ghb
Name: HandBrake
-Version: 1.8.0
+Version: 1.8.1
Release: 1%{!?tag:.%{date}git%{shortcommit}}%{?dist}
Summary: An open-source multiplatform video transcoder
License: GPLv2+
@@ -197,6 +197,9 @@ appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/%{desktop_id}.
%{_bindir}/HandBrakeCLI
%changelog
+* Sat Jul 20 2024 Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> - 1.8.1-1
+- Update to 1.8.1
+
* Sat Jun 08 2024 Dominik 'Rathann' Mierzejewski <dominik(a)greysector.net> - 1.8.0-1
- Update to 1.8.0
- Drop obsolete patch
diff --git a/sources b/sources
index 044ef7e..cdadef3 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (HandBrake-1.8.0-source.tar.bz2) = 9f1d0408500ee682525359c6444476eedf280b0913c0fbe6788586b2e05647e873388fdb533d9cf6fe9dd93ffb91ab464abdaaa7fed2de95ccb6d5d04f9b616c
-SHA512 (HandBrake-1.8.0-source.tar.bz2.sig) = 3757ed18ddb46724f5295680cea211a2724d027cbe3f82569efc8000c440ad8656e7df6889d339f0f5d1729744f7b847796c62585e6e5b0e601f7757f872928b
+SHA512 (HandBrake-1.8.1-source.tar.bz2) = f4d46d760cf7755225751cf97b0708ee190a872b372e8a64c2ab8b1127ded0a28d63ea3875e629cddd352348a39010e3d58f900fd5e895788e5a4151a0288035
+SHA512 (HandBrake-1.8.1-source.tar.bz2.sig) = ca7055b0ee7d47919eedaf42d8119cfb2382978fdabca002b9c16f6d942a7aca95731b199b730120792dc188176cfb275daab8307f5529575eb219556e172491
4 months
[mpd] fix
by Leigh Scott
commit b9bf5b97845c1ddcc90fdea302749b04457ab945
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 20 22:22:29 2024 +0100
fix
fmt11.patch | 79 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
mpd.spec | 2 ++
2 files changed, 81 insertions(+)
---
diff --git a/fmt11.patch b/fmt11.patch
new file mode 100644
index 0000000..d4dd971
--- /dev/null
+++ b/fmt11.patch
@@ -0,0 +1,79 @@
+From 1402869715e3efca87942d79c3173a6b21a6925d Mon Sep 17 00:00:00 2001
+From: Rudi Heitbaum <rudi(a)heitbaum.com>
+Date: Fri, 5 Jul 2024 14:27:45 +0000
+Subject: [PATCH] lib/fmt: support build with libfmt-11.0.0
+
+Upstream libfmt commit fmtlib/fmt@d707292
+now requires the format function to be const.
+
+Adjust the function prototype so it is const and can compile.
+
+Signed-off-by: Rudi Heitbaum <rudi(a)heitbaum.com>
+---
+ src/lib/ffmpeg/LibFmt.hxx | 2 +-
+ src/lib/fmt/AudioFormatFormatter.hxx | 4 ++--
+ src/lib/fmt/ExceptionFormatter.hxx | 2 +-
+ src/lib/fmt/PathFormatter.hxx | 2 +-
+ 4 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/lib/ffmpeg/LibFmt.hxx b/src/lib/ffmpeg/LibFmt.hxx
+index aa068711f3..dee83ed2d5 100644
+--- a/src/lib/ffmpeg/LibFmt.hxx
++++ b/src/lib/ffmpeg/LibFmt.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<AVSampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AVSampleFormat format, FormatContext &ctx) {
++ auto format(const AVSampleFormat format, FormatContext &ctx) const {
+ const char *name = av_get_sample_fmt_name(format);
+ if (name == nullptr)
+ name = "?";
+diff --git a/src/lib/fmt/AudioFormatFormatter.hxx b/src/lib/fmt/AudioFormatFormatter.hxx
+index e0ffb62160..8da98efd41 100644
+--- a/src/lib/fmt/AudioFormatFormatter.hxx
++++ b/src/lib/fmt/AudioFormatFormatter.hxx
+@@ -13,7 +13,7 @@ template<>
+ struct fmt::formatter<SampleFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const SampleFormat format, FormatContext &ctx) {
++ auto format(const SampleFormat format, FormatContext &ctx) const {
+ return formatter<string_view>::format(sample_format_to_string(format),
+ ctx);
+ }
+@@ -23,7 +23,7 @@ template<>
+ struct fmt::formatter<AudioFormat> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(const AudioFormat &af, FormatContext &ctx) {
++ auto format(const AudioFormat &af, FormatContext &ctx) const {
+ return formatter<string_view>::format(ToString(af).c_str(),
+ ctx);
+ }
+diff --git a/src/lib/fmt/ExceptionFormatter.hxx b/src/lib/fmt/ExceptionFormatter.hxx
+index 3f342df672..f08b3bb228 100644
+--- a/src/lib/fmt/ExceptionFormatter.hxx
++++ b/src/lib/fmt/ExceptionFormatter.hxx
+@@ -12,7 +12,7 @@ template<>
+ struct fmt::formatter<std::exception_ptr> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(std::exception_ptr e, FormatContext &ctx) {
++ auto format(std::exception_ptr e, FormatContext &ctx) const {
+ return formatter<string_view>::format(GetFullMessage(e), ctx);
+ }
+ };
+diff --git a/src/lib/fmt/PathFormatter.hxx b/src/lib/fmt/PathFormatter.hxx
+index e5ae89dec5..add06df81b 100644
+--- a/src/lib/fmt/PathFormatter.hxx
++++ b/src/lib/fmt/PathFormatter.hxx
+@@ -13,7 +13,7 @@ template<std::convertible_to<Path> T>
+ struct fmt::formatter<Path> : formatter<string_view>
+ {
+ template<typename FormatContext>
+- auto format(Path path, FormatContext &ctx) {
++ auto format(Path path, FormatContext &ctx) const {
+ return formatter<string_view>::format(path.ToUTF8(), ctx);
+ }
+ };
diff --git a/mpd.spec b/mpd.spec
index 41f4782..94c84c0 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -36,6 +36,8 @@ Source6: mpd.sysusers
Patch0: mpd-0.23-mpdconf.patch
Patch1: mpd-0.20-remove_NoNewPrivileges.patch
Patch2: timidity_path.patch
+# https://github.com/MusicPlayerDaemon/MPD/commit/1402869715e3efca87942d79c...
+Patch3: fmt11.patch
BuildRequires: alsa-lib-devel
BuildRequires: audiofile-devel
4 months
[mpd] Rebuild for new fmt version
by Leigh Scott
commit 80ab4877f42d7cba09deb3505d9fc8c7c6cdc012
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 20 20:19:06 2024 +0100
Rebuild for new fmt version
mpd.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/mpd.spec b/mpd.spec
index 4bc4b6e..41f4782 100644
--- a/mpd.spec
+++ b/mpd.spec
@@ -17,7 +17,7 @@
Name: mpd
Epoch: 1
Version: 0.23.15
-Release: 3%{?dist}
+Release: 4%{?dist}
Summary: The Music Player Daemon
License: GPLv2+
URL: https://www.musicpd.org
@@ -244,6 +244,9 @@ rm -rf %{buildroot}%{_docdir}/mpd/
%changelog
+* Sat Jul 20 2024 Leigh Scott <leigh123linux(a)gmail.com> - 1:0.23.15-4
+- Rebuild for new fmt version
+
* Sun Feb 04 2024 RPM Fusion Release Engineering <sergiomb(a)rpmfusion.org> - 1:0.23.15-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
4 months
[ffmpeg/f40] Rebuild
by Leigh Scott
commit 27a1c67c91ba992441c164462dd5f78370f4e1d1
Author: Leigh Scott <leigh123linux(a)gmail.com>
Date: Sat Jul 20 17:01:26 2024 +0100
Rebuild
ffmpeg.spec | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/ffmpeg.spec b/ffmpeg.spec
index 4f5b619..b2adaca 100644
--- a/ffmpeg.spec
+++ b/ffmpeg.spec
@@ -98,7 +98,7 @@ ExclusiveArch: armv7hnl
Summary: Digital VCR and streaming server
Name: ffmpeg%{?flavor}
Version: 6.1.1
-Release: 12%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
+Release: 13%{?date:.%{?date}%{?date:git}%{?rel}}%{?dist}
License: %{ffmpeg_license}
URL: https://ffmpeg.org/
%if 0%{?date}
@@ -531,6 +531,9 @@ cp -pa %{buildroot}%{_libdir}/libavcodec.so.* \
%changelog
+* Sat Jul 20 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-13
+- rebuilt
+
* Sun Jun 16 2024 Leigh Scott <leigh123linux(a)gmail.com> - 6.1.1-12
- rebuilt
4 months
[nvidia-open-kmod/el9] Update to 550.100
by Nicolas Chauvet
commit 957da31a22e41b5d99afb9f9a5879357497a5c16
Author: Nicolas Chauvet <kwizart(a)gmail.com>
Date: Fri Jul 19 19:28:29 2024 +0200
Update to 550.100
nvidia-open-kmod.spec | 5 ++++-
sources | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/nvidia-open-kmod.spec b/nvidia-open-kmod.spec
index f4f0e6b..bd48d26 100644
--- a/nvidia-open-kmod.spec
+++ b/nvidia-open-kmod.spec
@@ -10,7 +10,7 @@
Name: nvidia-open-kmod
Epoch: 3
-Version: 550.78
+Version: 550.100
# Taken over by kmodtool
Release: 1%{?dist}
Summary: NVIDIA open display driver kernel module
@@ -77,6 +77,9 @@ done
%changelog
+* Fri Jul 19 2024 Nicolas Chauvet <kwizart(a)gmail.com> - 3:550.100-1
+- Update to 550.100
+
* Fri Apr 26 2024 Leigh Scott <leigh123linux(a)gmail.com> - 3:550.78-1
- Update to 550.78 release
diff --git a/sources b/sources
index ccdbcf7..c996131 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (open-gpu-kernel-modules-550.78.tar.gz) = 2226b29d7606d92fc78bcc7489c88e44f5b675dc108843654c24cd56b075c318c3bc7df24acb0d3d82c57f6d5924701971a7864213fe2d76a1fae209f36b6da8
+SHA512 (open-gpu-kernel-modules-550.100.tar.gz) = 4125198fc714396a3b52f5cb8b849882376f1d5dc16db0a7ae41ae3e0db0149027503e74dfdf50dbde890c776e303e407534f0c5377b00e7c4b5876e5c553d0f
4 months