access2_New code factorizaton

[vlc] / src / input / demux.c

diff --git a/src/input/demux.c b/src/input/demux.c
index f005282054e453d6e3fd557930e5b2bec69165a9..c5082c343c6bcf670cf2dcc2759ad2105fa6cde5 100644 (file)
--- a/src/input/demux.c
+++ b/src/input/demux.c
@@ -21,12 +21,16 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <stdlib.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 
 #include "input_internal.h"
 
-static void SkipID3Tag( demux_t * );
+static vlc_bool_t SkipID3Tag( demux_t * );
+static vlc_bool_t SkipAPETag( demux_t *p_demux );
 
 /*****************************************************************************
  * demux2_New:
@@ -51,7 +55,9 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
     if( *p_demux->psz_demux == '\0' )
     {
         free( p_demux->psz_demux );
-        p_demux->psz_demux = var_GetString( p_obj, "demux" );
+        p_demux->psz_demux = var_GetNonEmptyString( p_obj, "demux" );
+        if( p_demux->psz_demux == NULL )
+            p_demux->psz_demux = strdup( "" );
     }
 
     if( !b_quick )
@@ -143,10 +149,11 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
 
     if( s )
     {
-        /* ID3 tags will mess-up demuxer probing so we skip it here.
-         * ID3 parsers will called later on in the demuxer to access the
+        /* ID3/APE tags will mess-up demuxer probing so we skip it here.
+         * ID3/APE parsers will called later on in the demuxer to access the
          * skipped info. */
-        SkipID3Tag( p_demux );
+        if( !SkipID3Tag( p_demux ) )
+            SkipAPETag( p_demux );
 
         p_demux->p_module =
             module_Need( p_demux, "demux2", psz_module,
@@ -167,7 +174,7 @@ demux_t *__demux2_New( vlc_object_t *p_obj,
         free( p_demux->psz_path );
         free( p_demux->psz_demux );
         free( p_demux->psz_access );
-        vlc_object_destroy( p_demux );
+        vlc_object_release( p_demux );
         return NULL;
     }
 
@@ -186,7 +193,7 @@ void demux2_Delete( demux_t *p_demux )
     free( p_demux->psz_demux );
     free( p_demux->psz_access );
 
-    vlc_object_destroy( p_demux );
+    vlc_object_release( p_demux );
 }
 
 /*****************************************************************************
@@ -266,9 +273,11 @@ int demux2_vaControlHelper( stream_t *s,
 
         case DEMUX_GET_FPS:
         case DEMUX_GET_META:
+        case DEMUX_HAS_UNSUPPORTED_META:
         case DEMUX_SET_NEXT_DEMUX_TIME:
         case DEMUX_GET_TITLE_INFO:
         case DEMUX_SET_GROUP:
+        case DEMUX_GET_ATTACHMENTS:
             return VLC_EGENERIC;
 
         default:
@@ -296,7 +305,7 @@ typedef struct
 } d_stream_sys_t;
 
 static int DStreamRead   ( stream_t *, void *p_read, int i_read );
-static int DStreamPeek   ( stream_t *, uint8_t **pp_peek, int i_peek );
+static int DStreamPeek   ( stream_t *, const uint8_t **pp_peek, int i_peek );
 static int DStreamControl( stream_t *, int i_query, va_list );
 static int DStreamThread ( stream_t * );
 
@@ -311,7 +320,6 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
     if( psz_demux == NULL || *psz_demux == '\0' ) return NULL;
 
     s = vlc_stream_create( p_obj );
-    s->pf_block  = NULL;
     s->pf_read   = DStreamRead;
     s->pf_peek   = DStreamPeek;
     s->pf_control= DStreamControl;
@@ -332,7 +340,7 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
     if( ( p_sys->p_fifo = block_FifoNew( s ) ) == NULL )
     {
         msg_Err( s, "out of memory" );
-        vlc_object_destroy( s );
+        vlc_object_release( s );
         free( p_sys );
         return NULL;
     }
@@ -340,7 +348,7 @@ stream_t *__stream_DemuxNew( vlc_object_t *p_obj, const char *psz_demux,
     if( vlc_thread_create( s, "stream out", DStreamThread,
                            VLC_THREAD_PRIORITY_INPUT, VLC_FALSE ) )
     {
-        vlc_object_destroy( s );
+        vlc_object_release( s );
         free( p_sys );
         return NULL;
     }
@@ -373,7 +381,7 @@ void stream_DemuxDelete( stream_t *s )
     free( p_sys->psz_name );
     free( p_sys );
 
-    vlc_object_destroy( s );
+    vlc_object_release( s );
 }
 
 
@@ -418,7 +426,7 @@ static int DStreamRead( stream_t *s, void *p_read, int i_read )
     return i_out;
 }
 
-static int DStreamPeek( stream_t *s, uint8_t **pp_peek, int i_peek )
+static int DStreamPeek( stream_t *s, const uint8_t **pp_peek, int i_peek )
 {
     d_stream_sys_t *p_sys = (d_stream_sys_t*)s->p_sys;
     block_t **pp_block = &p_sys->p_block;
@@ -507,6 +515,7 @@ static int DStreamControl( stream_t *s, int i_query, va_list args )
             return VLC_SUCCESS;
 
         case STREAM_CONTROL_ACCESS:
+        case STREAM_GET_CONTENT_TYPE:
             return VLC_EGENERIC;
 
         default:
@@ -542,19 +551,22 @@ static int DStreamThread( stream_t *s )
 /****************************************************************************
  * Utility functions
  ****************************************************************************/
-static void SkipID3Tag( demux_t *p_demux )
+static vlc_bool_t SkipID3Tag( demux_t *p_demux )
 {
-    uint8_t *p_peek;
+    const uint8_t *p_peek;
     uint8_t version, revision;
     int i_size;
     int b_footer;
 
-    if( !p_demux->s ) return;
+    if( !p_demux->s )
+        return VLC_FALSE;
 
     /* Get 10 byte id3 header */
-    if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 ) return;
+    if( stream_Peek( p_demux->s, &p_peek, 10 ) < 10 )
+        return VLC_FALSE;
 
-    if( p_peek[0] != 'I' || p_peek[1] != 'D' || p_peek[2] != '3' ) return;
+    if( memcmp( p_peek, "ID3", 3 ) )
+        return VLC_FALSE;
 
     version = p_peek[3];
     revision = p_peek[4];
@@ -569,6 +581,37 @@ static void SkipID3Tag( demux_t *p_demux )
 
     msg_Dbg( p_demux, "ID3v2.%d revision %d tag found, skipping %d bytes",
              version, revision, i_size );
+    return VLC_TRUE;
+}
+static vlc_bool_t SkipAPETag( demux_t *p_demux )
+{
+    const uint8_t *p_peek;
+    int i_version;
+    int i_size;
+    uint32_t flags;
+
+    if( !p_demux->s )
+        return VLC_FALSE;
+
+    /* Get 32 byte ape header */
+    if( stream_Peek( p_demux->s, &p_peek, 32 ) < 32 )
+        return VLC_FALSE;
+
+    if( memcmp( p_peek, "APETAGEX", 8 ) )
+        return VLC_FALSE;
 
-    return;
+    i_version = GetDWLE( &p_peek[8] );
+    flags = GetDWLE( &p_peek[8+4+4] );
+    if( ( i_version != 1000 && i_version != 2000 ) || !( flags & (1<<29) ) )
+        return VLC_FALSE;
+
+    i_size = GetDWLE( &p_peek[8+4] ) + ( (flags&(1<<30)) ? 32 : 0 );
+
+    /* Skip the entire tag */
+    stream_Read( p_demux->s, NULL, i_size );
+
+    msg_Dbg( p_demux, "AP2 v%d tag found, skipping %d bytes",
+             i_version/1000, i_size );
+    return VLC_TRUE;
 }
+