summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWenbin Chen <wenbin.chen-at-intel.com@ffmpeg.org>2022-01-25 15:12:35 +0800
committerHaihao Xiang <haihao.xiang@intel.com>2022-01-27 10:26:26 +0800
commit168c6e23a54a65447110e4033b11b5965fd560c1 (patch)
tree1c0eac97eab6eb6567fce4d25753ace7eec22145
parent5e9ac1ebecbe49f8ac0df639ff6c0018a926dc14 (diff)
libavcodec/qsvenc: Add max slice size support to hevc_qsv
Add max_slice_size option to hevc_qsv as well. Signed-off-by: Wenbin Chen <wenbin.chen@intel.com> Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
-rw-r--r--doc/encoders.texi3
-rw-r--r--libavcodec/qsvenc.c9
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 acb82f321c..6177fbc78c 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