diff mbox series

[FFmpeg-devel,V2] libavcodec/qsvdec: reinit decoder according to decode() return value

Message ID 20210323083401.2503369-1-wenbin.chen@intel.com
State New
Headers show
Series [FFmpeg-devel,V2] libavcodec/qsvdec: reinit decoder according to decode() return value
Related show

Checks

Context Check Description
andriy/x86_make success Make finished
andriy/x86_make_fate success Make fate finished
andriy/PPC64_make success Make finished
andriy/PPC64_make_fate success Make fate finished

Commit Message

Chen, Wenbin March 23, 2021, 8:34 a.m. UTC
From: "Chen,Wenbin" <wenbin.chen@intel.com>

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>
---
 libavcodec/qsvdec.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

Comments

Xiang, Haihao April 6, 2021, 6:10 a.m. UTC | #1
On Tue, 2021-03-23 at 16:34 +0800, wenbin.chen@intel.com wrote:
> From: "Chen,Wenbin" <wenbin.chen@intel.com>
> 
> 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>
> ---
>  libavcodec/qsvdec.c | 11 +++++++++--
>  1 file changed, 9 insertions(+), 2 deletions(-)
> 
> diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
> index 5f2e641373..88232f5d8d 100644
> --- a/libavcodec/qsvdec.c
> +++ b/libavcodec/qsvdec.c
> @@ -481,6 +481,13 @@ static int qsv_decode(AVCodecContext *avctx, QSVContext
> *q,
>  
>      } 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 &&
>          ret != MFX_ERR_MORE_DATA &&
>          ret != MFX_WRN_VIDEO_PARAM_CHANGED &&
> @@ -632,9 +639,9 @@ static int qsv_process_data(AVCodecContext *avctx,
> QSVContext *q,
>  
>      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_height != param.mfx.FrameInfo.Height)) {
> +        avctx->coded_height != param.mfx.FrameInfo.Height))) {
>          AVPacket zero_pkt = {0};
>  
>          if (q->buffered_count) {

LTGM, thanks!

-Haihao
diff mbox series

Patch

diff --git a/libavcodec/qsvdec.c b/libavcodec/qsvdec.c
index 5f2e641373..88232f5d8d 100644
--- a/libavcodec/qsvdec.c
+++ b/libavcodec/qsvdec.c
@@ -481,6 +481,13 @@  static int qsv_decode(AVCodecContext *avctx, QSVContext *q,
 
     } 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 &&
         ret != MFX_ERR_MORE_DATA &&
         ret != MFX_WRN_VIDEO_PARAM_CHANGED &&
@@ -632,9 +639,9 @@  static int qsv_process_data(AVCodecContext *avctx, QSVContext *q,
 
     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_height != param.mfx.FrameInfo.Height)) {
+        avctx->coded_height != param.mfx.FrameInfo.Height))) {
         AVPacket zero_pkt = {0};
 
         if (q->buffered_count) {