Mercurial > libavcodec.hg
changeset 5370:bbb982818ce7 libavcodec
Calculate the correct blocksize for flash adpcm. Patch by Baptiste
Coudurier.
| author | banan |
|---|---|
| date | Wed, 18 Jul 2007 18:35:03 +0000 |
| parents | 04a241c308e8 |
| children | 74680ec68fd1 |
| files | adpcm.c |
| diffstat | 1 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/adpcm.c Wed Jul 18 15:36:45 2007 +0000 +++ b/adpcm.c Wed Jul 18 18:35:03 2007 +0000 @@ -183,7 +183,13 @@ 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 @@ c->status[i].prev_sample = (signed short)samples[i]; } - for (i=0 ; i<4096 ; i++) { + for (i=0; i<avctx->frame_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: