RTSP authentication with DSS

This patch enables a working RTSP authentication with the Darwin
streaming server (DSS).

When the VLC is compiled against Live555 streaming media library
(live.2008.09.02), the authentication fails when both username and
password are asked via a VLC dialog as the DSS requires authorization
also for SETUP, PLAY, and TEARDOWN commands and the necessary
information isn't delivered correctly to the Live555 library. The VLC
used Live555 interface in such a way, that the authenticator was valid
only for the DESCRIBE when I debugged the library with vlc-0.9.2. The
problem still exists in vlc-0.9.5.

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

diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp
index 415510d902bf3dbdb9786abb9b1ea10079abd66b..d09e3eb12235f7254ff52c5a08d5e944fdf76a65 100644 (file)
--- a/modules/demux/live555.cpp
+++ b/modules/demux/live555.cpp
@@ -558,10 +558,10 @@ describe:
     {
         p_sys->b_get_param = strstr( psz_options, "GET_PARAMETER" ) ? true : false ;
 #if LIVEMEDIA_LIBRARY_VERSION_INT >= 1223337600
-        p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator,
+        p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd,
                                           var_GetBool( p_demux, "rtsp-kasenna" ), timeout );
 #else
-        p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator,
+        p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd,
                                           var_GetBool( p_demux, "rtsp-kasenna" ) );
 #endif