Change libaom default to crf=32.

Current default is 256kbps, which produces inconsistent
results (too high for low-res, too low for hi-res).
Use CRF instead, which will adapt.

Signed-off-by: James Zern <jzern@google.com>
This commit is contained in:
elliottk 2019-08-21 12:18:20 -07:00 committed by James Zern
parent 0b34cdf424
commit 711c59bc57
2 changed files with 6 additions and 5 deletions

View File

@ -575,10 +575,11 @@ static av_cold int aom_init(AVCodecContext *avctx,
if (enccfg.rc_end_usage == AOM_CQ) { if (enccfg.rc_end_usage == AOM_CQ) {
enccfg.rc_target_bitrate = 1000000; enccfg.rc_target_bitrate = 1000000;
} else { } else {
avctx->bit_rate = enccfg.rc_target_bitrate * 1000; enccfg.rc_end_usage = AOM_Q;
ctx->crf = 32;
av_log(avctx, AV_LOG_WARNING, av_log(avctx, AV_LOG_WARNING,
"Neither bitrate nor constrained quality specified, using default bitrate of %dkbit/sec\n", "Neither bitrate nor constrained quality specified, using default CRF of %d\n",
enccfg.rc_target_bitrate); ctx->crf);
} }
} }
@ -1091,7 +1092,7 @@ static const AVOption options[] = {
}; };
static const AVCodecDefault defaults[] = { static const AVCodecDefault defaults[] = {
{ "b", "256*1000" }, { "b", "0" },
{ "qmin", "-1" }, { "qmin", "-1" },
{ "qmax", "-1" }, { "qmax", "-1" },
{ "g", "-1" }, { "g", "-1" },

View File

@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58 #define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 55 #define LIBAVCODEC_VERSION_MINOR 55
#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_MICRO 101
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \ LIBAVCODEC_VERSION_MINOR, \