On Sun, Nov 8, 2015 at 3:31 PM, Anton Khirnov <[email protected]> wrote:
> ---
> libavcodec/qsvenc.c | 117
> ++++++++++++++++++++++++++++++++++++++++++++--------
> libavcodec/qsvenc.h | 9 +++-
> 2 files changed, 108 insertions(+), 18 deletions(-)
>
> diff --git a/libavcodec/qsvenc.c b/libavcodec/qsvenc.c
> index 7e5c11e..4a44b53 100644
> --- a/libavcodec/qsvenc.c
> +++ b/libavcodec/qsvenc.c
> @@ -266,10 +266,81 @@ static void dump_video_param(AVCodecContext *avctx,
> QSVEncContext *q,
> }
> }
>
> -static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
> +static int select_rc_mode(AVCodecContext *avctx, QSVEncContext *q)
> {
> - const char *ratecontrol_desc;
> + const char *rc_desc;
> + mfxU16 rc_mode;
> +
> + int want_la = q->la_depth >= 0;
> + int want_qscale = !!(avctx->flags & AV_CODEC_FLAG_QSCALE);
> + int want_vcm = q->vcm;
> +
> + if (want_la && !QSV_HAVE_LA) {
> + av_log(avctx, AV_LOG_ERROR,
> + "Lookahead ratecontrol mode requested, but is not supported
> by this SDK version\n");
> + return AVERROR(ENOSYS);
> + }
> + if (want_vcm && !QSV_HAVE_VCM) {
> + av_log(avctx, AV_LOG_ERROR,
> + "VCM ratecontrol mode requested, but is not supported by this
> SDK version\n");
> + return AVERROR(ENOSYS);
> + }
If you want to do these checks properly, you should also check the
runtime library version.
> +
> + if (want_la + want_qscale + want_vcm > 1) {
> + av_log(avctx, AV_LOG_ERROR,
> + "More than one of: { constant qscale, lookahead, VCM }
> requested, "
> + "only one of them can be used at a time.\n");
> + return AVERROR(EINVAL);
> + }
> +
> + if (want_qscale) {
> + rc_mode = MFX_RATECONTROL_CQP;
> + rc_desc = "constant quantization parameter (CQP)";
> + }
> +#if QSV_HAVE_VCM
> + else if (want_vcm) {
> + rc_mode = MFX_RATECONTROL_VCM;
> + rc_desc = "video conferencing mode (VCM)";
> + }
> +#endif
> +#if QSV_HAVE_LA
> + else if (want_la) {
> + rc_mode = MFX_RATECONTROL_LA;
> + rc_desc = "VBR with lookahead (LA)";
> +
> +#if QSV_HAVE_ICQ
> + if (avctx->global_quality > 0) {
> + rc_mode = MFX_RATECONTROL_LA_ICQ;
> + rc_desc = "intelligent constant quality with lookahead (LA_ICQ)";
> + }
> +#endif
> + }
> +#endif
> +#if QSV_HAVE_ICQ
> + else if (avctx->global_quality > 0) {
> + rc_mode = MFX_RATECONTROL_ICQ;
> + rc_desc = "intelligent constant quality (ICQ)";
> + }
> +#endif
> + else if (avctx->rc_max_rate == avctx->bit_rate) {
> + rc_mode = MFX_RATECONTROL_CBR;
> + rc_desc = "constant bitrate (CBR)";
> + } else if (!avctx->rc_max_rate) {
> + rc_mode = MFX_RATECONTROL_AVBR;
> + rc_desc = "average variable bitrate (AVBR)";
> + } else {
> + rc_mode = MFX_RATECONTROL_VBR;
> + rc_desc = "variable bitrate (VBR)";
> + }
>
> + q->param.mfx.RateControlMethod = rc_mode;
> + av_log(avctx, AV_LOG_VERBOSE, "Using the %s ratecontrol method\n",
> rc_desc);
> +
> + return 0;
> +}
> +
> +static int init_video_param(AVCodecContext *avctx, QSVEncContext *q)
> +{
> float quant;
> int ret;
>
> @@ -317,25 +388,16 @@ static int init_video_param(AVCodecContext *avctx,
> QSVEncContext *q)
> q->param.mfx.FrameInfo.FrameRateExtD = avctx->time_base.num;
> }
>
> - if (avctx->flags & AV_CODEC_FLAG_QSCALE) {
> - q->param.mfx.RateControlMethod = MFX_RATECONTROL_CQP;
> - ratecontrol_desc = "constant quantization parameter (CQP)";
> - } else if (avctx->rc_max_rate == avctx->bit_rate) {
> - q->param.mfx.RateControlMethod = MFX_RATECONTROL_CBR;
> - ratecontrol_desc = "constant bitrate (CBR)";
> - } else if (!avctx->rc_max_rate) {
> - q->param.mfx.RateControlMethod = MFX_RATECONTROL_AVBR;
> - ratecontrol_desc = "average variable bitrate (AVBR)";
> - } else {
> - q->param.mfx.RateControlMethod = MFX_RATECONTROL_VBR;
> - ratecontrol_desc = "variable bitrate (VBR)";
> - }
> -
> - av_log(avctx, AV_LOG_VERBOSE, "Using the %s ratecontrol method\n",
> ratecontrol_desc);
> + ret = select_rc_mode(avctx, q);
> + if (ret < 0)
> + return ret;
>
> switch (q->param.mfx.RateControlMethod) {
> case MFX_RATECONTROL_CBR:
> case MFX_RATECONTROL_VBR:
> +#if QSV_HAVE_VCM
> + case MFX_RATECONTROL_VCM:
> +#endif
> q->param.mfx.InitialDelayInKB = avctx->rc_initial_buffer_occupancy /
> 1000;
> q->param.mfx.TargetKbps = avctx->bit_rate / 1000;
> q->param.mfx.MaxKbps = avctx->rc_max_rate / 1000;
> @@ -353,6 +415,19 @@ static int init_video_param(AVCodecContext *avctx,
> QSVEncContext *q)
> q->param.mfx.Convergence = q->avbr_convergence;
> q->param.mfx.Accuracy = q->avbr_accuracy;
> break;
> +#if QSV_HAVE_LA
> + case MFX_RATECONTROL_LA:
> + q->param.mfx.TargetKbps = avctx->bit_rate / 1000;
> + q->extco2.LookAheadDepth = q->la_depth;
> + break;
> +#if QSV_HAVE_ICQ
> + case MFX_RATECONTROL_LA_ICQ:
> + q->extco2.LookAheadDepth = q->la_depth;
> + case MFX_RATECONTROL_ICQ:
> + q->param.mfx.ICQQuality = avctx->global_quality;
> + break;
> +#endif
> +#endif
> }
>
> // the HEVC encoder plugin currently fails if coding options
> @@ -364,6 +439,14 @@ static int init_video_param(AVCodecContext *avctx,
> QSVEncContext *q)
> MFX_CODINGOPTION_ON :
> MFX_CODINGOPTION_UNKNOWN;
>
> 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);
> + q->extparam_internal[q->nb_extparam_internal++] = (mfxExtBuffer
> *)&q->extco2;
> + }
> +#endif
> }
>
> return 0;
> diff --git a/libavcodec/qsvenc.h b/libavcodec/qsvenc.h
> index c309ddb..3935deb 100644
> --- a/libavcodec/qsvenc.h
> +++ b/libavcodec/qsvenc.h
> @@ -53,6 +53,8 @@
> { "fast", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_BEST_SPEED
> }, INT_MIN, INT_MAX, VE, "preset" }, \
> { "medium", NULL, 0, AV_OPT_TYPE_CONST, { .i64 = MFX_TARGETUSAGE_BALANCED
> }, INT_MIN, INT_MAX, VE, "preset" }, \
> { "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 },
> \
>
> typedef struct QSVEncContext {
> AVCodecContext *avctx;
> @@ -69,12 +71,15 @@ typedef struct QSVEncContext {
> mfxFrameAllocRequest req;
>
> mfxExtCodingOption extco;
> +#if QSV_HAVE_CO2
> + mfxExtCodingOption2 extco2;
> +#endif
>
> mfxExtOpaqueSurfaceAlloc opaque_alloc;
> mfxFrameSurface1 **opaque_surfaces;
> AVBufferRef *opaque_alloc_buf;
>
> - mfxExtBuffer *extparam_internal[2];
> + mfxExtBuffer *extparam_internal[2 + QSV_HAVE_CO2];
> int nb_extparam_internal;
>
> mfxExtBuffer **extparam;
> @@ -88,6 +93,8 @@ typedef struct QSVEncContext {
> int preset;
> int avbr_accuracy;
> int avbr_convergence;
> + int la_depth;
> + int vcm;
>
> char *load_plugins;
> } QSVEncContext;
> --
> 2.0.0
>
> _______________________________________________
> libav-devel mailing list
> [email protected]
> https://lists.libav.org/mailman/listinfo/libav-devel
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
