Re: [libav-devel] [PATCH 1/2] lavc/qsvenc: add detail options for MFE mode
On 07/05/2018 12:46, Li, Zhong wrote: > Thanks for review. : ) No problem :) > Do you need me to update it, or you can help to add the alias when you merge > it? > +{ "on" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_MANUAL }, INT_MIN, INT_MAX, VE, "mfmode" }, Folded in, I'd push this evening. lu ___ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
Re: [libav-devel] [PATCH 2/2] lavc/qsvenc: add mf_max_num option for MFE
Thanks for your quick response. : ) > -Original Message- > From: libav-devel [mailto:libav-devel-boun...@libav.org] On Behalf Of > Maxym Dmytrychenko > Sent: Monday, May 7, 2018 5:23 PM > To: libav development> 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 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 > > --- > > 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 *)>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 ___ libav-devel mailing list libav-devel@libav.org https://lists.libav.org/mailman/listinfo/libav-devel
Re: [libav-devel] [PATCH 1/2] lavc/qsvenc: add detail options for MFE mode
Thanks for review. : ) Do you need me to update it, or you can help to add the alias when you merge it? > -Original Message- > From: libav-devel [mailto:libav-devel-boun...@libav.org] On Behalf Of Luca > Barbato > Sent: Friday, May 4, 2018 5:26 PM > To: libav-devel@libav.org > Subject: Re: [libav-devel] [PATCH 1/2] lavc/qsvenc: add detail options for > MFE mode > > The set looks fine, I would add a alias for "on" as "manual" for usability but > beside that looks fine to me. > ___ > 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
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 Liwrote: > 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 > --- > 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 *)>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