Changeset 5a419c9120ba68ccc00a1c035f6fd6b2917b4bae

Timestamp:

08/10/07 20:46:12 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

Laurent Aimar <fenrir@videolan.org> 1191869172 +0000

git-parent:

[30dcf59a18a1d1d9ce0c1b8ef30f1a7e11d0466e]

git-author:

Laurent Aimar <fenrir@videolan.org> 1191869172 +0000

Message:

Let the input handle meta data and attachments for ogg files.

Files:

• modules/demux/ogg.c (modified) (5 diffs)

modules/demux/ogg.c

@@ -105 +105 @@
-    /* bitrate */
-    int     i_bitrate;
-
-    /* meta data */
-    vlc_meta_t *meta;
-
-    /* attachments */
-    int                i_attachments;
-    input_attachment_t **attachments;
-};
-
@@ -211 +204 @@
-    p_sys->i_eos = 0;
-
-    if( !var_CreateGetBool( p_demux, "meta-preparsed" ) )
-    {
-        p_demux->p_private = malloc( sizeof( demux_meta_t ) );
-        if( !p_demux->p_private )
-            return VLC_ENOMEM;
-        module_t *p_meta = module_Need( p_demux, "meta reader", NULL, 0 );
-        if( p_meta )
-        {
-            module_Unneed( p_demux, p_meta );
-            demux_meta_t *p_demux_meta = (demux_meta_t *)p_demux->p_private;
-            p_sys->meta = p_demux_meta->p_meta;
-            p_sys->i_attachments = p_demux_meta->i_attachments;
-            p_sys->attachments = p_demux_meta->attachments;
-        }
-        free( p_demux->p_private );
-    }
-
-    /* Initialize the Ogg physical bitstream parser */
-    ogg_sync_init( &p_sys->oy );
@@ -246 +222 @@
-
-    Ogg_EndOfStream( p_demux );
-
-    var_Destroy( p_demux, "meta-preparsed" );
-    if( p_sys->meta ) vlc_meta_Delete( p_sys->meta );
-
-    int i;
-    for( i = 0; i < p_sys->i_attachments; i++ )
-        free( p_sys->attachments[i] );
-    TAB_CLEAN( p_sys->i_attachments, p_sys->attachments);
-
-    free( p_sys );
@@ -399 +367 @@
-    demux_sys_t *p_sys  = p_demux->p_sys;
-    int64_t *pi64;
+    vlc_bool_t *pb_bool;
-    int i;
-    input_attachment_t ***ppp_attach;
-    int *pi_int;
-    vlc_meta_t *p_meta;
-
-    switch( i_query )
-    {
-GET
-_meta = (vlc_meta_t *)va_arg( args, vlc_meta
-vlc_meta_Merge( p_meta, p_sys->meta )
+HAS_UNSUPPORTED
+b_bool = (vlc_bool_t*)va_arg( args, vlc_bool
+*pb_bool = VLC_TRUE
-            return VLC_SUCCESS;
-
@@ -431 +397 @@
-            }
-            ogg_sync_reset( &p_sys->oy );
-
-        case DEMUX_GET_ATTACHMENTS:
-            ppp_attach =
-                (input_attachment_t***)va_arg( args, input_attachment_t*** );
-            pi_int = (int*)va_arg( args, int * );
-
-            if( p_sys->i_attachments <= 0 )
-                return VLC_EGENERIC;
-
-            *pi_int = p_sys->i_attachments;
-            *ppp_attach = malloc( sizeof(input_attachment_t**) * p_sys->i_attachments );
-            for( i = 0; i < p_sys->i_attachments; i++ )
-                (*ppp_attach)[i] = vlc_input_attachment_Duplicate( p_sys->attachments[i] );
-            return VLC_SUCCESS;
-
-        default: