[vlc-commits] demux: mp4: map more metadata (fix #18807)

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Thu Sep 14 11:02:34 2017 +0200| [58fa674e3b92b30d90177508cd8e6efaf1b9fd5f] | committer: Francois Cartegnie

demux: mp4: map more metadata (fix #18807)

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

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

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 7f85541332..2301d5ee04 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -4466,6 +4466,7 @@ static const struct
     { ATOM_0xa9alb, MP4_ReadBox_Metadata,    ATOM_ilst },
     { ATOM_0xa9cmt, MP4_ReadBox_Metadata,    ATOM_ilst },
     { ATOM_0xa9com, MP4_ReadBox_Metadata,    ATOM_ilst },
+    { ATOM_0xa9cpy, MP4_ReadBox_Metadata,    ATOM_ilst },
     { ATOM_0xa9day, MP4_ReadBox_Metadata,    ATOM_ilst },
     { ATOM_0xa9des, MP4_ReadBox_Metadata,    ATOM_ilst },
     { ATOM_0xa9enc, MP4_ReadBox_Metadata,    ATOM_ilst },
@@ -4480,6 +4481,7 @@ static const struct
     { ATOM_atID,    MP4_ReadBox_Metadata,    ATOM_ilst }, /* iTunes */
     { ATOM_cnID,    MP4_ReadBox_Metadata,    ATOM_ilst }, /* iTunes */
     { ATOM_covr,    MP4_ReadBoxContainer,    ATOM_ilst },
+    { ATOM_desc,    MP4_ReadBox_Metadata,    ATOM_ilst },
     { ATOM_disk,    MP4_ReadBox_Metadata,    ATOM_ilst },
     { ATOM_flvr,    MP4_ReadBox_Metadata,    ATOM_ilst },
     { ATOM_gnre,    MP4_ReadBox_Metadata,    ATOM_ilst },
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index a37d6fd0da..65411b7ab1 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -354,6 +354,7 @@ typedef int64_t stime_t;
 #define ATOM_aART VLC_FOURCC( 'a', 'A', 'R', 'T' )
 #define ATOM_chpl VLC_FOURCC( 'c', 'h', 'p', 'l' )
 #define ATOM_HMMT VLC_FOURCC( 'H', 'M', 'M', 'T' )
+#define ATOM_desc VLC_FOURCC( 'd', 'e', 's', 'c' )
 #define ATOM_disk VLC_FOURCC( 'd', 'i', 's', 'k' )
 #define ATOM_ID32 VLC_FOURCC( 'I', 'D', '3', '2' )
 #define ATOM_WLOC VLC_FOURCC( 'W', 'L', 'O', 'C' )
diff --git a/modules/demux/mp4/meta.c b/modules/demux/mp4/meta.c
index 6a8942ec44..94780216c3 100644
--- a/modules/demux/mp4/meta.c
+++ b/modules/demux/mp4/meta.c
@@ -55,6 +55,7 @@ static const struct
     { ATOM_0xa9enc, vlc_meta_EncodedBy }, /* Encoded By */
     { ATOM_0xa9pub, vlc_meta_Publisher },
     { ATOM_0xa9dir, vlc_meta_Director },
+    { ATOM_desc,    vlc_meta_Description },
     { ATOM_MCPS,    vlc_meta_EncodedBy }, /* Cleaner Pro */
     { ATOM_aART,    vlc_meta_AlbumArtist },
 };