[FFmpeg-cvslog] isom: lpcm in mov default to big endian

Mark Himsley git at videolan.org
Tue Mar 11 12:14:19 CET 2014


ffmpeg | branch: release/2.2 | Mark Himsley <mark at mdsh.com> | Fri Nov  1 11:22:53 2013 +0000| [d37fac6dbbdddb76225aa691b83ffd9a0c7dae6b] | committer: Reinhard Tartler

isom: lpcm in mov default to big endian

It is my understanding that "Unless otherwise stated, all data in a
QuickTime movie is stored in big-endian byte ordering" [1] in MOV files.

I have a couple of thousand files, which technically are invalid because
their sound sample description element 4CC is 'lpcm' but its version is
0 - and "Version 0 supports only uncompressed audio in raw ('raw ') or
twos-complement ('twos') format" [2]

Because isom.c only contains a mapping for 4CC 'lpcm' to
AV_CODEC_ID_PCM_S16LE, these files have their audio decoded as LE when
it is actually BE.

This commit adds AV_CODEC_ID_PCM_S16BE as the first match for 4CC 'lpcm'.

[1]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 21
[2]
https://developer.apple.com/library/mac/documentation/quicktime/QTFF/qtff.pdf
page 178

Reviewed-by: Yusuke Nakamura <muken.the.vfrmaniac at gmail.com>
(cherry picked from commit 360022bd3b894cc01ea112b275fa4c8f53881808)

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d37fac6dbbdddb76225aa691b83ffd9a0c7dae6b
---

 libavformat/isom.c |    1 +
 1 file changed, 1 insertion(+)

diff --git a/libavformat/isom.c b/libavformat/isom.c
index 0c8cf43..7861290 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -264,6 +264,7 @@ const AVCodecTag ff_codec_movaudio_tags[] = {
     { AV_CODEC_ID_PCM_MULAW,       MKTAG('u', 'l', 'a', 'w') },
     { AV_CODEC_ID_PCM_S16BE,       MKTAG('t', 'w', 'o', 's') },
     { AV_CODEC_ID_PCM_S16LE,       MKTAG('s', 'o', 'w', 't') },
+    { AV_CODEC_ID_PCM_S16BE,       MKTAG('l', 'p', 'c', 'm') },
     { AV_CODEC_ID_PCM_S16LE,       MKTAG('l', 'p', 'c', 'm') },
     { AV_CODEC_ID_PCM_S24BE,       MKTAG('i', 'n', '2', '4') },
     { AV_CODEC_ID_PCM_S24LE,       MKTAG('i', 'n', '2', '4') },



More information about the ffmpeg-cvslog mailing list