diff options
| author | James Zern <jzern@google.com> | 2010-07-12 21:23:03 +0000 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@rainbow.studorg.tuwien.ac.at> | 2010-07-12 21:23:03 +0000 |
| commit | f07c9895e0737f0f6a9874f0494f92a59c085f20 (patch) | |
| tree | 6434e60e64a9c3bbfcf397f22bafc30a2b15dd5a /libavcodec | |
| parent | 8e3275c1a23d70c46220399f6dbfee982c03249b (diff) | |
| download | ffmpeg-f07c9895e0737f0f6a9874f0494f92a59c085f20.tar.gz | |
Do not map video quantizer scale (from 1-51 to 0-63) for libvpx anymore.
Patch by James Zern, jzern google
Originally committed as revision 24223 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/libvpxenc.c | 5 | ||||
| -rw-r--r-- | libavcodec/options.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/libavcodec/libvpxenc.c b/libavcodec/libvpxenc.c index 510bf043a5..c83ab936d4 100644 --- a/libavcodec/libvpxenc.c +++ b/libavcodec/libvpxenc.c @@ -237,9 +237,8 @@ static av_cold int vp8_init(AVCodecContext *avctx) enccfg.rc_target_bitrate = av_rescale_rnd(avctx->bit_rate, 1, 1000, AV_ROUND_NEAR_INF); - //convert [1,51] -> [0,63] - enccfg.rc_min_quantizer = ((avctx->qmin * 5 + 1) >> 2) - 1; - enccfg.rc_max_quantizer = ((avctx->qmax * 5 + 1) >> 2) - 1; + enccfg.rc_min_quantizer = avctx->qmin; + enccfg.rc_max_quantizer = avctx->qmax; enccfg.rc_dropframe_thresh = avctx->frame_skip_threshold; //_enc_init() will balk if kf_min_dist differs from max w/VPX_KF_AUTO diff --git a/libavcodec/options.c b/libavcodec/options.c index d20a643fa4..744957dc5f 100644 --- a/libavcodec/options.c +++ b/libavcodec/options.c @@ -117,8 +117,8 @@ static const AVOption options[]={ {"delay", NULL, OFFSET(delay), FF_OPT_TYPE_INT, DEFAULT, INT_MIN, INT_MAX}, {"qcomp", "video quantizer scale compression (VBR)", OFFSET(qcompress), FF_OPT_TYPE_FLOAT, 0.5, -FLT_MAX, FLT_MAX, V|E}, {"qblur", "video quantizer scale blur (VBR)", OFFSET(qblur), FF_OPT_TYPE_FLOAT, 0.5, 0, FLT_MAX, V|E}, -{"qmin", "min video quantizer scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, 2, 1, 63, V|E}, -{"qmax", "max video quantizer scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, 31, 1, 63, V|E}, +{"qmin", "min video quantizer scale (VBR)", OFFSET(qmin), FF_OPT_TYPE_INT, 2, 0, 63, V|E}, +{"qmax", "max video quantizer scale (VBR)", OFFSET(qmax), FF_OPT_TYPE_INT, 31, 0, 63, V|E}, {"qdiff", "max difference between the quantizer scale (VBR)", OFFSET(max_qdiff), FF_OPT_TYPE_INT, 3, INT_MIN, INT_MAX, V|E}, {"bf", "use 'frames' B frames", OFFSET(max_b_frames), FF_OPT_TYPE_INT, DEFAULT, 0, FF_MAX_B_FRAMES, V|E}, {"b_qfactor", "qp factor between p and b frames", OFFSET(b_quant_factor), FF_OPT_TYPE_FLOAT, 1.25, -FLT_MAX, FLT_MAX, V|E}, |