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

remove ima qt decoding hack, decode whole frame at once

Browse Source 
Originally committed as revision 12966 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Baptiste Coudurier 2008-04-25 15:09:26 +00:00
parent d29ee34ce3
commit 9ff8976dad
1 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libavcodec/adpcm.c
View File

@ -921,8 +921,8 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
switch(avctx->codec->id) { switch(avctx->codec->id) {
case CODEC_ID_ADPCM_IMA_QT: case CODEC_ID_ADPCM_IMA_QT:
n = (buf_size - 2);/* >> 2*avctx->channels;*/ n = buf_size - 2*avctx->channels;
channel = c->channel; for (channel = 0; channel < avctx->channels; channel++) {
cs = &(c->status[channel]); cs = &(c->status[channel]);
/* (pppppp) (piiiiiii) */ /* (pppppp) (piiiiiii) */
@ -946,8 +946,7 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
cs->step = step_table[cs->step_index]; cs->step = step_table[cs->step_index];
if (st && channel) samples = (short*)data + channel;
samples++;
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, 3); *samples = adpcm_ima_expand_nibble(cs, src[0] & 0x0F, 3);
@ -956,14 +955,9 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
samples += avctx->channels; samples += avctx->channels;
src ++; src ++;
} }
if(st) { /* handle stereo interlacing */
c->channel = (channel + 1) % 2; /* we get one packet for left, then one for right data */
if(!channel) { /* wait for the other packet before outputing anything */
return src - buf;
}
samples--;
} }
if (st)
samples--;
break; break;
case CODEC_ID_ADPCM_IMA_WAV: case CODEC_ID_ADPCM_IMA_WAV:
if (avctx->block_align != 0 && buf_size > avctx->block_align) if (avctx->block_align != 0 && buf_size > avctx->block_align)