MP4: support other annotation atoms (wrn, mak, mod, PRD, grp, lyr)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 70316aa0e9765d65c827d0ec0647e1ab54a79e7c..1e45c61c3514f188d68c1c2f3e2578b37b359ba7 100644 (file)
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -2770,6 +2770,12 @@ static const struct
     { FOURCC_0xa9com,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
     { FOURCC_0xa9wrt,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
     { FOURCC_0xa9too,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
+    { FOURCC_0xa9wrn,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
+    { FOURCC_0xa9mak,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
+    { FOURCC_0xa9mod,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
+    { FOURCC_0xa9PRD,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
+    { FOURCC_0xa9grp,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
+    { FOURCC_0xa9lyr,MP4_ReadBox_0xa9xxx,       MP4_FreeBox_0xa9xxx },
 
     { FOURCC_chpl,   MP4_ReadBox_chpl,          MP4_FreeBox_chpl },
 

diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 139da503c95d9f672b9a3b38d860e9e79fcb8421..74b65db74681d0d5ffd84db482b02e3b62a57f31 100644 (file)
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -196,7 +196,6 @@
 
 #define FOURCC_0xa9nam VLC_FOURCC( 0xa9, 'n', 'a', 'm' )
 #define FOURCC_0xa9aut VLC_FOURCC( 0xa9, 'a', 'u', 't' )
-#define FOURCC_0xa9swr VLC_FOURCC( 0xa9, 's', 'w', 'r' )
 #define FOURCC_0xa9cpy VLC_FOURCC( 0xa9, 'c', 'p', 'y' )
 #define FOURCC_0xa9inf VLC_FOURCC( 0xa9, 'i', 'n', 'f' )
 #define FOURCC_0xa9ART VLC_FOURCC( 0xa9, 'A', 'R', 'T' )
@@ -221,6 +220,13 @@
 #define FOURCC_0xa9com VLC_FOURCC( 0xa9, 'c', 'o', 'm' )
 #define FOURCC_0xa9gen VLC_FOURCC( 0xa9, 'g', 'e', 'n' )
 #define FOURCC_0xa9too VLC_FOURCC( 0xa9, 't', 'o', 'o' )
+#define FOURCC_0xa9wrn VLC_FOURCC( 0xa9, 'w', 'r', 'n' )
+#define FOURCC_0xa9swr VLC_FOURCC( 0xa9, 's', 'w', 'r' )
+#define FOURCC_0xa9mak VLC_FOURCC( 0xa9, 'm', 'a', 'k' )
+#define FOURCC_0xa9mod VLC_FOURCC( 0xa9, 'm', 'o', 'd' )
+#define FOURCC_0xa9PRD VLC_FOURCC( 0xa9, 'P', 'R', 'D' )
+#define FOURCC_0xa9grp VLC_FOURCC( 0xa9, 'g', 'r', 'p' )
+#define FOURCC_0xa9lyr VLC_FOURCC( 0xa9, 'g', 'r', 'p' )
 #define FOURCC_chpl VLC_FOURCC( 'c', 'h', 'p', 'l' )
 #define FOURCC_WLOC VLC_FOURCC( 'W', 'L', 'O', 'C' )
 

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index ce5f8a5297417db97d56920ad98e8b20cb198c4b..8d66f45d69a8f397d3551df5bb183212bbc2a3ae 100644 (file)
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -947,7 +947,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                     { FOURCC_0xa9com, N_("Composr") },
                     { FOURCC_0xa9prd, N_("Producer") },
                     { FOURCC_0xa9inf, N_("Information") },
-                    { FOURCC_0xa9swr, N_("Software") },
                     { FOURCC_0xa9dir, N_("Director") },
                     { FOURCC_0xa9dis, N_("Disclaimer") },
                     { FOURCC_0xa9req, N_("Requirements") },
@@ -957,6 +956,13 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
                     { FOURCC_0xa9prf, N_("Performers") },
                     { FOURCC_0xa9ope, N_("Original Performer") },
                     { FOURCC_0xa9src, N_("Providers Source Content") },
+                    { FOURCC_0xa9wrn, N_("Warning") },
+                    { FOURCC_0xa9swr, N_("Software") },
+                    { FOURCC_0xa9lyr, N_("Lyrics") },
+                    { FOURCC_0xa9mak, N_("Make") },
+                    { FOURCC_0xa9mod, N_("Model") },
+                    { FOURCC_0xa9PRD, N_("Product") },
+                    { FOURCC_0xa9grp, N_("Grouping") },
                     { 0, "" },
                 };
                 for( unsigned i = 0; xa9typetoextrameta[i].xa9_type; i++ )