[vlc-commits] demux: libmp4: add Opus atoms

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jan 14 20:24:10 2015 +0100| [55b5d9e8b7d5d5cb5db12253c2d56fa17f81a4c9] | committer: Francois Cartegnie

demux: libmp4: add Opus atoms

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=55b5d9e8b7d5d5cb5db12253c2d56fa17f81a4c9
---

 modules/demux/mp4/libmp4.c |    2 ++
 modules/demux/mp4/libmp4.h |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 629f53b..9a2cd1d 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3750,9 +3750,11 @@ static const struct
     { ATOM_OggS,    MP4_ReadBox_sample_soun,  MP4_FreeBox_sample_soun, ATOM_stsd },
     { ATOM_alac,    MP4_ReadBox_sample_soun,  MP4_FreeBox_sample_soun, ATOM_stsd },
     { ATOM_WMA2,    MP4_ReadBox_sample_soun,  MP4_FreeBox_sample_soun, ATOM_stsd }, /* flip4mac */
+    { ATOM_Opus,    MP4_ReadBox_sample_soun,  MP4_FreeBox_sample_soun, ATOM_stsd },
     /* Sound extensions */
     { ATOM_chan,    MP4_ReadBox_stsdext_chan, MP4_FreeBox_stsdext_chan, 0 },
     { ATOM_WMA2,    MP4_ReadBox_WMA2,         MP4_FreeBox_WMA2,        ATOM_wave }, /* flip4mac */
+    { ATOM_dOps,    MP4_ReadBox_Binary,       MP4_FreeBox_Binary,      ATOM_Opus },
 
     { ATOM_drmi,    MP4_ReadBox_sample_vide,  MP4_FreeBox_sample_vide, ATOM_stsd },
     { ATOM_vide,    MP4_ReadBox_sample_vide,  MP4_FreeBox_sample_vide, ATOM_stsd },
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index d5111fd..4a88676 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -165,6 +165,7 @@
 #define ATOM_in32 VLC_FOURCC( 'i', 'n', '3', '2' )
 #define ATOM_fl32 VLC_FOURCC( 'f', 'l', '3', '2' )
 #define ATOM_fl64 VLC_FOURCC( 'f', 'l', '6', '4' )
+#define ATOM_Opus VLC_FOURCC( 'O', 'p', 'u', 's' )
 
 #define ATOM_zlib VLC_FOURCC( 'z', 'l', 'i', 'b' )
 #define ATOM_SVQ1 VLC_FOURCC( 'S', 'V', 'Q', '1' )
@@ -208,6 +209,7 @@
 #define ATOM_dv5n VLC_FOURCC( 'd', 'v', '5', 'n' )
 #define ATOM_dv5p VLC_FOURCC( 'd', 'v', '5', 'p' )
 #define ATOM_raw  VLC_FOURCC( 'r', 'a', 'w', ' ' )
+#define ATOM_dOps VLC_FOURCC( 'd', 'O', 'p', 's' )
 
 #define ATOM_jpeg VLC_FOURCC( 'j', 'p', 'e', 'g' )