From ac3d5cac7b6cbabf63bdbc588d9723d0f02b5c8d Mon Sep 17 00:00:00 2001 From: Mike Melanson Date: Tue, 16 Dec 2003 01:17:58 +0000 Subject: initial predictors are not sent to the output in QT IMA; fix stereo QT IMA decoding Originally committed as revision 2618 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/adpcm.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) (limited to 'libavcodec/adpcm.c') diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index 6a0643f21c..3b5f5c1545 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -504,9 +504,6 @@ static int adpcm_decode_frame(AVCodecContext *avctx, if (st && channel) samples++; - *samples++ = cs->predictor; - samples += st; - for(m=32; n>0 && m>0; n--, m--) { /* in QuickTime, IMA is encoded by chuncks of 34 bytes (=64 samples) */ *samples = adpcm_ima_expand_nibble(cs, src[0] & 0x0F); samples += avctx->channels; @@ -517,7 +514,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx, if(st) { /* handle stereo interlacing */ c->channel = (channel + 1) % 2; /* we get one packet for left, then one for right data */ - if(channel == 0) { /* wait for the other packet before outputing anything */ + if(channel == 1) { /* wait for the other packet before outputing anything */ *data_size = 0; return src - buf; } @@ -583,12 +580,10 @@ static int adpcm_decode_frame(AVCodecContext *avctx, if(st){ c->status[1].step_index= (int16_t)(src[0] + (src[1]<<8)); src+=2; } -// if (cs->step_index < 0) cs->step_index = 0; -// if (cs->step_index > 88) cs->step_index = 88; + if (cs->step_index < 0) cs->step_index = 0; + if (cs->step_index > 88) cs->step_index = 88; m= (buf_size - (src - buf))>>st; -//printf("%d %d %d %d\n", st, m, c->status[0].predictor, c->status[0].step_index); - //FIXME / XXX decode chanels individual & interleave samples for(i=0; istatus[0], src[i] & 0x0F); if (st) -- cgit v1.2.3