virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

wmaenc: remove alternative quantization loop

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-06-30 19:42:01 +02:00
parent 799df083f3
commit 0755033f8a
1 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libavcodec/wmaenc.c
View File

@ -374,7 +374,6 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt,
if ((ret = ff_alloc_packet2(avctx, avpkt, 2 * MAX_CODED_SUPERFRAME_SIZE))) if ((ret = ff_alloc_packet2(avctx, avpkt, 2 * MAX_CODED_SUPERFRAME_SIZE)))
return ret; return ret;
#if 1
total_gain= 128; total_gain= 128;
for(i=64; i; i>>=1){ for(i=64; i; i>>=1){
int error = encode_frame(s, s->coefs, avpkt->data, avpkt->size, 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) if(error<=0)
total_gain-= i; 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); encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain);
av_assert0((put_bits_count(&s->pb) & 7) == 0); av_assert0((put_bits_count(&s->pb) & 7) == 0);