| Message ID | 20190329051906.11440-1-linjie.fu@intel.com |
|---|---|
| State | Accepted |
| Commit | a8355eed3699acffebb70e1b939989d39b72dfc7 |
| Headers | show |
> From: ffmpeg-devel [mailto:ffmpeg-devel-bounces@ffmpeg.org] On Behalf > Of Linjie Fu > Sent: Friday, March 29, 2019 1:19 PM > To: ffmpeg-devel@ffmpeg.org > Cc: Fu, Linjie <linjie.fu@intel.com> > Subject: [FFmpeg-devel] [PATCH] lavc/qsvenc: expose low_power as a > common option for QSV encoder > > Always exposes low_power option for all qsv encoder, and reports a warning > if VDENC is not supported in current version of MSDK. > > Signed-off-by: Linjie Fu <linjie.fu@intel.com> > --- > libavcodec/qsvenc.c | 11 ++++++++++- > libavcodec/qsvenc.h | 1 + > libavcodec/qsvenc_h264.c | 4 ---- > 3 files changed, 11 insertions(+), 5 deletions(-) > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index > 5aa020d47b..751b3028bf 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -495,9 +495,18 @@ static int init_video_param(AVCodecContext *avctx, > QSVEncContext *q) > } > } > > + if (q->low_power) { > #if QSV_HAVE_VDENC > - q->param.mfx.LowPower = q->low_power ? > MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; > + q->param.mfx.LowPower = MFX_CODINGOPTION_ON; #else > + av_log(avctx, AV_LOG_WARNING, "The low_power option is " > + "not supported with this MSDK > version.\n"); > + q->low_power = 0; > + q->param.mfx.LowPower = MFX_CODINGOPTION_OFF; > #endif > + } else > + q->param.mfx.LowPower = MFX_CODINGOPTION_OFF; > + > q->param.mfx.CodecProfile = q->profile; > q->param.mfx.TargetUsage = avctx->compression_level; > q->param.mfx.GopPicSize = FFMAX(0, avctx->gop_size); > diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index > 00afbd80aa..0c9887753c 100644 > --- a/libavcodec/qsvenc.h > +++ b/libavcodec/qsvenc.h > @@ -89,6 +89,7 @@ > { "adaptive_b", "Adaptive B-frame placement", > OFFSET(qsv.adaptive_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, > 1, VE }, \ > { "b_strategy", "Strategy to choose between I/P/B-frames", > OFFSET(qsv.b_strategy), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, > 1, VE }, \ > { "forced_idr", "Forcing I frames as IDR frames", > OFFSET(qsv.forced_idr), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, > 1, VE }, \ > +{ "low_power", "enable low power mode(experimental: many limitations by > +mfx version, BRC modes, etc.)", OFFSET(qsv.low_power), > +AV_OPT_TYPE_BOOL, { .i64 = 0}, 0, 1, VE},\ > > typedef int SetEncodeCtrlCB (AVCodecContext *avctx, > const AVFrame *frame, > mfxEncodeCtrl* enc_ctrl); diff --git a/libavcodec/qsvenc_h264.c > b/libavcodec/qsvenc_h264.c index f458137848..8e61826eef 100644 > --- a/libavcodec/qsvenc_h264.c > +++ b/libavcodec/qsvenc_h264.c > @@ -154,10 +154,6 @@ static const AVOption options[] = { > { "auto" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = > MFX_MF_AUTO }, INT_MIN, INT_MAX, VE, "mfmode" }, > #endif > > -#if QSV_HAVE_VDENC > - { "low_power", "enable low power mode(experimental: many > limitations by mfx version, BRC modes, etc.)", OFFSET(qsv.low_power), > AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, > -#endif > - > { "repeat_pps", "repeat pps for every frame", OFFSET(qsv.repeat_pps), > AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, > > { NULL }, > -- > 2.17.1 Applied.
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 5aa020d47b..751b3028bf 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -495,9 +495,18 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) } } + if (q->low_power) { #if QSV_HAVE_VDENC - q->param.mfx.LowPower = q->low_power ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; + q->param.mfx.LowPower = MFX_CODINGOPTION_ON; +#else + av_log(avctx, AV_LOG_WARNING, "The low_power option is " + "not supported with this MSDK version.\n"); + q->low_power = 0; + q->param.mfx.LowPower = MFX_CODINGOPTION_OFF; #endif + } else + q->param.mfx.LowPower = MFX_CODINGOPTION_OFF; + q->param.mfx.CodecProfile = q->profile; q->param.mfx.TargetUsage = avctx->compression_level; q->param.mfx.GopPicSize = FFMAX(0, avctx->gop_size); diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 00afbd80aa..0c9887753c 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -89,6 +89,7 @@ { "adaptive_b", "Adaptive B-frame placement", OFFSET(qsv.adaptive_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "b_strategy", "Strategy to choose between I/P/B-frames", OFFSET(qsv.b_strategy), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "forced_idr", "Forcing I frames as IDR frames", OFFSET(qsv.forced_idr), AV_OPT_TYPE_BOOL,{ .i64 = 0 }, 0, 1, VE }, \ +{ "low_power", "enable low power mode(experimental: many limitations by mfx version, BRC modes, etc.)", OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = 0}, 0, 1, VE},\ typedef int SetEncodeCtrlCB (AVCodecContext *avctx, const AVFrame *frame, mfxEncodeCtrl* enc_ctrl); diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index f458137848..8e61826eef 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -154,10 +154,6 @@ static const AVOption options[] = { { "auto" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_MF_AUTO }, INT_MIN, INT_MAX, VE, "mfmode" }, #endif -#if QSV_HAVE_VDENC - { "low_power", "enable low power mode(experimental: many limitations by mfx version, BRC modes, etc.)", OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, -#endif - { "repeat_pps", "repeat pps for every frame", OFFSET(qsv.repeat_pps), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, { NULL },
Always exposes low_power option for all qsv encoder, and reports a warning if VDENC is not supported in current version of MSDK. Signed-off-by: Linjie Fu <linjie.fu@intel.com> --- libavcodec/qsvenc.c | 11 ++++++++++- libavcodec/qsvenc.h | 1 + libavcodec/qsvenc_h264.c | 4 ---- 3 files changed, 11 insertions(+), 5 deletions(-)