Current default is 200kbps, which produces inconsistent
results (too high for low-res, too low for hi-res). Use
CRF instead, which will adapt. Affects vp8/vp9. Also
have VP8 use a default bitrate of 256kbps.
---
libavcodec/libvpxenc.c | 71 +++++++++++++++++++++++++++++++++++-------
libavcodec/version.h | 2 +-
2 files changed, 61 insertions(+), 12 deletions(-)
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c
index feb52ea0dd..42504ab95e 100644
--- a/libavcodec/libvpxenc.c
+++ b/libavcodec/libvpxenc.c
@@ -510,6 +510,63 @@ static void set_color_range(AVCodecContext *avctx)
#endif
#endif
+/**
+ * Set the target bitrate to VPX library default. Also set CRF to 32 if needed.
+ */
+static void set_vp8_defaults(AVCodecContext *avctx,
+ struct vpx_codec_enc_cfg *enccfg) {
+ VPxContext *ctx = avctx->priv_data;
+ av_assert0(!avctx->bit_rate);
+ avctx->bit_rate = enccfg->rc_target_bitrate * 1000;
+ if (enccfg->rc_end_usage == VPX_CQ) {
+ av_log(avctx, AV_LOG_WARNING,
+ "Bitrate not specified for constrained quality mode, using default
of %dkbit/sec\n",
+ enccfg->rc_target_bitrate);
+ } else {
+ enccfg->rc_end_usage = VPX_CQ;
+ ctx->crf = 32;
+ av_log(avctx, AV_LOG_WARNING,
+ "Neither bitrate nor constrained quality specified, using default
CRF of %d and bitrate of %dkbit/sec\n",
+ ctx->crf, enccfg->rc_target_bitrate);
+ }
+}
+
+
+#if CONFIG_LIBVPX_VP9_ENCODER
+/**
+ * Keep the target bitrate at 0 to engage constant quality mode. If CRF is not
+ * set, use 32.
+ */
+static void set_vp9_defaults(AVCodecContext *avctx,
+ struct vpx_codec_enc_cfg *enccfg) {
+ VPxContext *ctx = avctx->priv_data;
+ av_assert0(!avctx->bit_rate);
+ if (enccfg->rc_end_usage != VPX_Q && ctx->lossless < 0) {
+ enccfg->rc_end_usage = VPX_Q;
+ ctx->crf = 32;
+ av_log(avctx, AV_LOG_WARNING,
+ "Neither bitrate nor constrained quality specified, using default
CRF of %d\n",
+ ctx->crf);
+ }
+}
+#endif
+
+/**
+ * Called when the bitrate is not set. It sets appropriate default values for
+ * bit-rate and CRF.
+ */
+static void set_vpx_defaults(AVCodecContext *avctx,
+ struct vpx_codec_enc_cfg *enccfg) {
+ av_assert0(!avctx->bit_rate);
+#if CONFIG_LIBVPX_VP9_ENCODER
+ if (avctx->codec_id == AV_CODEC_ID_VP9) {
+ set_vp9_defaults(avctx, enccfg);
+ return;
+ }
+#endif
+ set_vp8_defaults(avctx, enccfg);
+}
+
static av_cold int vpx_init(AVCodecContext *avctx,
const struct vpx_codec_iface *iface)
{
@@ -580,18 +637,9 @@ static av_cold int vpx_init(AVCodecContext *avctx,
if (avctx->bit_rate) {
enccfg.rc_target_bitrate = av_rescale_rnd(avctx->bit_rate, 1, 1000,
AV_ROUND_NEAR_INF);
-#if CONFIG_LIBVPX_VP9_ENCODER
- } else if (enccfg.rc_end_usage == VPX_Q) {
-#endif
} else {
- if (enccfg.rc_end_usage == VPX_CQ) {
- enccfg.rc_target_bitrate = 1000000;
- } else {
- avctx->bit_rate = enccfg.rc_target_bitrate * 1000;
- av_log(avctx, AV_LOG_WARNING,
- "Neither bitrate nor constrained quality specified, using
default bitrate of %dkbit/sec\n",
- enccfg.rc_target_bitrate);
- }
+ // Set bit-rate to default value. Also sets CRF to default if needed.
+ set_vpx_defaults(avctx, &enccfg);
}
if (avctx->codec_id == AV_CODEC_ID_VP9 && ctx->lossless == 1) {
@@ -1266,6 +1314,7 @@ static const AVOption vp9_options[] = {
#undef LEGACY_OPTIONS
static const AVCodecDefault defaults[] = {
+ { "b", "0" },
{ "qmin", "-1" },
{ "qmax", "-1" },
{ "g", "-1" },
diff --git a/libavcodec/version.h b/libavcodec/version.h
index e70ebc0c70..cda6dbae47 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 55
-#define LIBAVCODEC_VERSION_MICRO 101
+#define LIBAVCODEC_VERSION_MICRO 102
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
--
2.23.0.187.g17f5b7556c-goog
_______________________________________________
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".
