diff options
| author | elliottk <elliottk@google.com> | 2019-08-21 12:18:20 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2019-08-23 10:56:34 -0700 |
| commit | 711c59bc571cf9cddc8c31b11dd924bf9ea95d83 (patch) | |
| tree | 4a423d9493a2459f2d24a024c5fcf254108ac3f1 | |
| parent | 0b34cdf424d665d7d9b92aefdff49a5acc398a6d (diff) | |
| download | ffmpeg-711c59bc571cf9cddc8c31b11dd924bf9ea95d83.tar.gz | |
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>
| -rw-r--r-- | libavcodec/libaomenc.c | 9 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 6 insertions, 5 deletions
diff --git a/libavcodec/libaomenc.c b/libavcodec/libaomenc.c index 9b4fb3b4eb..7f47707a09 100644 --- a/libavcodec/libaomenc.c +++ b/libavcodec/libaomenc.c @@ -575,10 +575,11 @@ static av_cold int aom_init(AVCodecContext *avctx, if (enccfg.rc_end_usage == AOM_CQ) { enccfg.rc_target_bitrate = 1000000; } else { - avctx->bit_rate = enccfg.rc_target_bitrate * 1000; + enccfg.rc_end_usage = AOM_Q; + ctx->crf = 32; av_log(avctx, AV_LOG_WARNING, - "Neither bitrate nor constrained quality specified, using default bitrate of %dkbit/sec\n", - enccfg.rc_target_bitrate); + "Neither bitrate nor constrained quality specified, using default CRF of %d\n", + ctx->crf); } } @@ -1091,7 +1092,7 @@ static const AVOption options[] = { }; static const AVCodecDefault defaults[] = { - { "b", "256*1000" }, + { "b", "0" }, { "qmin", "-1" }, { "qmax", "-1" }, { "g", "-1" }, diff --git a/libavcodec/version.h b/libavcodec/version.h index 43c8cdb59f..e70ebc0c70 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 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |