| Message ID | 20181105015013.24738-1-linjie.fu@intel.com |
|---|---|
| State | New |
| Headers | show |
On Mon, Nov 05, 2018 at 09:50:13 +0800, Linjie Fu wrote: > It's an experimental function(like lowpower in vaapi) with Should it be under "-strict experimental" then? > module parameter(i915.enable_guc=2 for linux kerner version >= 4.16) ^ kernel > [V2]: modified the commit message and option comments, use AV_OPT_TYPE_BOOL > to replace AV_OPT_TYPE_INT. This remark belongs below the "---" line, so it doesn't show up in the actual final commit. > Signed-off-by: Linjie Fu <linjie.fu@intel.com> > --- (Right here.) > + { "low_power", "enable low power mode (experimental, many limitations by mfx version, HW platform, BRC modes, etc.", OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, ^ please also add a closing bracket > +++ b/libavcodec/qsvenc_hevc.c [...] > + { "low_power", "enable low power mode (experimental, many limitations by mfx version, HW platform, BRC modes, etc.", OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, Same here. Moritz
> -----Original Message----- > On Mon, Nov 05, 2018 at 09:50:13 +0800, Linjie Fu wrote: > > It's an experimental function(like lowpower in vaapi) with > > Should it be under "-strict experimental" then? > > > module parameter(i915.enable_guc=2 for linux kerner version >= 4.16) > ^ kernel > > > [V2]: modified the commit message and option comments, use > AV_OPT_TYPE_BOOL > > to replace AV_OPT_TYPE_INT. > > This remark belongs below the "---" line, so it doesn't show up in the > actual final commit. > > > Signed-off-by: Linjie Fu <linjie.fu@intel.com> > > --- > > (Right here.) Thanks, got it. > > + { "low_power", "enable low power mode (experimental, many > limitations by mfx version, HW platform, BRC modes, etc.", > OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, > ^ please also add a closing bracket > > +++ b/libavcodec/qsvenc_hevc.c > [...] > > + { "low_power", "enable low power mode (experimental, many > limitations by mfx version, HW platform, BRC modes, etc.", > OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, > Same here. > > Moritz Thanks for your review, and I'm so sorry for these mistakes.
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 948751daf4..7a031297fe 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -464,6 +464,9 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) } } +#if QSV_HAVE_VDENC + q->param.mfx.LowPower = q->low_power ? MFX_CODINGOPTION_ON:MFX_CODINGOPTION_OFF; +#endif 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 50cc4267e7..a396aa7d3f 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -44,6 +44,7 @@ #define QSV_HAVE_LA QSV_VERSION_ATLEAST(1, 7) #define QSV_HAVE_LA_DS QSV_VERSION_ATLEAST(1, 8) #define QSV_HAVE_LA_HRD QSV_VERSION_ATLEAST(1, 11) +#define QSV_HAVE_VDENC QSV_VERSION_ATLEAST(1, 15) #if defined(_WIN32) || defined(__CYGWIN__) #define QSV_HAVE_AVBR QSV_VERSION_ATLEAST(1, 3) @@ -162,6 +163,7 @@ typedef struct QSVEncContext { int recovery_point_sei; int a53_cc; + int low_power; #if QSV_HAVE_MF int mfmode; diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c index 07c9d64e6b..e538e0ad52 100644 --- a/libavcodec/qsvenc_h264.c +++ b/libavcodec/qsvenc_h264.c @@ -153,6 +153,9 @@ 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" }, #endif +#if QSV_HAVE_VDENC + { "low_power", "enable low power mode (experimental, many limitations by mfx version, HW platform, BRC modes, etc.", OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE}, +#endif { NULL }, }; diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c index 4339b316a3..f038f79b94 100644 --- a/libavcodec/qsvenc_hevc.c +++ b/libavcodec/qsvenc_hevc.c @@ -243,6 +243,9 @@ static const AVOption options[] = { { "main", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAIN }, INT_MIN, INT_MAX, VE, "profile" }, { "main10", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAIN10 }, INT_MIN, INT_MAX, VE, "profile" }, { "mainsp", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_HEVC_MAINSP }, INT_MIN, INT_MAX, VE, "profile" }, +#if QSV_HAVE_VDENC + { "low_power", "enable low power mode (experimental, many limitations by mfx version, HW platform, BRC modes, etc.", OFFSET(qsv.low_power), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE }, +#endif { NULL }, };
Add VDENC(lowpower mode) support for QSV h264 and HEVC It's an experimental function(like lowpower in vaapi) with some limitations: - CBR/VBR require HuC which should be explicitly loaded via i915 module parameter(i915.enable_guc=2 for linux kerner version >= 4.16) - HEVC VDENC was supported >= ICE LAKE use option "-low_power 1" to enable VDENC. [V2]: modified the commit message and option comments, use AV_OPT_TYPE_BOOL to replace AV_OPT_TYPE_INT. Signed-off-by: Linjie Fu <linjie.fu@intel.com> --- libavcodec/qsvenc.c | 3 +++ libavcodec/qsvenc.h | 2 ++ libavcodec/qsvenc_h264.c | 3 +++ libavcodec/qsvenc_hevc.c | 3 +++ 4 files changed, 11 insertions(+)