Skip to content

V
vlc-2-2
Commit 878747ab authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* Send Keep-A-Live RTSP bogus calls for servers that do not support RTCP reports. 

  Seems to work for WM RTSP. No support yet for Kasenna,
  since I don't have proper access to one at this moment.

  refs #595
  refs #329
parent f466773b
Show whitespace changes
Inline Side-by-side
Showing with 91 additions and 3 deletions
modules/demux/livedotcom.cpp
View file @ 878747ab
...@@ -64,9 +64,9 @@ static void Close( vlc_object_t * ); ...@@ -64,9 +64,9 @@ static void Close( vlc_object_t * );
"value should be set in millisecond units." ) "value should be set in millisecond units." )
#define KASENNA_TEXT N_( "Kasenna RTSP dialect") #define KASENNA_TEXT N_( "Kasenna RTSP dialect")
#define KASENNA_LONGTEXT N_( "Kasenna server speak an old and unstandard " \ #define KASENNA_LONGTEXT N_( "Kasenna servers use an old and unstandard " \
"dialect of RTSP. When you set this parameter, VLC will try this dialect "\ "dialect of RTSP. When you set this parameter, VLC will try this dialect "\
"for communication. In this mode you cannot talk to normal RTSP servers." ) "for communication. In this mode you cannot connect to normal RTSP servers." )
vlc_module_begin(); vlc_module_begin();
set_description( _("RTP/RTSP/SDP demuxer (using Live555.com)" ) ); set_description( _("RTP/RTSP/SDP demuxer (using Live555.com)" ) );
...@@ -115,6 +115,7 @@ vlc_module_end(); ...@@ -115,6 +115,7 @@ vlc_module_end();
/***************************************************************************** /*****************************************************************************
* Local prototypes * Local prototypes
*****************************************************************************/ *****************************************************************************/
typedef struct typedef struct
{ {
demux_t *p_demux; demux_t *p_demux;
...@@ -141,6 +142,14 @@ typedef struct ...@@ -141,6 +142,14 @@ typedef struct
} live_track_t; } live_track_t;
struct timeout_thread_t
{
VLC_COMMON_MEMBERS
int64_t i_remain;
demux_sys_t *p_sys;
};
struct demux_sys_t struct demux_sys_t
{ {
char *p_sdp; /* XXX mallocated */ char *p_sdp; /* XXX mallocated */
...@@ -168,6 +177,11 @@ struct demux_sys_t ...@@ -168,6 +177,11 @@ struct demux_sys_t
mtime_t i_length; mtime_t i_length;
mtime_t i_start; mtime_t i_start;
/* timeout thread information */
int i_timeout; /* session timeout value in seconds */
vlc_bool_t b_timeout_call;/* mark to send an RTSP call to prevent server timeout */
timeout_thread_t *p_timeout; /* the actual thread that makes sure we don't timeout */
/* */ /* */
vlc_bool_t b_multicast; /* true if one of the tracks is multicasted */ vlc_bool_t b_multicast; /* true if one of the tracks is multicasted */
vlc_bool_t b_no_data; /* true if we never receive any data */ vlc_bool_t b_no_data; /* true if we never receive any data */
...@@ -180,7 +194,6 @@ static int Demux ( demux_t * ); ...@@ -180,7 +194,6 @@ static int Demux ( demux_t * );
static int Control( demux_t *, int, va_list ); static int Control( demux_t *, int, va_list );
static int ParseASF( demux_t * ); static int ParseASF( demux_t * );
static int RollOverTcp( demux_t * ); static int RollOverTcp( demux_t * );
static void StreamRead( void *, unsigned int, unsigned int, static void StreamRead( void *, unsigned int, unsigned int,
...@@ -188,6 +201,8 @@ static void StreamRead( void *, unsigned int, unsigned int, ...@@ -188,6 +201,8 @@ static void StreamRead( void *, unsigned int, unsigned int,
static void StreamClose( void * ); static void StreamClose( void * );
static void TaskInterrupt( void * ); static void TaskInterrupt( void * );
static void TimeoutPrevention( timeout_thread_t * );
#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1117756800 #if LIVEMEDIA_LIBRARY_VERSION_INT >= 1117756800
static unsigned char* parseH264ConfigStr( char const* configStr, static unsigned char* parseH264ConfigStr( char const* configStr,
unsigned int& configSize ); unsigned int& configSize );
...@@ -251,6 +266,9 @@ static int Open ( vlc_object_t *p_this ) ...@@ -251,6 +266,9 @@ static int Open ( vlc_object_t *p_this )
p_sys->p_out_asf = NULL; p_sys->p_out_asf = NULL;
p_sys->b_no_data = VLC_TRUE; p_sys->b_no_data = VLC_TRUE;
p_sys->i_no_data_ti = 0; p_sys->i_no_data_ti = 0;
p_sys->p_timeout = NULL;
p_sys->i_timeout = 0;
p_sys->b_timeout_call = VLC_FALSE;
p_sys->b_multicast = VLC_FALSE; p_sys->b_multicast = VLC_FALSE;
p_sys->psz_path = strdup(p_demux->psz_path); p_sys->psz_path = strdup(p_demux->psz_path);
...@@ -426,6 +444,27 @@ static int Open ( vlc_object_t *p_this ) ...@@ -426,6 +444,27 @@ static int Open ( vlc_object_t *p_this )
delete iter; delete iter;
goto error; goto error;
} }
/* Retrieve the timeout value and set up a timeout prevention thread */
#ifdef LIVEMEDIA_LIBRARY_VERSION_INT > 1138250000
p_sys->i_timeout = p_sys->rtsp->sessionTimeoutParameter();
#endif
if( p_sys->i_timeout > 0 )
{
msg_Dbg( p_demux, "We have a timeout of %d seconds", p_sys->i_timeout );
p_sys->p_timeout = (timeout_thread_t *)vlc_object_create( p_demux, sizeof(timeout_thread_t) );
p_sys->p_timeout->p_sys = p_demux->p_sys; /* lol, object recursion :D */
if( vlc_thread_create( p_sys->p_timeout, "liveMedia-timeout", TimeoutPrevention,
VLC_THREAD_PRIORITY_LOW, VLC_TRUE ) )
{
msg_Err( p_demux, "cannot spawn liveMedia timeout thread" );
delete iter;
vlc_object_destroy( p_sys->p_timeout );
goto error;
}
msg_Dbg( p_demux, "spawned timeout thread" );
vlc_object_attach( p_sys->p_timeout, p_demux );
}
} }
/* Create all es struct */ /* Create all es struct */
...@@ -700,6 +739,13 @@ error: ...@@ -700,6 +739,13 @@ error:
if( p_sys->ms ) Medium::close( p_sys->ms ); if( p_sys->ms ) Medium::close( p_sys->ms );
if( p_sys->rtsp ) Medium::close( p_sys->rtsp ); if( p_sys->rtsp ) Medium::close( p_sys->rtsp );
if( p_sys->env ) RECLAIM_ENV(p_sys->env); if( p_sys->env ) RECLAIM_ENV(p_sys->env);
if( p_sys->p_timeout )
{
p_sys->p_timeout->b_die = VLC_TRUE;
vlc_thread_join( p_sys->p_timeout );
vlc_object_detach( p_sys->p_timeout );
vlc_object_destroy( p_sys->p_timeout );
}
if( p_sys->scheduler ) delete p_sys->scheduler; if( p_sys->scheduler ) delete p_sys->scheduler;
if( p_sys->p_sdp ) free( p_sys->p_sdp ); if( p_sys->p_sdp ) free( p_sys->p_sdp );
if( p_sys->psz_path ) free( p_sys->psz_path ); if( p_sys->psz_path ) free( p_sys->psz_path );
...@@ -737,6 +783,14 @@ static void Close( vlc_object_t *p_this ) ...@@ -737,6 +783,14 @@ static void Close( vlc_object_t *p_this )
Medium::close( p_sys->ms ); Medium::close( p_sys->ms );
if( p_sys->p_timeout )
{
p_sys->p_timeout->b_die = VLC_TRUE;
vlc_thread_join( p_sys->p_timeout );
vlc_object_detach( p_sys->p_timeout );
vlc_object_destroy( p_sys->p_timeout );
}
if( p_sys->rtsp ) Medium::close( p_sys->rtsp ); if( p_sys->rtsp ) Medium::close( p_sys->rtsp );
if( p_sys->env ) RECLAIM_ENV(p_sys->env); if( p_sys->env ) RECLAIM_ENV(p_sys->env);
if( p_sys->scheduler ) delete p_sys->scheduler; if( p_sys->scheduler ) delete p_sys->scheduler;
...@@ -757,6 +811,14 @@ static int Demux( demux_t *p_demux ) ...@@ -757,6 +811,14 @@ static int Demux( demux_t *p_demux )
mtime_t i_pcr = 0; mtime_t i_pcr = 0;
int i; int i;
/* Check if we need to send the server a Keep-A-Live signal */
if( p_sys->b_timeout_call && p_sys->rtsp && p_sys->ms )
{
char *psz_bye = NULL;
p_sys->rtsp->getMediaSessionParameter( *p_sys->ms, NULL, psz_bye );
p_sys->b_timeout_call = VLC_FALSE;
}
for( i = 0; i < p_sys->i_track; i++ ) for( i = 0; i < p_sys->i_track; i++ )
{ {
live_track_t *tk = p_sys->track[i]; live_track_t *tk = p_sys->track[i];
...@@ -1314,6 +1376,32 @@ static void TaskInterrupt( void *p_private ) ...@@ -1314,6 +1376,32 @@ static void TaskInterrupt( void *p_private )
p_demux->p_sys->event = 0xff; p_demux->p_sys->event = 0xff;
} }
/*****************************************************************************
*
*****************************************************************************/
static void TimeoutPrevention( timeout_thread_t *p_timeout )
{
p_timeout->b_die = VLC_FALSE;
p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2;
p_timeout->i_remain *= 1000000;
vlc_thread_ready( p_timeout );
/* Avoid lock */
while( !p_timeout->b_die )
{
if( p_timeout->i_remain <= 0 )
{
p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2;
p_timeout->i_remain *= 1000000;
p_timeout->p_sys->b_timeout_call = VLC_TRUE;
msg_Dbg( p_timeout, "reset the timeout timer" );
}
p_timeout->i_remain -= 200000;
msleep( 200000 ); /* 200 ms */
}
}
/***************************************************************************** /*****************************************************************************
* *
*****************************************************************************/ *****************************************************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment