aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorHaihao Xiang <haihao.xiang@intel.com>2022-01-24 16:24:53 +0800
committerHaihao Xiang <haihao.xiang@intel.com>2022-01-29 12:02:52 +0800
commit8dd507bf0daa826691ea5960ed5634233518c57c (patch)
tree232be29bb0228e6bf0c94c8078925fa219a73205 /libavcodec
parent80801e570566976195f515216de4403cdcf4f7a3 (diff)
downloadffmpeg-8dd507bf0daa826691ea5960ed5634233518c57c.tar.gz
lavc/qsv: allow to add more parameter buffers to QSV frame
Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/qsv.c27
-rw-r--r--libavcodec/qsv_internal.h8
-rw-r--r--libavcodec/qsvdec.c8
3 files changed, 39 insertions, 4 deletions
diff --git a/libavcodec/qsv.c b/libavcodec/qsv.c
index 9d08485c92..1a432dbd82 100644
--- a/libavcodec/qsv.c
+++ b/libavcodec/qsv.c
@@ -828,3 +828,30 @@ int ff_qsv_close_internal_session(QSVSession *qs)
#endif
return 0;
}
+
+void ff_qsv_frame_add_ext_param (AVCodecContext *avctx, QSVFrame *frame,
+ mfxExtBuffer * param)
+{
+ int i;
+
+ for (i = 0; i < frame->num_ext_params; i++) {
+ mfxExtBuffer *ext_buffer = frame->ext_param[i];
+
+ if (ext_buffer->BufferId == param->BufferId) {
+ av_log(avctx, AV_LOG_WARNING, "A buffer with the same type has been "
+ "added\n");
+ return;
+ }
+ }
+
+ if (frame->num_ext_params < QSV_MAX_FRAME_EXT_PARAMS) {
+ frame->ext_param[frame->num_ext_params] = param;
+ frame->num_ext_params++;
+ frame->surface.Data.NumExtParam = frame->num_ext_params;
+ } else {
+ av_log(avctx, AV_LOG_WARNING, "Ignore this extra buffer because do not "
+ "have enough space\n");
+ }
+
+
+}
diff --git a/libavcodec/qsv_internal.h b/libavcodec/qsv_internal.h
index fe9d5319c4..6a38e87d23 100644
--- a/libavcodec/qsv_internal.h
+++ b/libavcodec/qsv_internal.h
@@ -52,6 +52,8 @@
#define QSV_MAX_ENC_PAYLOAD 2 // # of mfxEncodeCtrl payloads supported
+#define QSV_MAX_FRAME_EXT_PARAMS 4
+
#define QSV_VERSION_ATLEAST(MAJOR, MINOR) \
(MFX_VERSION_MAJOR > (MAJOR) || \
MFX_VERSION_MAJOR == (MAJOR) && MFX_VERSION_MINOR >= (MINOR))
@@ -74,7 +76,8 @@ typedef struct QSVFrame {
mfxFrameSurface1 surface;
mfxEncodeCtrl enc_ctrl;
mfxExtDecodedFrameInfo dec_info;
- mfxExtBuffer *ext_param;
+ mfxExtBuffer *ext_param[QSV_MAX_FRAME_EXT_PARAMS];
+ int num_ext_params;
mfxPayload *payloads[QSV_MAX_ENC_PAYLOAD]; ///< used for enc_ctrl.Payload
@@ -138,4 +141,7 @@ int ff_qsv_init_session_frames(AVCodecContext *avctx, mfxSession *session,
int ff_qsv_find_surface_idx(QSVFramesContext *ctx, QSVFrame *frame);
+void ff_qsv_frame_add_ext_param(AVCodecContext *avctx, QSVFrame *frame,
+ mfxExtBuffer *param);
+
#endif /* AVCODEC_QSV_INTERNAL_H */
diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index d9e0fef1f1..783d252002 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -423,11 +423,13 @@ static int alloc_frame(AVCodecContext *avctx, QSVContext *q, QSVFrame *frame)
frame->surface.Data.MemId = &q->frames_ctx.mids[ret];
}
- frame->surface.Data.ExtParam = &frame->ext_param;
- frame->surface.Data.NumExtParam = 1;
- frame->ext_param = (mfxExtBuffer*)&frame->dec_info;
+
+ frame->surface.Data.ExtParam = frame->ext_param;
+ frame->surface.Data.NumExtParam = 0;
+ frame->num_ext_params = 0;
frame->dec_info.Header.BufferId = MFX_EXTBUFF_DECODED_FRAME_INFO;
frame->dec_info.Header.BufferSz = sizeof(frame->dec_info);
+ ff_qsv_frame_add_ext_param(avctx, frame, (mfxExtBuffer *)&frame->dec_info);
frame->used = 1;