diff options
| author | Paul B Mahol <onemda@gmail.com> | 2012-11-26 12:49:46 +0000 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2012-11-27 10:17:28 +0000 |
| commit | 51d6879939bf4777227d77db59c659c66d3d967d (patch) | |
| tree | d4df71406fedd9f7ebe23c671a1e4cd0db850524 /libavcodec/adpcm.c | |
| parent | 10c8f913410e7e13dc055da826c6928af8f2987f (diff) | |
| download | ffmpeg-51d6879939bf4777227d77db59c659c66d3d967d.tar.gz | |
AFC demuxer
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavcodec/adpcm.c')
| -rw-r--r-- | libavcodec/adpcm.c | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index df8aba93ed..c182e6faa8 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -1268,13 +1268,26 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, } break; case AV_CODEC_ID_ADPCM_AFC: + { + int samples_per_block; + int blocks; + + if (avctx->extradata && avctx->extradata_size == 1 && avctx->extradata[0]) { + samples_per_block = avctx->extradata[0] / 16; + blocks = nb_samples / avctx->extradata[0]; + } else { + samples_per_block = nb_samples / 16; + blocks = 1; + } + + for (m = 0; m < blocks; m++) { for (channel = 0; channel < avctx->channels; channel++) { int prev1 = c->status[channel].sample1; int prev2 = c->status[channel].sample2; - samples = samples_p[channel]; + samples = samples_p[channel] + m * 16; /* Read in every sample for this channel. */ - for (i = 0; i < nb_samples / 16; i++) { + for (i = 0; i < samples_per_block; i++) { int byte = bytestream2_get_byteu(&gb); int scale = 1 << (byte >> 4); int index = byte & 0xf; @@ -1303,8 +1316,10 @@ static int adpcm_decode_frame(AVCodecContext *avctx, void *data, c->status[channel].sample1 = prev1; c->status[channel].sample2 = prev2; } + } bytestream2_seek(&gb, 0, SEEK_END); break; + } case AV_CODEC_ID_ADPCM_THP: { int table[6][16]; |