[2/2] lavc/qsvenc: add mf_max_num option for MFE

Message ID 1525471612-3430-2-git-send-email-zhong.li@intel.com
State New
Headers show
Series
  • [1/2] lavc/qsvenc: add detail options for MFE mode
Related show

Commit Message

Li, Zhong May 4, 2018, 10:06 p.m.
Maximum number of frames to be used for combining.
Each encoder in joined sessions has to be initialized with the same value.

Signed-off-by: Zhong Li <zhong.li@intel.com>
---
 libavcodec/qsvenc.c      | 1 +
 libavcodec/qsvenc.h      | 1 +
 libavcodec/qsvenc_h264.c | 2 ++
 3 files changed, 4 insertions(+)

Comments

Maxym Dmytrychenko May 7, 2018, 9:22 a.m. | #1
looks ok for me as well

On Sat, May 5, 2018 at 12:06 AM, Zhong Li <zhong.li@intel.com> wrote:

> Maximum number of frames to be used for combining.
> Each encoder in joined sessions has to be initialized with the same value.
>
> Signed-off-by: Zhong Li <zhong.li@intel.com>
> ---
>  libavcodec/qsvenc.c      | 1 +
>  libavcodec/qsvenc.h      | 1 +
>  libavcodec/qsvenc_h264.c | 2 ++
>  3 files changed, 4 insertions(+)
>
> diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
> index a8b446c..9dd1699 100644
> --- a/libavcodec/qsvenc.c
> +++ b/libavcodec/qsvenc.c
> @@ -666,6 +666,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
>                  q->extmfp.Header.BufferSz     = sizeof(q->extmfp);
>
>                  q->extmfp.MFMode = q->mfmode;
> +                q->extmfp.MaxNumFrames = q->mf_max_num;
>                  av_log(avctx,AV_LOG_VERBOSE,"MFMode:%d\n",
> q->extmfp.MFMode);
>                  q->extparam_internal[q->nb_extparam_internal++] =
> (mfxExtBuffer *)&q->extmfp;
>              }
> diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
> index a7fc57b..2b1a349 100644
> --- a/libavcodec/qsvenc.h
> +++ b/libavcodec/qsvenc.h
> @@ -163,6 +163,7 @@ typedef struct QSVEncContext {
>
>  #if QSV_HAVE_MF
>      int mfmode;
> +    int mf_max_num;
>  #endif
>      char *load_plugins;
>  } QSVEncContext;
> diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
> index 7f3fd5a..aa40f8e 100644
> --- a/libavcodec/qsvenc_h264.c
> +++ b/libavcodec/qsvenc_h264.c
> @@ -99,6 +99,8 @@ static const AVOption options[] = {
>      { "off"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_DISABLED },
> INT_MIN, INT_MAX,     VE, "mfmode" },
>      { "auto"   , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_AUTO     },
> INT_MIN, INT_MAX,     VE, "mfmode" },
>      { "manual" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_MANUAL   },
> INT_MIN, INT_MAX,     VE, "mfmode" },
> +
> +    { "mf_max_num", "Maximum frame number of Multi-Frame encoding",
> OFFSET(qsv.mf_max_num), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, VE},
>  #endif
>
>      { NULL },
> --
> 2.7.4
>
> _______________________________________________
> libav-devel mailing list
> libav-devel@libav.org
> https://lists.libav.org/mailman/listinfo/libav-devel
Li, Zhong May 7, 2018, 10:47 a.m. | #2
Thanks for your quick response. : ) 

> -----Original Message-----
> From: libav-devel [mailto:libav-devel-bounces@libav.org] On Behalf Of
> Maxym Dmytrychenko
> Sent: Monday, May 7, 2018 5:23 PM
> To: libav development <libav-devel@libav.org>
> Subject: Re: [libav-devel] [PATCH 2/2] lavc/qsvenc: add mf_max_num option
> for MFE
> 
> looks ok for me as well
> 
> On Sat, May 5, 2018 at 12:06 AM, Zhong Li <zhong.li@intel.com> wrote:
> 
> > Maximum number of frames to be used for combining.
> > Each encoder in joined sessions has to be initialized with the same value.
> >
> > Signed-off-by: Zhong Li <zhong.li@intel.com>
> > ---
> >  libavcodec/qsvenc.c      | 1 +
> >  libavcodec/qsvenc.h      | 1 +
> >  libavcodec/qsvenc_h264.c | 2 ++
> >  3 files changed, 4 insertions(+)
> >
> > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index
> > a8b446c..9dd1699 100644
> > --- a/libavcodec/qsvenc.c
> > +++ b/libavcodec/qsvenc.c
> > @@ -666,6 +666,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
> >                  q->extmfp.Header.BufferSz     = sizeof(q->extmfp);
> >
> >                  q->extmfp.MFMode = q->mfmode;
> > +                q->extmfp.MaxNumFrames = q->mf_max_num;
> >                  av_log(avctx,AV_LOG_VERBOSE,"MFMode:%d\n",
> > q->extmfp.MFMode);
> >                  q->extparam_internal[q->nb_extparam_internal++] =
> > (mfxExtBuffer *)&q->extmfp;
> >              }
> > diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index
> > a7fc57b..2b1a349 100644
> > --- a/libavcodec/qsvenc.h
> > +++ b/libavcodec/qsvenc.h
> > @@ -163,6 +163,7 @@ typedef struct QSVEncContext {
> >
> >  #if QSV_HAVE_MF
> >      int mfmode;
> > +    int mf_max_num;
> >  #endif
> >      char *load_plugins;
> >  } QSVEncContext;
> > diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index
> > 7f3fd5a..aa40f8e 100644
> > --- a/libavcodec/qsvenc_h264.c
> > +++ b/libavcodec/qsvenc_h264.c
> > @@ -99,6 +99,8 @@ static const AVOption options[] = {
> >      { "off"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
> MFX_MF_DISABLED },
> > INT_MIN, INT_MAX,     VE, "mfmode" },
> >      { "auto"   , NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
> MFX_MF_AUTO     },
> > INT_MIN, INT_MAX,     VE, "mfmode" },
> >      { "manual" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 =
> MFX_MF_MANUAL   },
> > INT_MIN, INT_MAX,     VE, "mfmode" },
> > +
> > +    { "mf_max_num", "Maximum frame number of Multi-Frame
> encoding",
> > OFFSET(qsv.mf_max_num), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, VE},
> > #endif
> >
> >      { NULL },
> > --
> > 2.7.4
> >
> > _______________________________________________
> > libav-devel mailing list
> > libav-devel@libav.org
> > https://lists.libav.org/mailman/listinfo/libav-devel
> _______________________________________________
> libav-devel mailing list
> libav-devel@libav.org
> https://lists.libav.org/mailman/listinfo/libav-devel

Patch

diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index a8b446c..9dd1699 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -666,6 +666,7 @@  FF_ENABLE_DEPRECATION_WARNINGS
                 q->extmfp.Header.BufferSz     = sizeof(q->extmfp);
 
                 q->extmfp.MFMode = q->mfmode;
+                q->extmfp.MaxNumFrames = q->mf_max_num;
                 av_log(avctx,AV_LOG_VERBOSE,"MFMode:%d\n", q->extmfp.MFMode);
                 q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer *)&q->extmfp;
             }
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
index a7fc57b..2b1a349 100644
--- a/libavcodec/qsvenc.h
+++ b/libavcodec/qsvenc.h
@@ -163,6 +163,7 @@  typedef struct QSVEncContext {
 
 #if QSV_HAVE_MF
     int mfmode;
+    int mf_max_num;
 #endif
     char *load_plugins;
 } QSVEncContext;
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index 7f3fd5a..aa40f8e 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -99,6 +99,8 @@  static const AVOption options[] = {
     { "off"    , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_DISABLED }, INT_MIN, INT_MAX,     VE, "mfmode" },
     { "auto"   , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_AUTO     }, INT_MIN, INT_MAX,     VE, "mfmode" },
     { "manual" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_MANUAL   }, INT_MIN, INT_MAX,     VE, "mfmode" },
+
+    { "mf_max_num", "Maximum frame number of Multi-Frame encoding", OFFSET(qsv.mf_max_num), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 3, VE},
 #endif
 
     { NULL },