Changeset 6d3ce5936ac1416669df68a547be91d3db6c33ad

Timestamp:

25/05/07 20:37:45 (2 years ago)

Author:

Laurent Aimar <fenrir@videolan.org>

git-committer:

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

git-parent:

[d6cacb46b2c13b651a53286f713fff12bc470503]

git-author:

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

Message:

Added meta parsing (close #624)

Files:

• modules/demux/mpeg/m4a.c (modified) (6 diffs)

modules/demux/mpeg/m4a.c

@@ -29 +29 @@
-#include <vlc/vlc.h>
-#include <vlc_demux.h>
+#include <vlc_meta.h>
-#include "vlc_codec.h"
-
@@ -55 +56 @@
-    vlc_bool_t  b_start;
-    es_out_id_t *p_es;
+    vlc_meta_t  *meta;
-
-    decoder_t   *p_packetizer;
@@ -77 +79 @@
-    demux_t     *p_demux = (demux_t*)p_this;
-    demux_sys_t *p_sys;
+    module_t    *p_id3;
-    uint8_t     *p_peek;
-    int         b_forced = VLC_FALSE;
@@ -122 +125 @@
-    LOAD_PACKETIZER_OR_FAIL( p_sys->p_packetizer, "mp4 audio" );
-
+    /* Parse possible id3 header */
+    if( ( p_id3 = module_Need( p_demux, "meta reader", NULL, 0 ) ) )
+    {
+        p_sys->meta = (vlc_meta_t *)p_demux->p_private;
+        p_demux->p_private = NULL;
+        module_Unneed( p_demux, p_id3 );
+    }
-    return VLC_SUCCESS;
-}
@@ -194 +204 @@
-{
-    demux_sys_t *p_sys = p_demux->p_sys;
+    vlc_meta_t *p_meta;
+
-    int64_t *pi64;
-    int i_ret;
@@ -199 +211 @@
-    switch( i_query )
-    {
+    case DEMUX_GET_META:
+        p_meta = (vlc_meta_t *)va_arg( args, vlc_meta_t* );
+        vlc_meta_Merge( p_meta, p_sys->meta );
+        return VLC_SUCCESS;
+
-    case DEMUX_GET_TIME:
-        pi64 = (int64_t*)va_arg( args, int64_t * );