RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-17 12:27:18 +00:00
Code Issues Projects Releases Wiki Activity

initial predictors are not sent to the output in QT IMA; fix stereo QT

Browse Source 
IMA decoding

Originally committed as revision 2618 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Mike Melanson 2003-12-16 01:17:58 +00:00
parent 037b5189d8
commit ac3d5cac7b
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/adpcm.c
View File

@ -504,9 +504,6 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
if (st && channel) if (st && channel)
samples++; 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) */ 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 = adpcm_ima_expand_nibble(cs, src[0] & 0x0F);
samples += avctx->channels; samples += avctx->channels;
@ -517,7 +514,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
if(st) { /* handle stereo interlacing */ if(st) { /* handle stereo interlacing */
c->channel = (channel + 1) % 2; /* we get one packet for left, then one for right data */ 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; *data_size = 0;
return src - buf; return src - buf;
} }
@ -583,12 +580,10 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
if(st){ if(st){
c->status[1].step_index= (int16_t)(src[0] + (src[1]<<8)); src+=2; 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 < 0) cs->step_index = 0;
// if (cs->step_index > 88) cs->step_index = 88; if (cs->step_index > 88) cs->step_index = 88;
m= (buf_size - (src - buf))>>st; 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; i<m; i++) { for(i=0; i<m; i++) {
*samples++ = adpcm_4xa_expand_nibble(&c->status[0], src[i] & 0x0F); *samples++ = adpcm_4xa_expand_nibble(&c->status[0], src[i] & 0x0F);
if (st) if (st)