From 9fff16bcbb3c727c39823a39cfda1ce74d53227b Mon Sep 17 00:00:00 2001 From: Baptiste Coudurier Date: Wed, 18 Jul 2007 18:35:03 +0000 Subject: [PATCH] Calculate the correct blocksize for flash adpcm. Patch by Baptiste Coudurier. Originally committed as revision 9742 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/adpcm.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/libavcodec/adpcm.c b/libavcodec/adpcm.c index d0e8344c5..5539cf941 100644 --- a/libavcodec/adpcm.c +++ b/libavcodec/adpcm.c @@ -183,7 +183,13 @@ static int adpcm_encode_init(AVCodecContext *avctx) avctx->block_align = BLKSIZE; break; case CODEC_ID_ADPCM_SWF: - avctx->frame_size = 4*BLKSIZE * avctx->channels; + if (avctx->sample_rate != 11025 && + avctx->sample_rate != 22050 && + avctx->sample_rate != 44100) { + av_log(avctx, AV_LOG_ERROR, "Sample rate must be 11025, 22050 or 44100\n"); + return -1; + } + avctx->frame_size = 512 * (avctx->sample_rate / 11025); break; default: return -1; @@ -530,13 +536,13 @@ static int adpcm_encode_frame(AVCodecContext *avctx, c->status[i].prev_sample = (signed short)samples[i]; } - for (i=0 ; i<4096 ; i++) { + for (i=0; iframe_size; i++) { put_bits(&pb, 4, adpcm_ima_compress_sample(&c->status[0], samples[avctx->channels*i]) & 0xF); if (avctx->channels == 2) put_bits(&pb, 4, adpcm_ima_compress_sample(&c->status[1], samples[2*i+1]) & 0xF); } - - dst += (3 + 2048) * avctx->channels; + flush_put_bits(&pb); + dst += put_bits_count(&pb)>>3; break; } case CODEC_ID_ADPCM_MS: -- 2.34.1