opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-06-26 18:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

adpcm_4xm: process planar packets sequentially rather than simultaneously.

Browse Source 
Also properly clip the right channel step_index.
This commit is contained in:
Justin Ruggles
2011-09-09 18:43:19 -04:00
parent 119974b164
commit 943f4db552
1 changed files with 18 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
libavcodec/adpcm.c
View File

@ -463,30 +463,28 @@ static int adpcm_decode_frame(AVCodecContext *avctx,
} }
break; break;
case CODEC_ID_ADPCM_4XM: case CODEC_ID_ADPCM_4XM:
cs = &(c->status[0]); for (i = 0; i < avctx->channels; i++)
c->status[0].predictor= (int16_t)bytestream_get_le16(&src); c->status[i].predictor= (int16_t)bytestream_get_le16(&src);
if(st){
c->status[1].predictor= (int16_t)bytestream_get_le16(&src); for (i = 0; i < avctx->channels; i++) {
c->status[i].step_index= (int16_t)bytestream_get_le16(&src);
c->status[i].step_index = av_clip(c->status[i].step_index, 0, 88);
} }
c->status[0].step_index= (int16_t)bytestream_get_le16(&src);
if(st){
c->status[1].step_index= (int16_t)bytestream_get_le16(&src);
}
if (cs->step_index < 0) cs->step_index = 0;
if (cs->step_index > 88) cs->step_index = 88;
m= (buf_size - (src - buf))>>st; m= (buf_size - (src - buf))>>st;
for(i=0; i<m; i++) {
*samples++ = adpcm_ima_expand_nibble(&c->status[0], src[i] & 0x0F, 4); for (i = 0; i < avctx->channels; i++) {
if (st) samples = (short*)data + i;
*samples++ = adpcm_ima_expand_nibble(&c->status[1], src[i+m] & 0x0F, 4); cs = &c->status[i];
*samples++ = adpcm_ima_expand_nibble(&c->status[0], src[i] >> 4, 4); for (n = 0; n < m; n++) {
if (st) uint8_t v = *src++;
*samples++ = adpcm_ima_expand_nibble(&c->status[1], src[i+m] >> 4, 4); *samples = adpcm_ima_expand_nibble(cs, v & 0x0F, 4);
samples += avctx->channels;
*samples = adpcm_ima_expand_nibble(cs, v >> 4 , 4);
samples += avctx->channels;
} }
}
src += m<<st; samples -= (avctx->channels - 1);
break; break;
case CODEC_ID_ADPCM_MS: case CODEC_ID_ADPCM_MS:
if (avctx->block_align != 0 && buf_size > avctx->block_align) if (avctx->block_align != 0 && buf_size > avctx->block_align)