[FFmpeg-cvslog] libavcodec/qsvenc: Add min/max QP control options for I/P/B frame
Yue Heng
git at videolan.org
Mon Jun 6 09:15:17 EEST 2022
ffmpeg | branch: master | Yue Heng <yue.heng at intel.com> | Wed May 25 21:13:41 2022 +0800| [11912f65ef5ad12db938e404eafc855af1bc3859] | committer: Haihao Xiang
libavcodec/qsvenc: Add min/max QP control options for I/P/B frame
To do more accurate QP control, add min/max QP control on I/P/B frame
separately to qsv encoder. qmax and qmin still work but newly-added
options have higher priority.
Signed-off-by: Yue Heng <yue.heng at intel.com>
Signed-off-by: Wenbin Chen <wenbin.chen at intel.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=11912f65ef5ad12db938e404eafc855af1bc3859
---
doc/encoders.texi | 36 ++++++++++++++++++++++++++++++++++++
libavcodec/qsvenc.c | 21 +++++++++++++++++++--
libavcodec/qsvenc.h | 15 +++++++++++++++
libavcodec/qsvenc_h264.c | 1 +
libavcodec/qsvenc_hevc.c | 1 +
5 files changed, 72 insertions(+), 2 deletions(-)
diff --git a/doc/encoders.texi b/doc/encoders.texi
index bee45f9853..1850c99fe9 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -3472,6 +3472,24 @@ Multi-Frame Mode.
@item @var{repeat_pps}
Repeat pps for every frame.
+
+ at item @var{max_qp_i}
+Maximum video quantizer scale for I frame.
+
+ at item @var{min_qp_i}
+Minimum video quantizer scale for I frame.
+
+ at item @var{max_qp_p}
+Maximum video quantizer scale for P frame.
+
+ at item @var{min_qp_p}
+Minimum video quantizer scale for P frame.
+
+ at item @var{max_qp_b}
+Maximum video quantizer scale for B frame.
+
+ at item @var{min_qp_b}
+Minimum video quantizer scale for B frame.
@end table
@subsection HEVC Options
@@ -3595,6 +3613,24 @@ range is [-63, 63] for 10 bit-depth or [-75, 75] for 12 bit-depth respectively.
@item @var{int_ref_cycle_dist}
Distance between the beginnings of the intra-refresh cycles in frames.
+
+ at item @var{max_qp_i}
+Maximum video quantizer scale for I frame.
+
+ at item @var{min_qp_i}
+Minimum video quantizer scale for I frame.
+
+ at item @var{max_qp_p}
+Maximum video quantizer scale for P frame.
+
+ at item @var{min_qp_p}
+Minimum video quantizer scale for P frame.
+
+ at item @var{max_qp_b}
+Maximum video quantizer scale for B frame.
+
+ at item @var{min_qp_b}
+Minimum video quantizer scale for B frame.
@end table
@subsection MPEG2 Options
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 2b3b06767d..03e9e5523d 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -828,8 +828,13 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
if (q->b_strategy >= 0)
q->extco2.BRefType = q->b_strategy ? MFX_B_REF_PYRAMID : MFX_B_REF_OFF;
- if (avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) {
- av_log(avctx, AV_LOG_ERROR, "qmin and or qmax are set but invalid, please make sure min <= max\n");
+ if ((avctx->qmin >= 0 && avctx->qmax >= 0 && avctx->qmin > avctx->qmax) ||
+ (q->max_qp_i >= 0 && q->min_qp_i >= 0 && q->min_qp_i > q->max_qp_i) ||
+ (q->max_qp_p >= 0 && q->min_qp_p >= 0 && q->min_qp_p > q->max_qp_p) ||
+ (q->max_qp_b >= 0 && q->min_qp_b >= 0 && q->min_qp_b > q->max_qp_b)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "qmin and or qmax are set but invalid,"
+ " please make sure min <= max\n");
return AVERROR(EINVAL);
}
if (avctx->qmin >= 0) {
@@ -840,6 +845,18 @@ static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
q->extco2.MaxQPI = avctx->qmax > 51 ? 51 : avctx->qmax;
q->extco2.MaxQPP = q->extco2.MaxQPB = q->extco2.MaxQPI;
}
+ if (q->min_qp_i >= 0)
+ q->extco2.MinQPI = q->min_qp_i > 51 ? 51 : q->min_qp_i;
+ if (q->max_qp_i >= 0)
+ q->extco2.MaxQPI = q->max_qp_i > 51 ? 51 : q->max_qp_i;
+ if (q->min_qp_p >= 0)
+ q->extco2.MinQPP = q->min_qp_p > 51 ? 51 : q->min_qp_p;
+ if (q->max_qp_p >= 0)
+ q->extco2.MaxQPP = q->max_qp_p > 51 ? 51 : q->max_qp_p;
+ if (q->min_qp_b >= 0)
+ q->extco2.MinQPB = q->min_qp_b > 51 ? 51 : q->min_qp_b;
+ if (q->max_qp_b >= 0)
+ q->extco2.MaxQPB = q->max_qp_b > 51 ? 51 : q->max_qp_b;
if (q->mbbrc >= 0)
q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
index fec5e584db..b754ac4b56 100644
--- a/libavcodec/qsvenc.h
+++ b/libavcodec/qsvenc.h
@@ -100,6 +100,14 @@
#define QSV_OPTION_LOW_DELAY_BRC \
{ "low_delay_brc", "Allow to strictly obey avg frame size", OFFSET(qsv.low_delay_brc), AV_OPT_TYPE_BOOL,{ .i64 = -1 }, -1, 1, VE },
+#define QSV_OPTION_MAX_MIN_QP \
+{ "max_qp_i", "Maximum video quantizer scale for I frame", OFFSET(qsv.max_qp_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, \
+{ "min_qp_i", "Minimum video quantizer scale for I frame", OFFSET(qsv.min_qp_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, \
+{ "max_qp_p", "Maximum video quantizer scale for P frame", OFFSET(qsv.max_qp_p), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, \
+{ "min_qp_p", "Minimum video quantizer scale for P frame", OFFSET(qsv.min_qp_p), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, \
+{ "max_qp_b", "Maximum video quantizer scale for B frame", OFFSET(qsv.max_qp_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE}, \
+{ "min_qp_b", "Minimum video quantizer scale for B frame", OFFSET(qsv.min_qp_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 51, VE},
+
extern const AVCodecHWConfigInternal *const ff_qsv_enc_hw_configs[];
typedef int SetEncodeCtrlCB (AVCodecContext *avctx,
@@ -209,6 +217,13 @@ typedef struct QSVEncContext {
int co3_idx;
int exthevctiles_idx;
int vp9_idx;
+
+ int max_qp_i;
+ int min_qp_i;
+ int max_qp_p;
+ int min_qp_p;
+ int max_qp_b;
+ int min_qp_b;
} QSVEncContext;
int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index cf77ea575b..87b09360cb 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -114,6 +114,7 @@ static const AVOption options[] = {
QSV_OPTION_B_STRATEGY
QSV_OPTION_DBLK_IDC
QSV_OPTION_LOW_DELAY_BRC
+ QSV_OPTION_MAX_MIN_QP
{ "cavlc", "Enable CAVLC", OFFSET(qsv.cavlc), AV_OPT_TYPE_BOOL, { .i64 = 0 }, 0, 1, VE },
#if QSV_HAVE_VCM
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
index a6bf39c148..da2bf457af 100644
--- a/libavcodec/qsvenc_hevc.c
+++ b/libavcodec/qsvenc_hevc.c
@@ -233,6 +233,7 @@ static const AVOption options[] = {
QSV_OPTION_B_STRATEGY
QSV_OPTION_DBLK_IDC
QSV_OPTION_LOW_DELAY_BRC
+ QSV_OPTION_MAX_MIN_QP
{ "idr_interval", "Distance (in I-frames) between IDR frames", OFFSET(qsv.idr_interval), AV_OPT_TYPE_INT, { .i64 = 0 }, -1, INT_MAX, VE, "idr_interval" },
{ "begin_only", "Output an IDR-frame only at the beginning of the stream", 0, AV_OPT_TYPE_CONST, { .i64 = -1 }, 0, 0, VE, "idr_interval" },
More information about the ffmpeg-cvslog
mailing list