diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-05-30 07:26:18 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-05-30 07:26:18 +0200 |
| commit | 1acb5ca02a66122c47856e380cd1c11ee1ad6161 (patch) | |
| tree | 8741765e6f476c9210ae36ddf88e29ccbe4cc88e /libavformat/cafenc.c | |
| parent | 772d46d3b33c6e8b8c44a66ffaf1ea6259759a71 (diff) | |
| download | ffmpeg-1acb5ca02a66122c47856e380cd1c11ee1ad6161.tar.gz | |
Improve frame size calculation in caf muxer to fix adpcm_ms remuxing.
Fixes ticket #3645.
Diffstat (limited to 'libavformat/cafenc.c')
| -rw-r--r-- | libavformat/cafenc.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/libavformat/cafenc.c b/libavformat/cafenc.c index 3a732a3ba3..1708275e11 100644 --- a/libavformat/cafenc.c +++ b/libavformat/cafenc.c @@ -51,7 +51,7 @@ static uint32_t codec_flags(enum AVCodecID codec_id) { } } -static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels) { +static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels, int block_align) { switch (codec_id) { case AV_CODEC_ID_PCM_S8: case AV_CODEC_ID_PCM_S16LE: @@ -91,9 +91,9 @@ static uint32_t samples_per_packet(enum AVCodecID codec_id, int channels) { case AV_CODEC_ID_ALAC: return 4096; case AV_CODEC_ID_ADPCM_IMA_WAV: - return (1024 - 4 * channels) * 8 / (4 * channels) + 1; + return (block_align - 4 * channels) * 8 / (4 * channels) + 1; case AV_CODEC_ID_ADPCM_MS: - return (1024 - 7 * channels) * 2 / channels + 2; + return (block_align - 7 * channels) * 2 / channels + 2; default: return 0; } @@ -146,7 +146,7 @@ static int caf_write_header(AVFormatContext *s) } if (enc->codec_id != AV_CODEC_ID_MP3 || frame_size != 576) - frame_size = samples_per_packet(enc->codec_id, enc->channels); + frame_size = samples_per_packet(enc->codec_id, enc->channels, enc->block_align); ffio_wfourcc(pb, "caff"); //< mFileType avio_wb16(pb, 1); //< mFileVersion @@ -259,7 +259,7 @@ static int caf_write_trailer(AVFormatContext *s) ffio_wfourcc(pb, "pakt"); avio_wb64(pb, caf->size_entries_used + 24); avio_wb64(pb, caf->packets); ///< mNumberPackets - avio_wb64(pb, caf->packets * samples_per_packet(enc->codec_id, enc->channels)); ///< mNumberValidFrames + avio_wb64(pb, caf->packets * samples_per_packet(enc->codec_id, enc->channels, enc->block_align)); ///< mNumberValidFrames avio_wb32(pb, 0); ///< mPrimingFrames avio_wb32(pb, 0); ///< mRemainderFrames avio_write(pb, caf->pkt_sizes, caf->size_entries_used); |