Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

libavcodec/qsvenc: Add min/max QP control options for I/P/B frame

Browse Source 
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@intel.com>
Signed-off-by: Wenbin Chen <wenbin.chen@intel.com>
release/5.1
Yue Heng 3 years ago committed by Haihao Xiang
parent e838169181
commit 11912f65ef
5 changed files with 72 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      doc/encoders.texi
  2. 21
      libavcodec/qsvenc.c
  3. 15
      libavcodec/qsvenc.h
  4. 1
      libavcodec/qsvenc_h264.c
  5. 1
      libavcodec/qsvenc_hevc.c

36
doc/encoders.texi
Unescape View File

@ -3472,6 +3472,24 @@ Multi-Frame Mode.
@item @var{repeat_pps}
Repeat pps for every frame.
@item @var{max_qp_i}
Maximum video quantizer scale for I frame.
@item @var{min_qp_i}
Minimum video quantizer scale for I frame.
@item @var{max_qp_p}
Maximum video quantizer scale for P frame.
@item @var{min_qp_p}
Minimum video quantizer scale for P frame.
@item @var{max_qp_b}
Maximum video quantizer scale for B frame.
@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.
@item @var{max_qp_i}
Maximum video quantizer scale for I frame.
@item @var{min_qp_i}
Minimum video quantizer scale for I frame.
@item @var{max_qp_p}
Maximum video quantizer scale for P frame.
@item @var{min_qp_p}
Minimum video quantizer scale for P frame.
@item @var{max_qp_b}
Maximum video quantizer scale for B frame.
@item @var{min_qp_b}
Minimum video quantizer scale for B frame.
@end table
@subsection MPEG2 Options

21
libavcodec/qsvenc.c
Unescape View File

@ -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;

15
libavcodec/qsvenc.h
Unescape View File

@ -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);

1
libavcodec/qsvenc_h264.c
Unescape View File

@ -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

1
libavcodec/qsvenc_hevc.c
Unescape View File

@ -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" },

Write Preview
Loading…
Cancel
Save