Changeset f2f15f46eca071e5118bd115fc298cb507872fe4

Timestamp:

06/15/08 15:16:18 (3 months ago)

Author:

Rémi Denis-Courmont <rdenis@simphalempin.com>

git-committer:

Rémi Denis-Courmont <rdenis@simphalempin.com> 1213535778 +0300

git-parent:

[8c032439f9efb3cc5bcadb05cd12b770b1459bf6]

git-author:

bl4 <bl4@playker.info> 1213534720 +0200

Message:

M3U playlist detection

Signed-off-by: Rémi Denis-Courmont <rdenis@simphalempin.com>

Files:

• modules/demux/playlist/m3u.c (modified) (3 diffs)

modules/demux/playlist/m3u.c

@@ -48 +48 @@
-static int Control( demux_t *p_demux, int i_query, va_list args );
-static void parseEXTINF( char *psz_string, char **ppsz_artist, char **ppsz_name, int *pi_duration );
+static bool ContainsURL( demux_t *p_demux );
-
-/*****************************************************************************
@@ -62 +63 @@
-           /* A .ram file can contain a single rtsp link */
-           demux_IsPathExtension( p_demux, ".ram" ) || demux_IsPathExtension( p_demux, ".rm" ) ||
-
+|| ContainsURL( p_demux ) 
-        return VLC_EGENERIC;
-
@@ -69 +70 @@
-
-    return VLC_SUCCESS;
+}
+
+static bool ContainsURL( demux_t *p_demux )
+{
+    uint8_t *p_peek;
+    int i_peek;
+    uint8_t *p_peek_end;
+
+    i_peek = stream_Peek( p_demux->s, &p_peek, 1024 );
+    if( i_peek <= 0 ) return false;
+    p_peek_end = p_peek + i_peek;
+
+    while( p_peek + sizeof( "https://" ) < p_peek_end )
+    {
+        /* One line starting with an URL is enough */
+        if( !strncasecmp( p_peek, "http://", sizeof( "http://" ) - 1 ) ||
+            !strncasecmp( p_peek, "mms://", sizeof( "mms://" ) - 1 ) ||
+            !strncasecmp( p_peek, "rtsp://", sizeof( "rtsp://" ) - 1 ) ||
+            !strncasecmp( p_peek, "https://", sizeof( "https://" ) - 1 ) ||
+            !strncasecmp( p_peek, "ftp://", sizeof( "ftp://" ) - 1 ) )
+        {
+            return true;
+        }
+        /* Comments and blank lines are ignored */
+        else if( *p_peek != '#' && *p_peek != '\n' && *p_peek != '\r')
+        {
+            return false;
+        }
+
+        while( p_peek < p_peek_end && *p_peek != '\n' )
+            p_peek++;
+        if ( *p_peek == '\n' )
+            p_peek++;
+    }
+    return false;
-}
-