MrBesen/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

libavcodec/qsvdec: using suggested num to set init_pool_size

Browse Source 
The init_pool_size is set to be 64 and it is too many.
Use IOSurfQuery to get NumFrameSuggest which is the suggested
number of frame that needed to be allocated when initializing the decoder.
Considering that the hevc_qsv encoder uses the  most frame buffer,
async is 4 (default) and max_b_frames is 8 (default) and decoder
may followed by VPP, use NumFrameSuggest + 16 to set init_pool_size.

Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
Signed-off-by: Guangxin Xu <guangxin.xu@intel.com>
This commit is contained in:
Wenbin Chen 2022-03-18 14:25:11 +08:00 committed by Haihao Xiang
parent 4a633eb36f
commit 0a0847dbac
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/qsvdec.c
View File

@ -89,7 +89,7 @@ typedef struct QSVContext {
uint32_t fourcc;
mfxFrameInfo frame_info;
AVBufferPool *pool;
int suggest_pool_size;
int initialized;
// options set by the caller
@ -276,7 +276,7 @@ static int qsv_decode_preinit(AVCodecContext *avctx, QSVContext *q, enum AVPixel
hwframes_ctx->height = FFALIGN(avctx->coded_height, 32);
hwframes_ctx->format = AV_PIX_FMT_QSV;
hwframes_ctx->sw_format = avctx->sw_pix_fmt;
hwframes_ctx->initial_pool_size = 64 + avctx->extra_hw_frames;
hwframes_ctx->initial_pool_size = q->suggest_pool_size + 16 + avctx->extra_hw_frames;
frames_hwctx->frame_type = MFX_MEMTYPE_VIDEO_MEMORY_DECODER_TARGET;
ret = av_hwframe_ctx_init(avctx->hw_frames_ctx);
@ -794,6 +794,9 @@ static int qsv_process_data(AVCodecContext *avctx, QSVContext *q,
}
if (q->reinit_flag || !q->session || !q->initialized) {
mfxFrameAllocRequest request;
memset(&request, 0, sizeof(request));
q->reinit_flag = 0;
ret = qsv_decode_header(avctx, q, pkt, pix_fmt, &param);
if (ret < 0) {
@ -803,12 +806,19 @@ static int qsv_process_data(AVCodecContext *avctx, QSVContext *q,
av_log(avctx, AV_LOG_ERROR, "Error decoding header\n");
goto reinit_fail;
}
param.IOPattern = q->iopattern;
q->orig_pix_fmt = avctx->pix_fmt = pix_fmt = ff_qsv_map_fourcc(param.mfx.FrameInfo.FourCC);
avctx->coded_width = param.mfx.FrameInfo.Width;
avctx->coded_height = param.mfx.FrameInfo.Height;
ret = MFXVideoDECODE_QueryIOSurf(q->session, &param, &request);
if (ret < 0)
return ff_qsv_print_error(avctx, ret, "Error querying IO surface");
q->suggest_pool_size = request.NumFrameSuggested;
ret = qsv_decode_preinit(avctx, q, pix_fmt, &param);
if (ret < 0)
goto reinit_fail;