| Message ID | 20220125071237.58735-1-wenbin.chen@intel.com |
|---|---|
| State | New |
| Headers | show |
| Series | [FFmpeg-devel,V2,1/3] libavcodec/qsvenc: Add max slice size support to hevc_qsv | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_ppc | success | Make finished |
| andriy/make_fate_ppc | success | Make fate finished |
On Tue, 2022-01-25 at 15:12 +0800, Wenbin Chen wrote: > Add max_slice_size option to hevc_qsv as well. > > Signed-off-by: Wenbin Chen <wenbin.chen@intel.com> > --- > doc/encoders.texi | 3 +++ > libavcodec/qsvenc.c | 9 ++++----- > 2 files changed, 7 insertions(+), 5 deletions(-) > > diff --git a/doc/encoders.texi b/doc/encoders.texi > index e3adbf4325..8966610263 100644 > --- a/doc/encoders.texi > +++ b/doc/encoders.texi > @@ -3397,6 +3397,9 @@ Enable rate distortion optimization. > @item @var{max_frame_size} > Maximum encoded frame size in bytes. > > +@item @var{max_slice_size} > +Maximum encoded slice size in bytes. > + > @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 413e5ae8f6..f311cd9ce4 100644 > --- a/libavcodec/qsvenc.c > +++ b/libavcodec/qsvenc.c > @@ -877,11 +877,6 @@ static int init_video_param(AVCodecContext *avctx, > QSVEncContext *q) > if (q->mbbrc >= 0) > q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : > MFX_CODINGOPTION_OFF; > > -#if QSV_HAVE_MAX_SLICE_SIZE > - if (q->max_slice_size >= 0) > - q->extco2.MaxSliceSize = q->max_slice_size; > -#endif > - > #if QSV_HAVE_TRELLIS > if (avctx->trellis >= 0) > q->extco2.Trellis = (avctx->trellis == 0) ? MFX_TRELLIS_OFF : > (MFX_TRELLIS_I | MFX_TRELLIS_P | MFX_TRELLIS_B); > @@ -907,6 +902,10 @@ static int init_video_param(AVCodecContext *avctx, > QSVEncContext *q) > q->extco2.ExtBRC = q->extbrc ? MFX_CODINGOPTION_ON : > MFX_CODINGOPTION_OFF; > if (q->max_frame_size >= 0) > q->extco2.MaxFrameSize = q->max_frame_size; > +#if QSV_HAVE_MAX_SLICE_SIZE > + if (q->max_slice_size >= 0) > + q->extco2.MaxSliceSize = q->max_slice_size; > +#endif > #if QSV_HAVE_DISABLEDEBLOCKIDC > q->extco2.DisableDeblockingIdc = q->dblk_idc; > #endif Patchset LGTM, will apply. -Haihao
diff --git a/doc/encoders.texi b/doc/encoders.texi index e3adbf4325..8966610263 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -3397,6 +3397,9 @@ Enable rate distortion optimization. @item @var{max_frame_size} Maximum encoded frame size in bytes. +@item @var{max_slice_size} +Maximum encoded slice size in bytes. + @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 413e5ae8f6..f311cd9ce4 100644 --- a/libavcodec/qsvenc.c +++ b/libavcodec/qsvenc.c @@ -877,11 +877,6 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) if (q->mbbrc >= 0) q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; -#if QSV_HAVE_MAX_SLICE_SIZE - if (q->max_slice_size >= 0) - q->extco2.MaxSliceSize = q->max_slice_size; -#endif - #if QSV_HAVE_TRELLIS if (avctx->trellis >= 0) q->extco2.Trellis = (avctx->trellis == 0) ? MFX_TRELLIS_OFF : (MFX_TRELLIS_I | MFX_TRELLIS_P | MFX_TRELLIS_B); @@ -907,6 +902,10 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q) q->extco2.ExtBRC = q->extbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF; if (q->max_frame_size >= 0) q->extco2.MaxFrameSize = q->max_frame_size; +#if QSV_HAVE_MAX_SLICE_SIZE + if (q->max_slice_size >= 0) + q->extco2.MaxSliceSize = q->max_slice_size; +#endif #if QSV_HAVE_DISABLEDEBLOCKIDC q->extco2.DisableDeblockingIdc = q->dblk_idc; #endif
Add max_slice_size option to hevc_qsv as well. Signed-off-by: Wenbin Chen <wenbin.chen@intel.com> --- doc/encoders.texi | 3 +++ libavcodec/qsvenc.c | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-)