RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavcodec/qsvdec: reinit decoder according to decode() return value 

FFmpeg-qsv decoder reinit codec when width and height change, but there
are not only resolution change need to reinit codec. I change it to use
return value from DecodeFrameAsync() to decide whether decoder need to
be reinitialized.

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:09 +08:00 committed by Haihao Xiang
parent ad21f26492
commit 40f38659d7
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/qsvdec.c
View File

@ -631,6 +631,13 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext *q,
} while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_ERR_MORE_SURFACE); } while (ret == MFX_WRN_DEVICE_BUSY || ret == MFX_ERR_MORE_SURFACE);
if (ret == MFX_ERR_INCOMPATIBLE_VIDEO_PARAM) {
q->reinit_flag = 1;
av_log(avctx, AV_LOG_DEBUG, "Video parameter change\n");
av_freep(&sync);
return 0;
}
if (ret != MFX_ERR_NONE && if (ret != MFX_ERR_NONE &&
ret != MFX_ERR_MORE_DATA && ret != MFX_ERR_MORE_DATA &&
ret != MFX_WRN_VIDEO_PARAM_CHANGED && ret != MFX_WRN_VIDEO_PARAM_CHANGED &&
@ -783,9 +790,9 @@ static int qsv_process_data(AVCodecContext *avctx, QSVContext *q,
ret = qsv_decode_header(avctx, q, pkt, pix_fmt, &param); ret = qsv_decode_header(avctx, q, pkt, pix_fmt, &param);
if (ret >= 0 && (q->orig_pix_fmt != ff_qsv_map_fourcc(param.mfx.FrameInfo.FourCC) || if (q->reinit_flag || (ret >= 0 && (q->orig_pix_fmt != ff_qsv_map_fourcc(param.mfx.FrameInfo.FourCC) ||
avctx->coded_width != param.mfx.FrameInfo.Width || avctx->coded_width != param.mfx.FrameInfo.Width ||
avctx->coded_height != param.mfx.FrameInfo.Height)) { avctx->coded_height != param.mfx.FrameInfo.Height))) {
AVPacket zero_pkt = {0}; AVPacket zero_pkt = {0};
if (q->buffered_count) { if (q->buffered_count) {