| Message ID | 20220221085656.971981-1-wenbin.chen@intel.com |
|---|---|
| State | Accepted |
| Commit | 342d4fb0563cafa4e444c83dc4ecfa0d69a71eda |
| Headers | show |
| Series | [FFmpeg-devel,v2] libavcodec/qsvenc: add mbbrc to hevc_qsv | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
On Mon, 2022-02-21 at 16:56 +0800, Wenbin Chen wrote: > Add mbbrc to hevc_qsv > For detailed description, please see "mbbrc" part in: > https://github.com/Intel-Media-SDK/MediaSDK/blob/master/doc/mediasdk-man.md#mfxextcodingoption2 > > Signed-off-by: Wenbin Chen <wenbin.chen@intel.com> > --- > doc/encoders.texi | 5 +++++ > libavcodec/qsvenc.c | 5 +++-- > 2 files changed, 8 insertions(+), 2 deletions(-) > > diff --git a/doc/encoders.texi b/doc/encoders.texi > index bfb6c7eef6..4325fdd6b0 100644 > --- a/doc/encoders.texi > +++ b/doc/encoders.texi > @@ -3404,6 +3404,11 @@ Maximum encoded frame size in bytes. > @item @var{max_slice_size} > Maximum encoded slice size in bytes. > > +@item @var{mbbrc} > +Setting this flag enables macroblock level bitrate control that generally > +improves subjective visual quality. Enabling this flag may have negative > impact > +on performance and objective visual quality metric. > + > @item @var{p_strategy} > Enable P-pyramid: 0-default 1-simple 2-pyramid(bf need to be set to 0). > > diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c > index 07be4287b7..3aed0508a4 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -877,8 +877,6 @@ static int init_video_param(AVCodecContext *avctx, > QSVEncContext *q) > if (avctx->codec_id == AV_CODEC_ID_H264) { > if (q->bitrate_limit >= 0) > q->extco2.BitrateLimit = q->bitrate_limit ? > MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; > - if (q->mbbrc >= 0) > - q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : > MFX_CODINGOPTION_OFF; > > #if QSV_HAVE_TRELLIS > if (avctx->trellis >= 0) > @@ -935,6 +933,9 @@ static int init_video_param(AVCodecContext *avctx, > QSVEncContext *q) > q->extco2.MaxQPP = q->extco2.MaxQPB = q->extco2.MaxQPI; > } > #endif > + if (q->mbbrc >= 0) > + q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : > MFX_CODINGOPTION_OFF; > + > q->extco2.Header.BufferId = MFX_EXTBUFF_CODING_OPTION2; > q->extco2.Header.BufferSz = sizeof(q->extco2); > LGTM, applied -Haihao
diff --git a/doc/encoders.texi b/doc/encoders.texi index bfb6c7eef6..4325fdd6b0 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3404,6 +3404,11 @@ Maximum encoded frame size in bytes. @item @var{max_slice_size} Maximum encoded slice size in bytes. +@item @var{mbbrc} +Setting this flag enables macroblock level bitrate control that generally +improves subjective visual quality. Enabling this flag may have negative impact +on performance and objective visual quality metric. + @item @var{p_strategy} Enable P-pyramid: 0-default 1-simple 2-pyramid(bf need to be set to 0). diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c index 07be4287b7..3aed0508a4 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -877,8 +877,6 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (avctx->codec_id == AV_CODEC_ID_H264) { if (q->bitrate_limit >= 0) q->extco2.BitrateLimit = q->bitrate_limit ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; - if (q->mbbrc >= 0) - q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; #if QSV_HAVE_TRELLIS if (avctx->trellis >= 0) @@ -935,6 +933,9 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco2.MaxQPP = q->extco2.MaxQPB = q->extco2.MaxQPI; } #endif + if (q->mbbrc >= 0) + q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; + q->extco2.Header.BufferId = MFX_EXTBUFF_CODING_OPTION2; q->extco2.Header.BufferSz = sizeof(q->extco2);
Add mbbrc to hevc_qsv For detailed description, please see "mbbrc" part in: https://github.com/Intel-Media-SDK/MediaSDK/blob/master/doc/mediasdk-man.md#mfxextcodingoption2 Signed-off-by: Wenbin Chen <wenbin.chen@intel.com> --- doc/encoders.texi | 5 +++++ libavcodec/qsvenc.c | 5 +++-- 2 files changed, 8 insertions(+), 2 deletions(-)