[vlc-commits] demux: libmp4: move uuid parsing

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Wed Jul 26 23:52:26 2017 +0200| [78f07cef022379050c936faed8150d81f83a4b88] | committer: Francois Cartegnie

demux: libmp4: move uuid parsing

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

 modules/demux/mp4/libmp4.c | 48 ++++++++++++++++++++++++----------------------
 1 file changed, 25 insertions(+), 23 deletions(-)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 0eeac770b0..254ac79c57 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -752,29 +752,6 @@ static int MP4_ReadBox_XML360( stream_t *p_stream, MP4_Box_t *p_box )
     MP4_READBOX_EXIT( 1 );
 }
 
-static int MP4_ReadBox_uuid( stream_t *p_stream, MP4_Box_t *p_box )
-{
-    if( !CmpUUID( &p_box->i_uuid, &TfrfBoxUUID ) )
-        return MP4_ReadBox_tfrf( p_stream, p_box );
-    if( !CmpUUID( &p_box->i_uuid, &TfxdBoxUUID ) )
-        return MP4_ReadBox_tfxd( p_stream, p_box );
-    if( !CmpUUID( &p_box->i_uuid, &XML360BoxUUID ) )
-        return MP4_ReadBox_XML360( p_stream, p_box );
-
-#ifdef MP4_VERBOSE
-    msg_Warn( p_stream, "Unknown uuid type box: "
-    "0x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x"
-    "%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
-    p_box->i_uuid.b[0],  p_box->i_uuid.b[1],  p_box->i_uuid.b[2],  p_box->i_uuid.b[3],
-    p_box->i_uuid.b[4],  p_box->i_uuid.b[5],  p_box->i_uuid.b[6],  p_box->i_uuid.b[7],
-    p_box->i_uuid.b[8],  p_box->i_uuid.b[9],  p_box->i_uuid.b[10], p_box->i_uuid.b[11],
-    p_box->i_uuid.b[12], p_box->i_uuid.b[13], p_box->i_uuid.b[14], p_box->i_uuid.b[15] );
-#else
-    msg_Warn( p_stream, "Unknown uuid type box" );
-#endif
-    return 1;
-}
-
 static int MP4_ReadBox_st3d( stream_t *p_stream, MP4_Box_t *p_box )
 {
     MP4_READBOX_ENTER( MP4_Box_data_st3d_t, NULL );
@@ -4188,6 +4165,31 @@ unknown:
 }
 
 /**** ------------------------------------------------------------------- ****/
+
+static int MP4_ReadBox_uuid( stream_t *p_stream, MP4_Box_t *p_box )
+{
+    if( !CmpUUID( &p_box->i_uuid, &TfrfBoxUUID ) )
+        return MP4_ReadBox_tfrf( p_stream, p_box );
+    if( !CmpUUID( &p_box->i_uuid, &TfxdBoxUUID ) )
+        return MP4_ReadBox_tfxd( p_stream, p_box );
+    if( !CmpUUID( &p_box->i_uuid, &XML360BoxUUID ) )
+        return MP4_ReadBox_XML360( p_stream, p_box );
+
+#ifdef MP4_VERBOSE
+    msg_Warn( p_stream, "Unknown uuid type box: "
+    "%2.2x%2.2x%2.2x%2.2x-%2.2x%2.2x-%2.2x%2.2x-"
+    "%2.2x%2.2x-%2.2x%2.2x%2.2x%2.2x%2.2x%2.2x",
+    p_box->i_uuid.b[0],  p_box->i_uuid.b[1],  p_box->i_uuid.b[2],  p_box->i_uuid.b[3],
+    p_box->i_uuid.b[4],  p_box->i_uuid.b[5],  p_box->i_uuid.b[6],  p_box->i_uuid.b[7],
+    p_box->i_uuid.b[8],  p_box->i_uuid.b[9],  p_box->i_uuid.b[10], p_box->i_uuid.b[11],
+    p_box->i_uuid.b[12], p_box->i_uuid.b[13], p_box->i_uuid.b[14], p_box->i_uuid.b[15] );
+#else
+    msg_Warn( p_stream, "Unknown uuid type box" );
+#endif
+    return 1;
+}
+
+/**** ------------------------------------------------------------------- ****/
 /****                   "Higher level" Functions                          ****/
 /**** ------------------------------------------------------------------- ****/