[vlc-commits] live555: forced creation of timeout thread for WMServer rtsp dialects

[Andrew Schubert]

vlc | branch: master | Andrew Schubert <andrew1343j at yahoo.com> | Fri Apr 12 11:14:28 2013 -0400| [b63d80bf148ba7ef126930f6ddf4e6ef758fa686] | committer: Jean-Baptiste Kempf

live555: forced creation of timeout thread for WMServer rtsp dialects

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 at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b63d80bf148ba7ef126930f6ddf4e6ef758fa686
---

 modules/access/live555.cpp |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/modules/access/live555.cpp b/modules/access/live555.cpp
index 419f669..e29ac30 100644
--- a/modules/access/live555.cpp
+++ b/modules/access/live555.cpp
@@ -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) );