Changeset 169ecd7a1037e334fc675c35c64a7d1ef899c9a1

Show
Ignore:
Timestamp:
08/09/08 03:10:46 (3 months ago)
Author:
Derk-Jan Hartman <hartman@videolan.org>
git-committer:
Derk-Jan Hartman <hartman@videolan.org> 1220836246 +0200
git-parent:

[fe82c45f12cb29946722c3830e872685ad225100]

git-author:
Derk-Jan Hartman <hartman@videolan.org> 1220836172 +0200
Message:

live555: check for support of GET_PARAMETER

if allowed, launch a timeout keep-a-live thread

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • modules/demux/live555.cpp

    ra567bae r169ecd7  
    206206 
    207207    char             event; 
     208 
     209    bool             b_get_param;   /* Does the server support GET_PARAMETER */ 
    208210}; 
    209211 
     
    285287    p_sys->psz_path = strdup( p_demux->psz_path ); 
    286288    p_sys->b_force_mcast = var_CreateGetBool( p_demux, "rtsp-mcast" ); 
     289    p_sys->b_get_param = false; 
    287290 
    288291    /* parse URL for rtsp://[user:[passwd]@]serverip:port/options */ 
     
    549552    psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd, 
    550553                                               &authenticator ); 
     554    p_sys->b_get_param = strstr( psz_options, "GET_PARAMETER" ) ? true : false ; 
    551555    delete [] psz_options; 
    552556 
     
    10361040            p_sys->i_timeout = 60; /* default value from RFC2326 */ 
    10371041 
    1038         /* start timeout-thread only on x-asf streams (wms), it has rtcp support but doesn't  
    1039          * seem to use it for liveness/keep-alive, get_parameter seems to work for it. get_parameter 
    1040          * doesn't work with dss 5.5.4 & 5.5.5, they seems to work with rtcp */ 
    1041         if( !p_sys->p_timeout && p_sys->p_out_asf ) 
     1042        /* start timeout-thread only if GET_PARAMETER is supported by the server */ 
     1043        if( !p_sys->p_timeout && p_sys->b_get_param ) 
    10421044        { 
    10431045            msg_Dbg( p_demux, "We have a timeout of %d seconds",  p_sys->i_timeout );