138 lines
6.1 KiB
Diff
138 lines
6.1 KiB
Diff
|
From 5176821735c397de2a108cd266a6c6759a5e0ffe Mon Sep 17 00:00:00 2001
|
||
|
|
From: David Rosca <nowrep@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@gmail.com>
|
||
|
|
Signed-off-by: David Rosca <nowrep@gmail.com>
|
||
|
|
Signed-off-by: Haihao Xiang <haihao.xiang@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
|
||
|
|
|