Signed-off-by: Wenbin Chen <wenbin.c...@intel.com>
---
doc/encoders.texi | 11 +++++++
libavcodec/qsvenc.c | 78 +++++++++++++++++++++++++++++++++++++++++++++
libavcodec/qsvenc.h | 9 ++++++
3 files changed, 98 insertions(+)
diff --git a/doc/encoders.texi b/doc/encoders.texi
index b28b1f7f0b..fad3cad30b 100644
--- a/doc/encoders.texi
+++ b/doc/encoders.texi
@@ -3358,6 +3358,17 @@ Change this value to reset qsv codec's gop configuration.
@item @var{int_ref_cycle_dist}
Supported in h264_qsv and hevc_qsv.
Change these value to reset qsv codec's Intra Refresh configuration.
+
+@item @var{qmax}
+@item @var{qmin}
+@item @var{max_qp_i}
+@item @var{min_qp_i}
+@item @var{max_qp_p}
+@item @var{min_qp_p}
+@item @var{max_qp_b}
+@item @var{min_qp_b}
+Supported in h264_qsv.
+Change these value to reset qsv codec's max/min qp configuration.
@end table
@subsection H264 options
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index dbb1f49101..3a3e6ccc9a 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -858,22 +858,30 @@ static int init_video_param(AVCodecContext *avctx,
QSVEncContext *q)
q->extco2.MinQPI = avctx->qmin > 51 ? 51 : avctx->qmin;
q->extco2.MinQPP = q->extco2.MinQPB = q->extco2.MinQPI;
}
+ q->old_qmin = avctx->qmin;
if (avctx->qmax >= 0) {
q->extco2.MaxQPI = avctx->qmax > 51 ? 51 : avctx->qmax;
q->extco2.MaxQPP = q->extco2.MaxQPB = q->extco2.MaxQPI;
}
+ q->old_qmax = avctx->qmax;
if (q->min_qp_i >= 0)
q->extco2.MinQPI = q->min_qp_i > 51 ? 51 : q->min_qp_i;
+ q->old_min_qp_i = q->min_qp_i;
if (q->max_qp_i >= 0)
q->extco2.MaxQPI = q->max_qp_i > 51 ? 51 : q->max_qp_i;
+ q->old_max_qp_i = q->max_qp_i;
if (q->min_qp_p >= 0)
q->extco2.MinQPP = q->min_qp_p > 51 ? 51 : q->min_qp_p;
+ q->old_min_qp_p = q->min_qp_p;
if (q->max_qp_p >= 0)
q->extco2.MaxQPP = q->max_qp_p > 51 ? 51 : q->max_qp_p;
+ q->old_max_qp_p = q->max_qp_p;
if (q->min_qp_b >= 0)
q->extco2.MinQPB = q->min_qp_b > 51 ? 51 : q->min_qp_b;
+ q->old_min_qp_b = q->min_qp_b;
if (q->max_qp_b >= 0)
q->extco2.MaxQPB = q->max_qp_b > 51 ? 51 : q->max_qp_b;
+ q->old_max_qp_b = q->max_qp_b;
if (q->mbbrc >= 0)
q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON :
MFX_CODINGOPTION_OFF;
@@ -1739,6 +1747,71 @@ static int update_rir(AVCodecContext *avctx,
QSVEncContext *q)
return updated;
}
+static int update_min_max_qp(AVCodecContext *avctx, QSVEncContext *q)
+{
+ int updated = 0;
+
+ if (avctx->codec_id != AV_CODEC_ID_H264)
+ return 0;
+
+ UPDATE_PARAM(q->old_qmax, avctx->qmin);
+ UPDATE_PARAM(q->old_qmax, avctx->qmin);
+ UPDATE_PARAM(q->old_min_qp_i, q->min_qp_i);
+ UPDATE_PARAM(q->old_max_qp_i, q->max_qp_i);
+ UPDATE_PARAM(q->old_min_qp_p, q->min_qp_p);
+ UPDATE_PARAM(q->old_max_qp_p, q->max_qp_p);
+ UPDATE_PARAM(q->old_min_qp_b, q->min_qp_b);
+ UPDATE_PARAM(q->old_max_qp_b, q->max_qp_b);
+ if (!updated)
+ return 0;
+
+ 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);
+ }
+
+ q->extco2.MinQPI = 0;
+ q->extco2.MaxQPI = 0;
+ q->extco2.MinQPP = 0;
+ q->extco2.MaxQPP = 0;
+ q->extco2.MinQPB = 0;
+ q->extco2.MaxQPB = 0;
+ if (avctx->qmin >= 0) {
+ q->extco2.MinQPI = avctx->qmin > 51 ? 51 : avctx->qmin;
+ q->extco2.MinQPB = q->extco2.MinQPP = q->extco2.MinQPI;
+ }
+ if (avctx->qmax >= 0) {
+ q->extco2.MaxQPI = avctx->qmax > 51 ? 51 : avctx->qmax;
+ q->extco2.MaxQPB = q->extco2.MaxQPP = 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;
+
+ av_log(avctx, AV_LOG_VERBOSE, "Reset MinQPI: %d; MaxQPI: %d; "
+ "MinQPP: %d; MaxQPP: %d; "
+ "MinQPB: %d; MaxQPB: %d\n",
+ q->extco2.MinQPI, q->extco2.MaxQPI,
+ q->extco2.MinQPP, q->extco2.MaxQPP,
+ q->extco2.MinQPB, q->extco2.MaxQPB);
+
+ return updated;
+}
+
static int update_parameters(AVCodecContext *avctx, QSVEncContext *q,
const AVFrame *frame)
{
@@ -1751,6 +1824,11 @@ static int update_parameters(AVCodecContext *avctx,
QSVEncContext *q,
needReset |= update_max_frame_size(avctx, q);
needReset |= update_gop_size(avctx, q);
needReset |= update_rir(avctx, q);
+
+ ret = update_min_max_qp(avctx, q);
+ if (ret < 0)
+ return ret;
+ needReset |= ret;
if (!needReset)
return 0;
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
index 5a395d422e..f48c87fbad 100644
--- a/libavcodec/qsvenc.h
+++ b/libavcodec/qsvenc.h
@@ -244,6 +244,15 @@ typedef struct QSVEncContext {
int old_int_ref_cycle_size;
int old_int_ref_qp_delta;
int old_int_ref_cycle_dist;
+ // These are used for max/min qp reset;
+ int old_qmax;
+ int old_qmin;
+ int old_max_qp_i;
+ int old_min_qp_i;
+ int old_max_qp_p;
+ int old_min_qp_p;
+ int old_max_qp_b;
+ int old_min_qp_b;
} QSVEncContext;
int ff_qsv_enc_init(AVCodecContext *avctx, QSVEncContext *q);
--
2.32.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
