---
libavcodec/qsvenc.c | 71 ++++++++++++++++++++++++++++++++++++++++++++++-
libavcodec/qsvenc.h | 28 +++++++++++++++++++
libavcodec/qsvenc_h264.c | 16 +++++++++++
libavcodec/qsvenc_hevc.c | 1 +
libavcodec/qsvenc_mpeg2.c | 1 +
5 files changed, 116 insertions(+), 1 deletion(-)
diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
index 4a44b53..4fc3861 100644
--- a/libavcodec/qsvenc.c
+++ b/libavcodec/qsvenc.c
@@ -203,7 +203,7 @@ static void dump_video_param(AVCodecContext *avctx,
QSVEncContext *q,
print_threestate(co->RecoveryPointSEI), co2->IntRefType,
co2->IntRefCycleSize, co2->IntRefQPDelta);
av_log(avctx, AV_LOG_VERBOSE, "MaxFrameSize: %"PRIu16"; ",
co2->MaxFrameSize);
-#if QSV_VERSION_ATLEAST(1, 9)
+#if QSV_HAVE_MAX_SLICE_SIZE
av_log(avctx, AV_LOG_VERBOSE, "MaxSliceSize: %"PRIu16"; ",
co2->MaxSliceSize);
#endif
av_log(avctx, AV_LOG_VERBOSE, "\n");
@@ -339,6 +339,18 @@ static int select_rc_mode(AVCodecContext *avctx,
QSVEncContext *q)
return 0;
}
+static int rc_supported(QSVEncContext *q)
+{
+ mfxVideoParam param_out = { .mfx.CodecId = q->param.mfx.CodecId };
+ mfxStatus ret;
+
+ ret = MFXVideoENCODE_Query(q->session, &q->param, ¶m_out);
+ if (ret < 0 ||
+ param_out.mfx.RateControlMethod != q->param.mfx.RateControlMethod)
+ return 0;
+ return 1;
+}
+
static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
{
float quant;
@@ -438,17 +450,74 @@ static int init_video_param(AVCodecContext *avctx,
QSVEncContext *q)
q->extco.CAVLC = avctx->coder_type == FF_CODER_TYPE_VLC
?
MFX_CODINGOPTION_ON :
MFX_CODINGOPTION_UNKNOWN;
+ if (q->rdo >= 0)
+ q->extco.RateDistortionOpt = q->rdo > 0 ? MFX_CODINGOPTION_ON :
MFX_CODINGOPTION_OFF;
+
+ if (avctx->codec_id == AV_CODEC_ID_H264) {
+ if (avctx->strict_std_compliance != FF_COMPLIANCE_NORMAL)
+ q->extco.NalHrdConformance = avctx->strict_std_compliance >
FF_COMPLIANCE_NORMAL ?
+ MFX_CODINGOPTION_ON :
MFX_CODINGOPTION_OFF;
+
+ if (q->single_sei_nal_unit >= 0)
+ q->extco.SingleSeiNalUnit = q->single_sei_nal_unit ?
MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;
+ if (q->recovery_point_sei >= 0)
+ q->extco.RecoveryPointSEI = q->recovery_point_sei ?
MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;
+ q->extco.MaxDecFrameBuffering = q->max_dec_frame_buffering;
+ }
+
q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer
*)&q->extco;
#if QSV_HAVE_CO2
if (avctx->codec_id == AV_CODEC_ID_H264) {
q->extco2.Header.BufferId = MFX_EXTBUFF_CODING_OPTION2;
q->extco2.Header.BufferSz = sizeof(q->extco2);
+
+ if (q->int_ref_type >= 0)
+ q->extco2.IntRefType = q->int_ref_type;
+ if (q->int_ref_cycle_size >= 0)
+ q->extco2.IntRefCycleSize = q->int_ref_cycle_size;
+ if (q->int_ref_qp_delta != INT16_MIN)
+ q->extco2.IntRefQPDelta = q->int_ref_qp_delta;
+
+ if (q->bitrate_limit >= 0)
+ q->extco2.BitrateLimit = q->bitrate_limit ?
MFX_CODINGOPTION_ON : MFX_CODINGOPTION_OFF;
+ if (q->mbbrc >= 0)
+ q->extco2.MBBRC = q->mbbrc ? MFX_CODINGOPTION_ON :
MFX_CODINGOPTION_OFF;
+ if (q->extbrc >= 0)
+ 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_TRELLIS
+ q->extco2.Trellis = q->trellis;
+#endif
+
+#if QSV_HAVE_BREF_TYPE
+ if (avctx->b_frame_strategy >= 0)
+ q->extco2.BRefType = avctx->b_frame_strategy ?
MFX_B_REF_PYRAMID : MFX_B_REF_OFF;
+ if (q->adaptive_i >= 0)
+ q->extco2.AdaptiveI = q->adaptive_i ? MFX_CODINGOPTION_ON :
MFX_CODINGOPTION_OFF;
+ if (q->adaptive_b >= 0)
+ q->extco2.AdaptiveB = q->adaptive_b ? MFX_CODINGOPTION_ON :
MFX_CODINGOPTION_OFF;
+#endif
+
q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer
*)&q->extco2;
}
#endif
}
+ if (!rc_supported(q)) {
+ av_log(avctx, AV_LOG_ERROR,
+ "Selected ratecontrol mode is not supported by the QSV "
+ "runtime. Choose a different mode.\n");
+ return AVERROR(ENOSYS);
+ }
+
return 0;
}
diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
index 3935deb..ec0c4df 100644
--- a/libavcodec/qsvenc.h
+++ b/libavcodec/qsvenc.h
@@ -38,6 +38,8 @@
#define QSV_HAVE_CO3 QSV_VERSION_ATLEAST(1, 11)
#define QSV_HAVE_TRELLIS QSV_VERSION_ATLEAST(1, 8)
+#define QSV_HAVE_MAX_SLICE_SIZE QSV_VERSION_ATLEAST(1, 9)
+#define QSV_HAVE_BREF_TYPE QSV_VERSION_ATLEAST(1, 8)
#define QSV_HAVE_LA QSV_VERSION_ATLEAST(1, 7)
#define QSV_HAVE_LA_HRD QSV_VERSION_ATLEAST(1, 11)
@@ -55,6 +57,14 @@
{ "slow", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_BEST_QUALITY
}, INT_MIN, INT_MAX, VE, "preset" }, \
{ "la_depth", "Number of frames to analyze before encoding.",
OFFSET(qsv.la_depth), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, INT16_MAX, VE },
\
{ "vcm", "Use the video conferencing mode ratecontrol", OFFSET(qsv.vcm),
AV_OPT_TYPE_INT, { .i64 = 0 }, 0, 1, VE }, \
+{ "rdo", "Enable rate distortion optimization", OFFSET(qsv.rdo),
AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE }, \
+{ "max_frame_size", "Maximum encoded frame size in bytes",
OFFSET(qsv.max_frame_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, UINT16_MAX, VE
}, \
+{ "max_slice_size", "Maximum encoded slice size in bytes",
OFFSET(qsv.max_slice_size), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, UINT16_MAX, VE
}, \
+{ "bitrate_limit", "Toggle bitrate limitations",
OFFSET(qsv.bitrate_limit), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE
}, \
+{ "mbbrc", "MB level bitrate control",
OFFSET(qsv.mbbrc), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE
}, \
+{ "extbrc", "Extended bitrate control",
OFFSET(qsv.extbrc), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE
}, \
+{ "adaptive_i", "Adaptive I-frame placement",
OFFSET(qsv.adaptive_i), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE
}, \
+{ "adaptive_b", "Adaptive B-frame placement",
OFFSET(qsv.adaptive_b), AV_OPT_TYPE_INT, { .i64 = -1 }, -1, 1, VE
}, \
typedef struct QSVEncContext {
AVCodecContext *avctx;
@@ -95,6 +105,24 @@ typedef struct QSVEncContext {
int avbr_convergence;
int la_depth;
int vcm;
+ int rdo;
+ int max_frame_size;
+ int max_slice_size;
+
+ int single_sei_nal_unit;
+ int max_dec_frame_buffering;
+ int trellis;
+
+ int bitrate_limit;
+ int mbbrc;
+ int extbrc;
+ int adaptive_i;
+ int adaptive_b;
+
+ int int_ref_type;
+ int int_ref_cycle_size;
+ int int_ref_qp_delta;
+ int recovery_point_sei;
char *load_plugins;
} QSVEncContext;
diff --git a/libavcodec/qsvenc_h264.c b/libavcodec/qsvenc_h264.c
index 598a769..2294604 100644
--- a/libavcodec/qsvenc_h264.c
+++ b/libavcodec/qsvenc_h264.c
@@ -68,6 +68,21 @@ static const AVOption options[] = {
QSV_COMMON_OPTS
{ "idr_interval", "Distance (in I-frames) between IDR frames",
OFFSET(qsv.idr_interval), AV_OPT_TYPE_INT, { .i64 = 0 }, 0, INT_MAX, VE },
+ { "single_sei_nal_unit", "Put all the SEI messages into one NALU",
OFFSET(qsv.single_sei_nal_unit), AV_OPT_TYPE_INT, { .i64 = -1 }, -1,
1, VE },
+ { "max_dec_frame_buffering", "Maximum number of frames buffered in the
DPB", OFFSET(qsv.max_dec_frame_buffering), AV_OPT_TYPE_INT, { .i64 = 0 }, 0,
UINT16_MAX, VE },
+
+ { "int_ref_type", "Intra refresh type",
OFFSET(qsv.int_ref_type), AV_OPT_TYPE_INT, { .i64 = -1 }, -1,
UINT16_MAX, VE, "int_ref_type" },
+ { "none", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 0 }, .flags = VE,
"int_ref_type" },
+ { "vertical", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = 1 }, .flags = VE,
"int_ref_type" },
+ { "int_ref_cycle_size", "Number of frames in the intra refresh cycle",
OFFSET(qsv.int_ref_cycle_size), AV_OPT_TYPE_INT, { .i64 = -1 },
-1, UINT16_MAX, VE },
+ { "int_ref_qp_delta", "QP difference for the refresh MBs",
OFFSET(qsv.int_ref_qp_delta), AV_OPT_TYPE_INT, { .i64 = INT16_MIN },
INT16_MIN, INT16_MAX, VE },
+ { "recovery_point_sei", "Insert recovery point SEI messages",
OFFSET(qsv.recovery_point_sei), AV_OPT_TYPE_INT, { .i64 = -1 },
-1, 1, VE },
+
+ { "trellis", "Trellis quantization",
OFFSET(qsv.trellis), AV_OPT_TYPE_FLAGS, { .i64 = 0 }, 0,
UINT_MAX, VE, "trellis" },
+ { "off", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TRELLIS_OFF },
.flags = VE, "trellis" },
+ { "I", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TRELLIS_I },
.flags = VE, "trellis" },
+ { "P", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TRELLIS_P },
.flags = VE, "trellis" },
+ { "B", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TRELLIS_B },
.flags = VE, "trellis" },
{ "profile", NULL, OFFSET(qsv.profile), AV_OPT_TYPE_INT, { .i64 =
MFX_PROFILE_UNKNOWN }, 0, INT_MAX, VE, "profile" },
{ "unknown" , NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_PROFILE_UNKNOWN
}, INT_MIN, INT_MAX, VE, "profile" },
@@ -94,6 +109,7 @@ static const AVCodecDefault qsv_enc_defaults[] = {
{ "coder", "ac" },
{ "flags", "+cgop" },
+ { "b_strategy", "-1" },
{ NULL },
};
diff --git a/libavcodec/qsvenc_hevc.c b/libavcodec/qsvenc_hevc.c
index d075326..063dd9d 100644
--- a/libavcodec/qsvenc_hevc.c
+++ b/libavcodec/qsvenc_hevc.c
@@ -244,6 +244,7 @@ static const AVCodecDefault qsv_enc_defaults[] = {
{ "bf", "3" },
{ "flags", "+cgop" },
+ { "b_strategy", "-1" },
{ NULL },
};
diff --git a/libavcodec/qsvenc_mpeg2.c b/libavcodec/qsvenc_mpeg2.c
index a5dd0e4..dcfcb81 100644
--- a/libavcodec/qsvenc_mpeg2.c
+++ b/libavcodec/qsvenc_mpeg2.c
@@ -89,6 +89,7 @@ static const AVCodecDefault qsv_enc_defaults[] = {
{ "bf", "3" },
{ "flags", "+cgop" },
+ { "b_strategy", "-1" },
{ NULL },
};
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
