Changeset feb3362820c541cfe7b31d0dc37fb4b5c4b504cb

Timestamp:

01/04/05 15:28:54 (4 years ago)

Author:

Sigmund Augdal Helberg <sigmunau@videolan.org>

git-committer:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1112362134 +0000

git-parent:

[ce596a3b97ea08176761f870c36cdee0dc7c5dd4]

git-author:

Sigmund Augdal Helberg <sigmunau@videolan.org> 1112362134 +0000

Message:

demux/flac.c: support flac files with id3 tag. closes #2015

Files:

• modules/demux/flac.c (modified) (9 diffs)

modules/demux/flac.c

@@ -57 +57 @@
-    /* Packetizer */
-    decoder_t *p_packetizer;
+    vlc_meta_t *p_meta;
-};
-
@@ -68 +69 @@
-{
-    demux_t     *p_demux = (demux_t*)p_this;
+    module_t    *p_id3;
-    demux_sys_t *p_sys;
-    int          i_peek;
-    byte_t      *p_peek;
-    es_format_t  fmt;
-
+
+
+
+
+
+
+
+
+
+
-    /* Have a peep at the show. */
-
+
+
+
+
+
-
-    if( p_peek[0]!='f' || p_peek[1]!='L' || p_peek[2]!='a' || p_peek[3]!='C' )
@@ -80 +95 @@
-        if( strncmp( p_demux->psz_demux, "flac", 4 ) )
-        {
+            if( p_meta ) vlc_meta_Delete( p_meta );
-            return VLC_EGENERIC;
-        }
@@ -92 +108 @@
-    es_format_Init( &fmt, AUDIO_ES, VLC_FOURCC( 'f', 'l', 'a', 'c' ) );
-    p_sys->b_start = VLC_TRUE;
+    p_sys->p_meta = p_meta;
-
-    /* We need to read and store the STREAMINFO metadata */
@@ -98 +115 @@
-    {
-        msg_Err( p_demux, "this isn't a STREAMINFO metadata block" );
+        if( p_meta ) vlc_meta_Delete( p_meta );
-        return VLC_EGENERIC;
-    }
@@ -104 +122 @@
-    {
-        msg_Err( p_demux, "invalid size for a STREAMINFO metadata block" );
+        if( p_meta ) vlc_meta_Delete( p_meta );
-        return VLC_EGENERIC;
-    }
@@ -141 +160 @@
-        vlc_object_destroy( p_sys->p_packetizer );
-        msg_Err( p_demux, "cannot find flac packetizer" );
+        if( p_meta ) vlc_meta_Delete( p_meta );
-        return VLC_EGENERIC;
-    }
@@ -165 +185 @@
-    /* Delete the decoder */
-    vlc_object_destroy( p_sys->p_packetizer );
-
+
-    free( p_sys );
-}
@@ -222 +242 @@
-    if( i_query == DEMUX_SET_TIME )
-        return VLC_EGENERIC;
+    else if( i_query == DEMUX_GET_META )
+    {        
+        vlc_meta_t **pp_meta = (vlc_meta_t **)va_arg( args, vlc_meta_t** );
+        if( p_demux->p_sys->p_meta ) *pp_meta = vlc_meta_Duplicate( p_demux->p_sys->p_meta );
+        else *pp_meta = NULL;
+        return VLC_SUCCESS;
+    }
-    else
-        return demux2_vaControlHelper( p_demux->s,