Demuxers: do not load "meta reader" module if the input item has already been preparsed.

diff --git a/modules/codec/ffmpeg/demux.c b/modules/codec/ffmpeg/demux.c
index 7953794f2a4a678a7fff0a4927ebe019484e97a1..10051e0a909a99fde63357df9270ff6d66b88e44 100644 (file)
--- a/modules/codec/ffmpeg/demux.c
+++ b/modules/codec/ffmpeg/demux.c
@@ -259,27 +259,30 @@ int E_(OpenDemux)( vlc_object_t *p_this )
     input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
     if( p_input )
     {
-        p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-        if( !p_demux->p_private )
+        if( !( input_GetItem( p_input )->p_meta->i_status & ITEM_PREPARSED ) )
         {
-            vlc_object_release( p_input );
-            return VLC_ENOMEM;
-        }
-        module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 );
-        if( p_meta )
-        {
-            demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-            vlc_meta_Merge( input_GetItem(p_input)->p_meta,
-                    p_demux_meta->p_meta );
-            vlc_meta_Delete( p_demux_meta->p_meta );
-            module_Unneed( p_demux, p_meta );
-            int i;
-            for( i = 0; i < p_demux_meta->i_attachments; i++ )
-                free( p_demux_meta->attachments[i] );
-            TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
+            p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+            if( !p_demux->p_private )
+            {
+                vlc_object_release( p_input );
+                return VLC_ENOMEM;
+            }
+            module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 );
+            if( p_meta )
+            {
+                demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+                vlc_meta_Merge( input_GetItem(p_input)->p_meta,
+                        p_demux_meta->p_meta );
+                vlc_meta_Delete( p_demux_meta->p_meta );
+                module_Unneed( p_demux, p_meta );
+                int i;
+                for( i = 0; i < p_demux_meta->i_attachments; i++ )
+                    free( p_demux_meta->attachments[i] );
+                TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
+            }
+            free( p_demux->p_private );
         }
         vlc_object_release( p_input );
-        free( p_demux->p_private );
     }
 
     return VLC_SUCCESS;

diff --git a/modules/demux/flac.c b/modules/demux/flac.c
index ab886258dbe05645438a9471702700b11fad1201..7ff557cc8b1f029666f863c9a1de56689bb17399 100644 (file)
--- a/modules/demux/flac.c
+++ b/modules/demux/flac.c
@@ -155,34 +155,45 @@ static int Open( vlc_object_t * p_this )
     }
 
     /* Parse possible id3 header */
-    p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-    if( !p_demux->p_private )
-        return VLC_ENOMEM;
-    if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+    input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
+    if( p_input )
     {
-        demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-        vlc_meta_t *p_meta = p_demux_meta->p_meta;
-
-        if( !p_sys->p_meta )
+        if( !( input_GetItem( p_input )->p_meta->i_status & ITEM_PREPARSED ) )
         {
-            p_sys->p_meta = p_meta;
-        }
-        else if( p_meta )
-        {
-            vlc_meta_Merge( p_sys->p_meta, p_meta );
-            vlc_meta_Delete( p_meta );
+            p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+            if( !p_demux->p_private )
+            {
+                vlc_object_release( p_input );
+                return VLC_ENOMEM;
+            }
+            if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+            {
+                demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+                vlc_meta_t *p_meta = p_demux_meta->p_meta;
+
+                if( !p_sys->p_meta )
+                {
+                    p_sys->p_meta = p_meta;
+                }
+                else if( p_meta )
+                {
+                    vlc_meta_Merge( p_sys->p_meta, p_meta );
+                    vlc_meta_Delete( p_meta );
+                }
+                p_demux->p_private = NULL;
+                module_Unneed( p_demux, p_id3 );
+                int i;
+                for( i = 0; i < p_demux_meta->i_attachments; i++ )
+                    TAB_APPEND_CAST( (input_attachment_t**),
+                            p_sys->i_attachments, p_sys->attachments,
+                            p_demux_meta->attachments[p_demux_meta->i_attachments] );
+                TAB_CLEAN( p_demux_meta->i_attachments,
+                            p_demux_meta->attachments );
+            }
+            free( p_demux->p_private );
         }
-        p_demux->p_private = NULL;
-        module_Unneed( p_demux, p_id3 );
-        int i;
-        for( i = 0; i < p_demux_meta->i_attachments; i++ )
-            TAB_APPEND_CAST( (input_attachment_t**),
-                    p_sys->i_attachments, p_sys->attachments,
-                    p_demux_meta->attachments[p_demux_meta->i_attachments] );
-
-        TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
+        vlc_object_release( p_input );
     }
-    free( p_demux->p_private );
 
     if( p_sys->i_cover_idx < p_sys->i_attachments )
     {

diff --git a/modules/demux/mpc.c b/modules/demux/mpc.c
index b61f7e04d1e24c8b7ac307d91d107700f5c09d4f..c201ed8fa2cfe77926ee129abcd5f56f692e4ac7 100644 (file)
--- a/modules/demux/mpc.c
+++ b/modules/demux/mpc.c
@@ -189,20 +189,32 @@ static int Open( vlc_object_t * p_this )
     }
 
     /* Parse possible id3 header */
-    p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-    if( !p_demux->p_private )
-        return VLC_ENOMEM;
-    if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+    input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
+    if( p_input )
     {
-        demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-        p_sys->p_meta = p_demux_meta->p_meta;
-        module_Unneed( p_demux, p_id3 );
-        int i;
-        for( i = 0; i < p_demux_meta->i_attachments; i++ )
-            free( p_demux_meta->attachments[i] );
-        TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
+        if( !( input_GetItem( p_input )->p_meta->i_status & ITEM_PREPARSED ) )
+        {
+            p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+            if( !p_demux->p_private )
+            {
+                vlc_object_release( p_input );
+                return VLC_ENOMEM;
+            }
+            if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+            {
+                demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+                p_sys->p_meta = p_demux_meta->p_meta;
+                module_Unneed( p_demux, p_id3 );
+                int i;
+                for( i = 0; i < p_demux_meta->i_attachments; i++ )
+                    free( p_demux_meta->attachments[i] );
+                TAB_CLEAN( p_demux_meta->i_attachments,
+                            p_demux_meta->attachments );
+            }
+            free( p_demux->p_private );
+        }
+        vlc_object_release( p_input );
     }
-    free( p_demux->p_private );
 
     if( !p_sys->p_meta )
         p_sys->p_meta = vlc_meta_New();

diff --git a/modules/demux/mpeg/m4a.c b/modules/demux/mpeg/m4a.c
index 70da53a32a9302d8bb47b0746d868bd80438b232..5911d49dc51c3aca0c4792a71ab9848a35b6b06e 100644 (file)
--- a/modules/demux/mpeg/m4a.c
+++ b/modules/demux/mpeg/m4a.c
@@ -110,21 +110,33 @@ static int Open( vlc_object_t * p_this )
     LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "mp4 audio" );
 
     /* Parse possible id3 header */
-    p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-    if( !p_demux->p_private )
-        return VLC_ENOMEM;
-    if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+    input_thread_t *p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
+    if( p_input )
     {
-        demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-        p_sys->meta = p_demux_meta->p_meta;
-        p_demux->p_private = NULL;
-        module_Unneed( p_demux, p_id3 );
-        int i;
-        for( i = 0; i < p_demux_meta->i_attachments; i++ )
-            free( p_demux_meta->attachments[i] );
-        TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
+        if( !( input_GetItem( p_input )->p_meta->i_status & ITEM_PREPARSED ) )
+        {
+            p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+            if( !p_demux->p_private )
+            {
+                vlc_object_release( p_input );
+                return VLC_ENOMEM;
+            }
+            if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+            {
+                demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+                p_sys->meta = p_demux_meta->p_meta;
+                p_demux->p_private = NULL;
+                module_Unneed( p_demux, p_id3 );
+                int i;
+                for( i = 0; i < p_demux_meta->i_attachments; i++ )
+                    free( p_demux_meta->attachments[i] );
+                TAB_CLEAN( p_demux_meta->i_attachments,
+                            p_demux_meta->attachments );
+            }
+            free( p_demux->p_private );
+        }
+        vlc_object_release( p_input );
     }
-    free( p_demux->p_private );
     return VLC_SUCCESS;
 }
 

diff --git a/modules/demux/mpeg/mpga.c b/modules/demux/mpeg/mpga.c
index 6e0b565659b54381ade3bc6c4693c2bfed2b901f..2d2400ef12c1cae5555d7020955c959773b33364 100644 (file)
--- a/modules/demux/mpeg/mpga.c
+++ b/modules/demux/mpeg/mpga.c
@@ -255,19 +255,31 @@ static int Open( vlc_object_t * p_this )
     p_sys->p_block_out = p_block_out;
 
     /* Parse possible id3 header */
-    p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-    if( !p_demux->p_private )
-        return VLC_ENOMEM;
-    if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+    input_thread_t *p_input = (input_thread_t *)
+            vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
+    if( p_input )
     {
-        demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-        p_sys->meta = p_demux_meta->p_meta;
-        p_demux->p_private = NULL;
-        module_Unneed( p_demux, p_id3 );
-        p_sys->i_attachments = p_demux_meta->i_attachments;
-        p_sys->attachments = p_demux_meta->attachments;
+        if( !( input_GetItem( p_input )->p_meta->i_status & ITEM_PREPARSED ) )
+        {
+            p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+            if( !p_demux->p_private )
+            {
+                vlc_object_release( p_input );
+                return VLC_ENOMEM;
+            }
+            if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+            {
+                demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+                p_sys->meta = p_demux_meta->p_meta;
+                p_demux->p_private = NULL;
+                module_Unneed( p_demux, p_id3 );
+                p_sys->i_attachments = p_demux_meta->i_attachments;
+                p_sys->attachments = p_demux_meta->attachments;
+            }
+            free( p_demux->p_private );
+        }
+        vlc_object_release( p_input );
     }
-    free( p_demux->p_private );
 
     /* */
     p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;

diff --git a/modules/demux/ogg.c b/modules/demux/ogg.c
index 40825220a5ed4cf7c0b43155549c790b03c80aa4..b2b56cfe090619597e81ce65889b1bff1af9271f 100644 (file)
--- a/modules/demux/ogg.c
+++ b/modules/demux/ogg.c
@@ -211,25 +211,28 @@ static int Open( vlc_object_t * p_this )
     p_input = (input_thread_t *)vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
     if( p_input )
     {
-        p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-        if( !p_demux->p_private )
+        if( !( input_GetItem( p_input )->p_meta->i_status & ITEM_PREPARSED ) )
         {
-            vlc_object_release( p_input );
-            return VLC_ENOMEM;
-        }
-        module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 );
-        if( p_meta )
-        {
-            demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-            vlc_meta_Merge( input_GetItem(p_input)->p_meta,
-                    p_demux_meta->p_meta );
-            vlc_meta_Delete( p_demux_meta->p_meta );
-            module_Unneed( p_demux, p_meta );
-            p_sys->i_attachments = p_demux_meta->i_attachments;
-            p_sys->attachments = p_demux_meta->attachments;
+            p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+            if( !p_demux->p_private )
+            {
+                vlc_object_release( p_input );
+                return VLC_ENOMEM;
+            }
+            module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 );
+            if( p_meta )
+            {
+                demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+                vlc_meta_Merge( input_GetItem(p_input)->p_meta,
+                        p_demux_meta->p_meta );
+                vlc_meta_Delete( p_demux_meta->p_meta );
+                module_Unneed( p_demux, p_meta );
+                p_sys->i_attachments = p_demux_meta->i_attachments;
+                p_sys->attachments = p_demux_meta->attachments;
+            }
+            free( p_demux->p_private );
         }
         vlc_object_release( p_input );
-        free( p_demux->p_private );
     }
 
     /* Initialize the Ogg physical bitstream parser */

diff --git a/modules/demux/tta.c b/modules/demux/tta.c
index 8a226c200029007af1c90f2a7bb16f9230b705ee..7763edf2cbee419b7328a121d51af8315ca4ddde 100644 (file)
--- a/modules/demux/tta.c
+++ b/modules/demux/tta.c
@@ -141,22 +141,34 @@ static int Open( vlc_object_t * p_this )
 
 #if 0
     /* Parse possible id3 header */
-    p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-    if( !p_demux->p_private )
-        return VLC_ENOMEM;
-    if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+    input_thread_t *p_input = (input_thread_t *)
+            vlc_object_find( p_demux, VLC_OBJECT_INPUT, FIND_PARENT );
+    if( p_input )
     {
-        demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-        p_sys->p_meta = p_demux_meta->p_meta;
-        p_demux->p_private = NULL;
-        module_Unneed( p_demux, p_id3 );
-        int i;
-        for( i = 0; i < p_demux_meta->i_attachments; i++ )
-            free( p_demux_meta->attachments[i] );
-        TAB_CLEAN( p_demux_meta->i_attachments, p_demux_meta->attachments );
+        if( !( input_GetItem( p_input )->p_meta->i_status & ITEM_PREPARSED ) )
+        {
+            p_demux->p_private = malloc( sizeof( demux_meta_t ) );
+            if( !p_demux->p_private )
+            {
+                vlc_object_release( p_input );
+                return VLC_ENOMEM;
+            }
+            if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+            {
+                demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
+                p_sys->p_meta = p_demux_meta->p_meta;
+                p_demux->p_private = NULL;
+                module_Unneed( p_demux, p_id3 );
+                int i;
+                for( i = 0; i < p_demux_meta->i_attachments; i++ )
+                    free( p_demux_meta->attachments[i] );
+                TAB_CLEAN( p_demux_meta->i_attachments,
+                            p_demux_meta->attachments );
+            }
+            free( p_demux->p_private );
+        }
+        vlc_object_release( p_input );
     }
-    free( p_demux->p_private );
-
     if( !p_sys->p_meta )
         p_sys->p_meta = vlc_meta_New();
 #endif