diff options
| author | Danil Chapovalov <danilchap-at-google.com@ffmpeg.org> | 2022-03-30 20:24:32 +0200 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2022-04-05 17:38:52 -0700 |
| commit | 706f12992dbe22617ba0406cfff09201bc905b4e (patch) | |
| tree | fdae5b4cf12e1075f74ce43cf03d89188b04999c | |
| parent | c9ecbc08a17d8e7ed52a2abaaa97caa197e2e7bc (diff) | |
| download | ffmpeg-706f12992dbe22617ba0406cfff09201bc905b4e.tar.gz | |
avcodec/libvpxenc: enable dynamic max quantizer reconfiguration
Signed-off-by: James Zern <jzern@google.com>
| -rw-r--r-- | doc/encoders.texi | 3 | ||||
| -rw-r--r-- | libavcodec/libvpxenc.c | 10 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
3 files changed, 14 insertions, 1 deletions
diff --git a/doc/encoders.texi b/doc/encoders.texi index 4b8cc69c0d..a304f865a6 100644 --- a/doc/encoders.texi +++ b/doc/encoders.texi @@ -1996,8 +1996,11 @@ kilobits/s. @item keyint_min (@emph{kf-min-dist}) @item qmin (@emph{min-q}) +Minimum (Best Quality) Quantizer. @item qmax (@emph{max-q}) +Maximum (Worst Quality) Quantizer. +Can be changed per-frame. @item bufsize (@emph{buf-sz}, @emph{buf-optimal-sz}) Set ratecontrol buffer size (in bits). Note @command{vpxenc}'s options are diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 7438ad87a3..e35b47b87e 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -1629,6 +1629,16 @@ static int vpx_encode(AVCodecContext *avctx, AVPacket *pkt, vpx_svc_layer_id_t layer_id; int layer_id_valid = 0; + if (avctx->qmax >= 0 && enccfg->rc_max_quantizer != avctx->qmax) { + struct vpx_codec_enc_cfg cfg = *enccfg; + cfg.rc_max_quantizer = avctx->qmax; + res = vpx_codec_enc_config_set(&ctx->encoder, &cfg); + if (res != VPX_CODEC_OK) { + log_encoder_error(avctx, "Error reconfiguring encoder"); + return AVERROR_INVALIDDATA; + } + } + if (frame) { const AVFrameSideData *sd = av_frame_get_side_data(frame, AV_FRAME_DATA_REGIONS_OF_INTEREST); rawimg = &ctx->rawimg; diff --git a/libavcodec/version.h b/libavcodec/version.h index a744e7469f..aa3a484c51 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #include "version_major.h" #define LIBAVCODEC_VERSION_MINOR 25 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |