diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-06-30 19:42:01 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-06-30 19:42:01 +0200 |
| commit | 0755033f8af774cea34566adec455fbafd9f66bc (patch) | |
| tree | 4e6900585a2d48c319935ce996ae44b397123e5b /libavcodec/wmaenc.c | |
| parent | 799df083f3196d96ead6ea4400426dbd178573b1 (diff) | |
| download | ffmpeg-0755033f8af774cea34566adec455fbafd9f66bc.tar.gz | |
wmaenc: remove alternative quantization loop
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/wmaenc.c')
| -rw-r--r-- | libavcodec/wmaenc.c | 17 |
1 files changed, 0 insertions, 17 deletions
diff --git a/libavcodec/wmaenc.c b/libavcodec/wmaenc.c index 360902a5c8..3e39df9d8d 100644 --- a/libavcodec/wmaenc.c +++ b/libavcodec/wmaenc.c @@ -374,7 +374,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, if ((ret = ff_alloc_packet2(avctx, avpkt, 2 * MAX_CODED_SUPERFRAME_SIZE))) return ret; -#if 1 total_gain= 128; for(i=64; i; i>>=1){ int error = encode_frame(s, s->coefs, avpkt->data, avpkt->size, @@ -382,22 +381,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt, if(error<=0) total_gain-= i; } -#else - total_gain= 90; - best = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain); - for(i=32; i; i>>=1){ - int scoreL = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain - i); - int scoreR = encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain + i); - av_log(NULL, AV_LOG_ERROR, "%d %d %d (%d)\n", scoreL, best, scoreR, total_gain); - if(scoreL < FFMIN(best, scoreR)){ - best = scoreL; - total_gain -= i; - }else if(scoreR < best){ - best = scoreR; - total_gain += i; - } - } -#endif encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain); av_assert0((put_bits_count(&s->pb) & 7) == 0); |