Changeset 968ae4ef1e9a9373416bd0774d797fd4ea2eaa6c

Timestamp:

09/23/04 22:52:20 (4 years ago)

Author:

Derk-Jan Hartman <hartman@videolan.org>

git-committer:

Derk-Jan Hartman <hartman@videolan.org> 1095972740 +0000

git-parent:

[6678167c68b87f36506daf9089605e95de7af045]

git-author:

Derk-Jan Hartman <hartman@videolan.org> 1095972740 +0000

Message:

* if http:// and mime == asf, and name doesn't contain asx (cause they have mime == asf too) then bail http access and let the mms access try.

( VLC now plays http:// urls which are actually mms:// streams and no longer handles asx files when the path doesn't contain "asx" )

* added the aacp (aacPlus) mime type and force the aac demux in that case. aacPlus still doesn't work. (decoder issue?)

* don't PLAYLIST_GO on a redirect. gave weird effects because the current item was still in the 'open' fase. The playlist is already playing, so there is no use in this option.

Files:

• modules/access/http.c (modified) (4 diffs)

modules/access/http.c

@@ -69 +69 @@
-vlc_module_begin();
-    set_description( _("HTTP input") );
-0
+1
-
-    add_string( "http-proxy", NULL, NULL, PROXY_TEXT, PROXY_LONGTEXT,
@@ -268 +268 @@
-    }
-
+    if( p_sys->psz_mime && !strcasecmp( p_sys->psz_mime, "video/x-ms-asf" ) )
+    {
+        char *p = strcasestr( p_access->psz_path, "asx" );
+
+        if( p == NULL )
+        {
+            msg_Dbg( p_access, "This isn't http, it's mms" );
+            goto error;
+        }
+    }
+
-    if( ( p_sys->i_code == 301 || p_sys->i_code == 302 ||
-          p_sys->i_code == 303 || p_sys->i_code == 307 ) &&
@@ -285 +296 @@
-        p_playlist->pp_items[p_playlist->i_index]->b_autodeletion = VLC_TRUE;
-        playlist_Add( p_playlist, p_sys->psz_location, p_sys->psz_location,
- | PLAYLIST_GO
+
-                      p_playlist->i_index + 1 );
-        vlc_object_release( p_playlist );
@@ -296 +307 @@
-        if( p_sys->psz_mime && !strcasecmp( p_sys->psz_mime, "video/nsv" ) )
-            p_access->psz_demux = strdup( "nsv" );
+        else if( p_sys->psz_mime && !strcasecmp( p_sys->psz_mime, "audio/aacp" ) )
+            p_access->psz_demux = strdup( "aac" );
-        else
-            p_access->psz_demux = strdup( "mp3" );