virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

wmaenc: rewrite 2nd stage quantization code

Browse Source 
this is faster and more correct

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2012-06-30 19:47:00 +02:00
parent 0755033f8a
commit 5968a07622
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavcodec/wmaenc.c
View File

@ -352,7 +352,7 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt,
{ {
WMACodecContext *s = avctx->priv_data; WMACodecContext *s = avctx->priv_data;
const int16_t *samples = (const int16_t *)frame->data[0]; const int16_t *samples = (const int16_t *)frame->data[0];
int i, total_gain, ret; int i, total_gain, ret, error;
s->block_len_bits= s->frame_len_bits; //required by non variable block len s->block_len_bits= s->frame_len_bits; //required by non variable block len
s->block_len = 1 << s->block_len_bits; s->block_len = 1 << s->block_len_bits;
@ -376,13 +376,14 @@ static int encode_superframe(AVCodecContext *avctx, AVPacket *avpkt,
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, error = encode_frame(s, s->coefs, avpkt->data, avpkt->size,
total_gain - i); total_gain - i);
if(error<=0) if(error<=0)
total_gain-= i; total_gain-= i;
} }
encode_frame(s, s->coefs, avpkt->data, avpkt->size, total_gain); while(total_gain <= 128 && error > 0)
error = 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);
i= s->block_align - (put_bits_count(&s->pb)+7)/8; i= s->block_align - (put_bits_count(&s->pb)+7)/8;
av_assert0(i>=0); av_assert0(i>=0);