Changeset ab0e83875c76e2a7ac258d0314908fd9bfb28c68

Timestamp:

08/10/07 20:32:14 (1 year ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[c046c7392fe5e0c8fac0f605631aa4ef491f2a5a]

git-author:

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

Message:

Let the input handle meta data and attachments for mpeg audio.

Files:

• modules/demux/mpeg/mpga.c (modified) (8 diffs)

modules/demux/mpeg/mpga.c

@@ -29 +29 @@
-#include <vlc/vlc.h>
-#include <vlc_demux.h>
-#include <vlc_meta.h>
-#include <vlc_codec.h>
-#include <vlc_input.h>
@@ -60 +59 @@
-{
-    es_out_id_t *p_es;
-    vlc_meta_t  *meta;
-
-    vlc_bool_t  b_start;
@@ -76 +74 @@
-    int i_xing_frame_samples;
-    block_t *p_block_in, *p_block_out;
-
-    int                i_attachments;
-    input_attachment_t **attachments;
-};
-
@@ -126 +121 @@
-    uint32_t     header;
-    const uint8_t     *p_peek;
-    module_t    *p_id3;
-    block_t     *p_block_in, *p_block_out;
-
@@ -159 +153 @@
-    p_sys->p_es = 0;
-    p_sys->b_start = VLC_TRUE;
-    p_sys->meta = 0;
-
-    /* Load the mpeg audio packetizer */
@@ -256 +249 @@
-    p_sys->p_block_out = p_block_out;
-
-    /* Parse possible id3 header */
-    if( !var_CreateGetBool( p_demux, "meta-preparsed" ) )
-    {
-        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 ) ) )
-        {
-            module_Unneed( p_demux, p_id3 );
-            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 );
-    }
-    /* */
-    p_sys->p_packetizer->fmt_out.b_packetized = VLC_TRUE;
-    vlc_audio_replay_gain_MergeFromMeta( &p_sys->p_packetizer->fmt_out.audio_replay_gain,
-                                         p_sys->meta );
-    p_sys->p_es = es_out_Add( p_demux->out,
-                              &p_sys->p_packetizer->fmt_out);
@@ -346 +321 @@
-    demux_sys_t *p_sys = p_demux->p_sys;
-
-    var_Destroy( p_demux, "meta-preparsed" );
-
-    DESTROY_PACKETIZER( p_sys->p_packetizer );
-    if( p_sys->meta ) vlc_meta_Delete( p_sys->meta );
-    if( p_sys->p_block_out ) block_Release( p_sys->p_block_out );
-
-    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 );
@@ -367 +334 @@
-    demux_sys_t *p_sys  = p_demux->p_sys;
-    int64_t *pi64;
-meta_t *p_meta
+bool_t *pb_bool
-    int i_ret;
-
-    input_attachment_t ***ppp_attach;
-    int *pi_int, i;
-
-    switch( i_query )
-    {
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-            return VLC_SUCCESS;
-