]> git.sesse.net Git - vlc/commitdiff
live555: forced creation of timeout thread for WMServer rtsp dialects
authorAndrew Schubert <andrew1343j@yahoo.com>
Fri, 12 Apr 2013 15:14:28 +0000 (11:14 -0400)
committerJean-Baptiste Kempf <jb@videolan.org>
Sat, 13 Apr 2013 17:41:12 +0000 (19:41 +0200)
GET_PARAMETER isn't reported to be supported by Windows Media Server in its OPTIONS.
However, it is needed to prevent automatic session timeout after 120 seconds.

Signed-off-by: Jean-Baptiste Kempf <jb@videolan.org>
modules/access/live555.cpp

index 419f6693d9bb63fbfdb166e9ff28dcfec5ab5113..e29ac30c02be7690171ac5ffa59e4d143b88e219 100644 (file)
@@ -1149,7 +1149,8 @@ static int Play( demux_t *p_demux )
             p_sys->i_timeout = 60; /* default value from RFC2326 */
 
         /* start timeout-thread only if GET_PARAMETER is supported by the server */
-        if( !p_sys->p_timeout && p_sys->b_get_param )
+        /* or start it if wmserver dialect, since they don't report that GET_PARAMETER is supported correctly */
+        if( !p_sys->p_timeout && ( p_sys->b_get_param || var_InheritBool( p_demux, "rtsp-wmserver" ) ) )
         {
             msg_Dbg( p_demux, "We have a timeout of %d seconds",  p_sys->i_timeout );
             p_sys->p_timeout = (timeout_thread_t *)malloc( sizeof(timeout_thread_t) );