| Message ID | 20201225045204.77221-1-wenbin.chen@intel.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [FFmpeg-devel,V2] libavcodec/qsvenc: add low latency P-pyramid support for qsv | expand |
| Context | Check | Description |
|---|---|---|
| andriy/configure | warning | Failed to apply patch |
On Fri, Dec 25, 2020 at 12:55 PM <wenbin.chen@intel.com> wrote: > > From: Wenbinc-Bin <wenbin.chen@intel.com> > > Add low latency P-pyramid support for qsv, and it relates to a new > command line parameter "-p_strategy". To enable this flag, user also > need to set "-bf" to -1 or 0. > > Signed-off-by Wenbin Chen <wenbin.chen@intel.com> > --- > libavcodec/qsvenc.c | 23 +++++++++++++++++++++++ > libavcodec/qsvenc.h | 2 ++ > 2 files changed, 25 insertions(+) > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index 0d20d1968f..8cb0ecff89 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -268,6 +268,14 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, > case MFX_B_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, "pyramid"); break; > default: av_log(avctx, AV_LOG_VERBOSE, "auto"); break; > } > + > + av_log(avctx, AV_LOG_VERBOSE, "; PRefType: "); > + switch(co3->PRefType){ Please follow the coding style, thx > + case MFX_P_REF_DEFAULT: av_log(avctx, AV_LOG_VERBOSE, "default"); break; > + case MFX_P_REF_SIMPLE: av_log(avctx, AV_LOG_VERBOSE, "simple"); break; > + case MFX_P_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, "pyramid"); break; > + default: break; > + } > av_log(avctx, AV_LOG_VERBOSE, "\n"); > #endif > > @@ -781,6 +789,21 @@ FF_ENABLE_DEPRECATION_WARNINGS > #if QSV_HAVE_CO3 > q->extco3.Header.BufferId = MFX_EXTBUFF_CODING_OPTION3; > q->extco3.Header.BufferSz = sizeof(q->extco3); > + switch(q->p_strategy){ Same as above > + case 0: And this > + q->extco3.PRefType = MFX_P_REF_DEFAULT; > + break; > + case 1: > + q->extco3.PRefType = MFX_P_REF_SIMPLE; > + break; > + case 2: > + q->extco3.PRefType = MFX_P_REF_PYRAMID; > + break; > + default: > + q->extco3.PRefType = MFX_P_REF_DEFAULT; > + av_log(avctx, AV_LOG_VERBOSE, "invalid p_strategy, set to default\n"); > + break; > + } > #if QSV_HAVE_GPB > if (avctx->codec_id == AV_CODEC_ID_HEVC) > q->extco3.GPB = q->gpb ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; > diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h > index 3720320789..a074561ca8 100644 > --- a/libavcodec/qsvenc.h > +++ b/libavcodec/qsvenc.h > @@ -96,6 +96,7 @@ > { "adaptive_i", "Adaptive I-frame placement", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ > { "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 }, \ > +{ "p_strategy", "enable P-pyramid 0-default 1-simple 2-pyramid", OFFSET(qsv.p_strategy), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 2, 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},\ > { "dblk_idc", "value of DisableDeblockingIdc (default is 0), in range [0,2]", OFFSET(qsv.dblk_idc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE}, \ > @@ -185,6 +186,7 @@ typedef struct QSVEncContext { > int adaptive_i; > int adaptive_b; > int b_strategy; > + int p_strategy; > int cavlc; > > int int_ref_type; > -- > 2.25.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".
> From: Wenbinc-Bin <wenbin.chen@intel.com> > > Add low latency P-pyramid support for qsv, and it relates to a new > command line parameter "-p_strategy". To enable this flag, user also > need to set "-bf" to -1 or 0. What's the difference between v1 and v2? It would be better to add some comment about the change by using option '--annotate' when sending out your patch for review. > > Signed-off-by Wenbin Chen <wenbin.chen@intel.com> > --- > libavcodec/qsvenc.c | 23 +++++++++++++++++++++++ > libavcodec/qsvenc.h | 2 ++ > 2 files changed, 25 insertions(+) > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index 0d20d1968f..8cb0ecff89 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -268,6 +268,14 @@ static void dump_video_param(AVCodecContext *avctx, > QSVEncContext *q, > case MFX_B_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, > "pyramid"); break; > default: av_log(avctx, AV_LOG_VERBOSE, > "auto"); break; > } > + > + av_log(avctx, AV_LOG_VERBOSE, "; PRefType: "); > + switch(co3->PRefType){ > + case MFX_P_REF_DEFAULT: av_log(avctx, AV_LOG_VERBOSE, > "default"); break; > + case MFX_P_REF_SIMPLE: av_log(avctx, AV_LOG_VERBOSE, > "simple"); break; > + case MFX_P_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, > "pyramid"); break; > + default: break; > + } > av_log(avctx, AV_LOG_VERBOSE, "\n"); > #endif > > @@ -781,6 +789,21 @@ FF_ENABLE_DEPRECATION_WARNINGS > #if QSV_HAVE_CO3 > q->extco3.Header.BufferId = MFX_EXTBUFF_CODING_OPTION3; > q->extco3.Header.BufferSz = sizeof(q->extco3); > + switch(q->p_strategy){ > + case 0: > + q->extco3.PRefType = MFX_P_REF_DEFAULT; > + break; > + case 1: > + q->extco3.PRefType = MFX_P_REF_SIMPLE; > + break; > + case 2: > + q->extco3.PRefType = MFX_P_REF_PYRAMID; > + break; > + default: > + q->extco3.PRefType = MFX_P_REF_DEFAULT; > + av_log(avctx, AV_LOG_VERBOSE, "invalid p_strategy, set to > default\n"); > + break; > + } > #if QSV_HAVE_GPB > if (avctx->codec_id == AV_CODEC_ID_HEVC) > q->extco3.GPB = q->gpb ? MFX_CODINGOPTION_ON : > MFX_CODINGOPTION_OFF; > diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h > index 3720320789..a074561ca8 100644 > --- a/libavcodec/qsvenc.h > +++ b/libavcodec/qsvenc.h > @@ -96,6 +96,7 @@ > { "adaptive_i", "Adaptive I-frame > placement", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = > -1 }, -1, 1, VE }, \ > { "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 > }, \ > +{ "p_strategy", "enable P-pyramid 0-default 1-simple 2- > pyramid", OFFSET(qsv.p_strategy), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 2, > 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},\ > { "dblk_idc", "value of DisableDeblockingIdc (default is 0), in range > [0,2]", OFFSET(qsv.dblk_idc), AV_OPT_TYPE_INT, { .i64 = 0 > }, 0, 2, VE}, \ Did you create your patch against the latest master branch? I can't find option 'dblk_idc' in the latest master branch and failed to apply your patch by using 'git am'. Thanks Haihao > @@ -185,6 +186,7 @@ typedef struct QSVEncContext { > int adaptive_i; > int adaptive_b; > int b_strategy; > + int p_strategy; > int cavlc; > > int int_ref_type;
> -----Original Message----- > From: Xiang, Haihao <haihao.xiang@intel.com> > Sent: Monday, December 28, 2020 10:40 AM > To: ffmpeg-devel@ffmpeg.org > Cc: Chen, Wenbin <wenbin.chen@intel.com> > Subject: Re: [FFmpeg-devel] [PATCH V2] libavcodec/qsvenc: add low latency > P-pyramid support for qsv > > > > From: Wenbinc-Bin <wenbin.chen@intel.com> > > > > Add low latency P-pyramid support for qsv, and it relates to a new > > command line parameter "-p_strategy". To enable this flag, user also > > need to set "-bf" to -1 or 0. > > What's the difference between v1 and v2? It would be better to add some > comment about the change by using option '--annotate' when sending out > your patch for review. > > > > > Signed-off-by Wenbin Chen <wenbin.chen@intel.com> > > --- > > libavcodec/qsvenc.c | 23 +++++++++++++++++++++++ libavcodec/qsvenc.h > > | 2 ++ > > 2 files changed, 25 insertions(+) > > > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index > > 0d20d1968f..8cb0ecff89 100644 > > --- a/libavcodec/qsvenc.c > > +++ b/libavcodec/qsvenc.c > > @@ -268,6 +268,14 @@ static void dump_video_param(AVCodecContext > > *avctx, QSVEncContext *q, > > case MFX_B_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, > > "pyramid"); break; > > default: av_log(avctx, AV_LOG_VERBOSE, > > "auto"); break; > > } > > + > > + av_log(avctx, AV_LOG_VERBOSE, "; PRefType: "); > > + switch(co3->PRefType){ > > + case MFX_P_REF_DEFAULT: av_log(avctx, AV_LOG_VERBOSE, > > "default"); break; > > + case MFX_P_REF_SIMPLE: av_log(avctx, AV_LOG_VERBOSE, > > "simple"); break; > > + case MFX_P_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, > > "pyramid"); break; > > + default: break; > > + } > > av_log(avctx, AV_LOG_VERBOSE, "\n"); #endif > > > > @@ -781,6 +789,21 @@ FF_ENABLE_DEPRECATION_WARNINGS #if > QSV_HAVE_CO3 > > q->extco3.Header.BufferId = MFX_EXTBUFF_CODING_OPTION3; > > q->extco3.Header.BufferSz = sizeof(q->extco3); > > + switch(q->p_strategy){ > > + case 0: > > + q->extco3.PRefType = MFX_P_REF_DEFAULT; > > + break; > > + case 1: > > + q->extco3.PRefType = MFX_P_REF_SIMPLE; > > + break; > > + case 2: > > + q->extco3.PRefType = MFX_P_REF_PYRAMID; > > + break; > > + default: > > + q->extco3.PRefType = MFX_P_REF_DEFAULT; > > + av_log(avctx, AV_LOG_VERBOSE, "invalid p_strategy, > > + set to > > default\n"); > > + break; > > + } > > #if QSV_HAVE_GPB > > if (avctx->codec_id == AV_CODEC_ID_HEVC) > > q->extco3.GPB = q->gpb ? MFX_CODINGOPTION_ON : > > MFX_CODINGOPTION_OFF; > > diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index > > 3720320789..a074561ca8 100644 > > --- a/libavcodec/qsvenc.h > > +++ b/libavcodec/qsvenc.h > > @@ -96,6 +96,7 @@ > > { "adaptive_i", "Adaptive I-frame > > placement", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = > > -1 }, -1, 1, VE }, \ > > { "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 > > }, \ > > +{ "p_strategy", "enable P-pyramid 0-default 1-simple 2- > > pyramid", OFFSET(qsv.p_strategy), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 2, > > 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},\ { "dblk_idc", "value of > > DisableDeblockingIdc (default is 0), in range > > [0,2]", OFFSET(qsv.dblk_idc), AV_OPT_TYPE_INT, { .i64 = 0 > > }, 0, 2, VE}, \ > > > Did you create your patch against the latest master branch? I can't find > option 'dblk_idc' in the latest master branch and failed to apply your patch > by using 'git am'. > > Thanks > Haihao > > > > @@ -185,6 +186,7 @@ typedef struct QSVEncContext { > > int adaptive_i; > > int adaptive_b; > > int b_strategy; > > + int p_strategy; > > int cavlc; > > > > int int_ref_type; I fixed a typo and regenerate patch on the base of the patch that I submitted before, because I thought there will be a conflict if the two patches are applied together. Now I know the rule and I will generate the patch from latest master and also change the code following the advice that Linjie gave me. Thanks Wenbin
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 0d20d1968f..8cb0ecff89 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -268,6 +268,14 @@ static void dump_video_param(AVCodecContext *avctx, QSVEncContext *q, case MFX_B_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, "pyramid"); break; default: av_log(avctx, AV_LOG_VERBOSE, "auto"); break; } + + av_log(avctx, AV_LOG_VERBOSE, "; PRefType: "); + switch(co3->PRefType){ + case MFX_P_REF_DEFAULT: av_log(avctx, AV_LOG_VERBOSE, "default"); break; + case MFX_P_REF_SIMPLE: av_log(avctx, AV_LOG_VERBOSE, "simple"); break; + case MFX_P_REF_PYRAMID: av_log(avctx, AV_LOG_VERBOSE, "pyramid"); break; + default: break; + } av_log(avctx, AV_LOG_VERBOSE, "\n"); #endif @@ -781,6 +789,21 @@ FF_ENABLE_DEPRECATION_WARNINGS #if QSV_HAVE_CO3 q->extco3.Header.BufferId = MFX_EXTBUFF_CODING_OPTION3; q->extco3.Header.BufferSz = sizeof(q->extco3); + switch(q->p_strategy){ + case 0: + q->extco3.PRefType = MFX_P_REF_DEFAULT; + break; + case 1: + q->extco3.PRefType = MFX_P_REF_SIMPLE; + break; + case 2: + q->extco3.PRefType = MFX_P_REF_PYRAMID; + break; + default: + q->extco3.PRefType = MFX_P_REF_DEFAULT; + av_log(avctx, AV_LOG_VERBOSE, "invalid p_strategy, set to default\n"); + break; + } #if QSV_HAVE_GPB if (avctx->codec_id == AV_CODEC_ID_HEVC) q->extco3.GPB = q->gpb ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h index 3720320789..a074561ca8 100644 --- a/libavcodec/qsvenc.h +++ b/libavcodec/qsvenc.h @@ -96,6 +96,7 @@ { "adaptive_i", "Adaptive I-frame placement", OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \ { "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 }, \ +{ "p_strategy", "enable P-pyramid 0-default 1-simple 2-pyramid", OFFSET(qsv.p_strategy), AV_OPT_TYPE_INT, { .i64 = 0}, 0, 2, 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},\ { "dblk_idc", "value of DisableDeblockingIdc (default is 0), in range [0,2]", OFFSET(qsv.dblk_idc), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 2, VE}, \ @@ -185,6 +186,7 @@ typedef struct QSVEncContext { int adaptive_i; int adaptive_b; int b_strategy; + int p_strategy; int cavlc; int int_ref_type;
From: Wenbinc-Bin <wenbin.chen@intel.com> Add low latency P-pyramid support for qsv, and it relates to a new command line parameter "-p_strategy". To enable this flag, user also need to set "-bf" to -1 or 0. Signed-off-by Wenbin Chen <wenbin.chen@intel.com> --- libavcodec/qsvenc.c | 23 +++++++++++++++++++++++ libavcodec/qsvenc.h | 2 ++ 2 files changed, 25 insertions(+)