Mercurial > libavcodec.hg
comparison libvorbis.c @ 11827:e778b61f86f2 libavcodec
libvorbis: Hook up min/max bitrate
author | conrad |
---|---|
date | Fri, 04 Jun 2010 22:40:31 +0000 |
parents | 7dd2a45249a9 |
children | 474766be9e4d |
comparison
equal
deleted
inserted
replaced
11826:11c5a87497d3 | 11827:e778b61f86f2 |
---|---|
58 if(vorbis_encode_setup_vbr(vi, avccontext->channels, | 58 if(vorbis_encode_setup_vbr(vi, avccontext->channels, |
59 avccontext->sample_rate, | 59 avccontext->sample_rate, |
60 avccontext->global_quality / (float)FF_QP2LAMBDA / 10.0)) | 60 avccontext->global_quality / (float)FF_QP2LAMBDA / 10.0)) |
61 return -1; | 61 return -1; |
62 } else { | 62 } else { |
63 int minrate = avccontext->rc_min_rate > 0 ? avccontext->rc_min_rate : -1; | |
64 int maxrate = avccontext->rc_min_rate > 0 ? avccontext->rc_max_rate : -1; | |
65 | |
63 /* constant bitrate */ | 66 /* constant bitrate */ |
64 if(vorbis_encode_setup_managed(vi, avccontext->channels, | 67 if(vorbis_encode_setup_managed(vi, avccontext->channels, |
65 avccontext->sample_rate, -1, avccontext->bit_rate, -1)) | 68 avccontext->sample_rate, minrate, avccontext->bit_rate, maxrate)) |
66 return -1; | 69 return -1; |
67 | 70 |
68 #ifdef OGGVORBIS_VBR_BY_ESTIMATE | 71 #ifdef OGGVORBIS_VBR_BY_ESTIMATE |
69 /* variable bitrate by estimate */ | 72 /* variable bitrate by estimate */ |
70 if(vorbis_encode_ctl(vi, OV_ECTL_RATEMANAGE_AVG, NULL)) | 73 if(vorbis_encode_ctl(vi, OV_ECTL_RATEMANAGE_AVG, NULL)) |