#include <iostream>
#include <limits.h>
+#include <assert.h>
#if defined( WIN32 )
bool b_rtcp_sync;
char waiting;
int64_t i_pts;
- u_int32_t i_start_seq;
+ float i_npt;
} live_track_t;
struct timeout_thread_t
{
- VLC_COMMON_MEMBERS
-
- int64_t i_remain;
- bool b_handle_keep_alive;
demux_sys_t *p_sys;
+ vlc_thread_t handle;
+ bool b_handle_keep_alive;
};
struct demux_sys_t
/* Weird formats */
asf_header_t asfh;
stream_t *p_out_asf;
- bool b_real;
+ bool b_real;
/* */
int64_t i_pcr; /* The clock */
- int64_t i_npt_length;
- int64_t i_npt_start;
+ float i_npt;
+ float i_npt_length;
+ float i_npt_start;
/* timeout thread information */
int i_timeout; /* session timeout value in seconds */
- bool b_timeout_call;/* mark to send an RTSP call to prevent server timeout */
+ bool 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 */
/* */
int i_no_data_ti; /* consecutive number of TaskInterrupt */
char event;
+
+ bool b_get_param; /* Does the server support GET_PARAMETER */
};
static int Demux ( demux_t * );
static void StreamClose ( void * );
static void TaskInterrupt( void * );
-static void TimeoutPrevention( timeout_thread_t * );
+static void* TimeoutPrevention( void * );
static unsigned char* parseH264ConfigStr( char const* configStr,
unsigned int& configSize );
p_sys->i_track = 0;
p_sys->track = NULL;
p_sys->i_pcr = 0;
- p_sys->i_npt_start = 0;
- p_sys->i_npt_length = 0;
+ p_sys->i_npt = 0.;
+ p_sys->i_npt_start = 0.;
+ p_sys->i_npt_length = 0.;
p_sys->p_out_asf = NULL;
p_sys->b_no_data = true;
p_sys->i_no_data_ti = 0;
p_sys->b_real = false;
p_sys->psz_path = strdup( p_demux->psz_path );
p_sys->b_force_mcast = var_CreateGetBool( p_demux, "rtsp-mcast" );
+ p_sys->b_get_param = false;
/* parse URL for rtsp://[user:[passwd]@]serverip:port/options */
vlc_UrlParse( &p_sys->url, p_sys->psz_path, 0 );
if( p_sys->env ) p_sys->env->reclaim();
if( p_sys->p_timeout )
{
- vlc_object_kill( p_sys->p_timeout );
- vlc_thread_join( p_sys->p_timeout );
- vlc_object_detach( p_sys->p_timeout );
- vlc_object_release( p_sys->p_timeout );
+ vlc_cancel( p_sys->p_timeout->handle );
+ vlc_join( p_sys->p_timeout->handle, NULL );
+ free( p_sys->p_timeout );
}
delete p_sys->scheduler;
free( p_sys->p_sdp );
if( p_sys->env ) p_sys->env->reclaim();
if( p_sys->p_timeout )
{
- vlc_object_kill( p_sys->p_timeout );
- vlc_thread_join( p_sys->p_timeout );
- vlc_object_detach( p_sys->p_timeout );
- vlc_object_release( p_sys->p_timeout );
+ vlc_cancel( p_sys->p_timeout->handle );
+ vlc_join( p_sys->p_timeout->handle, NULL );
+ free( p_sys->p_timeout );
}
delete p_sys->scheduler;
free( p_sys->p_sdp );
*/
if( var_CreateGetBool( p_demux, "rtsp-kasenna" ))
{
-#if LIVEMEDIA_LIBRARY_VERSION_INT > 1130457500
p_sys->rtsp->setUserAgentString( "VLC_MEDIA_PLAYER_KA" );
-#endif
}
describe:
psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
&authenticator );
+ if( psz_options )
+ p_sys->b_get_param = strstr( psz_options, "GET_PARAMETER" ) ? true : false ;
delete [] psz_options;
p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator,
MediaSubsessionIterator *iter = NULL;
MediaSubsession *sub = NULL;
- bool b_rtsp_tcp = false;
+ bool b_rtsp_tcp = false;
int i_client_port;
int i_return = VLC_SUCCESS;
unsigned int i_buffer = 0;
/* Issue the SETUP */
if( p_sys->rtsp )
{
- bool tcp = b_rtsp_tcp;
- bool mcast = p_sys->b_force_mcast;
if( !p_sys->rtsp->setupMediaSubsession( *sub, False,
- tcp ? True : False,
- ( mcast && !tcp ) ? True : False ) )
+ b_rtsp_tcp ? True : False,
+ ( p_sys->b_force_mcast && !b_rtsp_tcp ) ? True : False ) )
{
- tcp = !tcp;
/* if we get an unsupported transport error, toggle TCP use and try again */
if( !strstr(p_sys->env->getResultMsg(), "461 Unsupported Transport")
|| !p_sys->rtsp->setupMediaSubsession( *sub, False,
- tcp ? False : True,
- ( mcast && !tcp ) ? True : False ) )
+ b_rtsp_tcp ? False : True,
+ False ) )
{
msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(),
sub->codecName(), p_sys->env->getResultMsg() );
tk->waiting = 0;
tk->b_rtcp_sync = false;
tk->i_pts = 0;
+ tk->i_npt = 0.;
tk->i_buffer = 65536;
tk->p_buffer = (uint8_t *)malloc( 65536 );
if( !tk->p_buffer )
delete iter;
if( p_sys->i_track <= 0 ) i_return = VLC_EGENERIC;
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* Retrieve the starttime if possible */
- p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
-#else
- p_sys->i_npt_start = (int64_t) -1;
-#endif
- if( p_sys->i_npt_start < 0 )
- p_sys->i_npt_start = -1;
+ p_sys->i_npt_start = p_sys->ms->playStartTime();
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* Retrieve the duration if possible */
- p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
-#else
- p_sys->i_npt_length = (int64_t) -1;
-#endif
- if( p_sys->i_npt_length < 0 )
- p_sys->i_npt_length = -1;
+ p_sys->i_npt_length = p_sys->ms->playEndTime();
- msg_Dbg( p_demux, "setup start: %lld stop:%lld", p_sys->i_npt_start, p_sys->i_npt_length );
+ msg_Dbg( p_demux, "setup start: %f stop:%f", p_sys->i_npt_start, p_sys->i_npt_length );
return i_return;
}
if( p_sys->i_timeout <= 0 )
p_sys->i_timeout = 60; /* default value from RFC2326 */
- /* start timeout-thread only on x-asf streams (wms), it has rtcp support but doesn't
- * seem to use it for liveness/keep-alive, get_parameter seems to work for it. get_parameter
- * doesn't work with dss 5.5.4 & 5.5.5, they seems to work with rtcp */
- if( !p_sys->p_timeout && p_sys->p_out_asf )
+ /* start timeout-thread only if GET_PARAMETER is supported by the server */
+ if( !p_sys->p_timeout && p_sys->b_get_param )
{
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 = (timeout_thread_t *)malloc( 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, true ) )
+ if( vlc_clone( &p_sys->p_timeout->handle, TimeoutPrevention,
+ p_sys->p_timeout, VLC_THREAD_PRIORITY_LOW ) )
{
msg_Err( p_demux, "cannot spawn liveMedia timeout thread" );
- vlc_object_release( p_sys->p_timeout );
+ free( p_sys->p_timeout );
+ p_sys->p_timeout = NULL;
}
msg_Dbg( p_demux, "spawned timeout thread" );
- vlc_object_attach( p_sys->p_timeout, p_demux );
}
}
p_sys->i_pcr = 0;
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1195257600)
- for( i = 0; i < p_sys->i_track; i++ )
- {
- if( !p_sys->track[i]->b_rtcp_sync )
- p_sys->track[i]->i_pts = (int64_t) ( p_sys->track[i]->sub->rtpInfo.timestamp * (double)1000000.0 );
- p_sys->track[i]->i_start_seq = (int)p_sys->track[i]->sub->rtpInfo.seqNum;
- msg_Info( p_demux, "set startseq: %u", p_sys->track[i]->i_start_seq );
- }
-#endif
-
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* Retrieve the starttime if possible */
- p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
-#else
- p_sys->i_npt_start = -1;
-#endif
- if( p_sys->i_npt_start < 0 )
- p_sys->i_npt_start = -1;
-
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
- /* Retrieve the duration if possible */
- p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
-#else
- p_sys->i_npt_length = -1;
-#endif
- if( p_sys->i_npt_length < 0 )
- p_sys->i_npt_length = -1;
+ p_sys->i_npt_start = p_sys->ms->playStartTime();
+ p_sys->i_npt_length = p_sys->ms->playEndTime();
- msg_Dbg( p_demux, "play start: %lld stop:%lld", p_sys->i_npt_start, p_sys->i_npt_length );
+ msg_Dbg( p_demux, "play start: %f stop:%f", p_sys->i_npt_start, p_sys->i_npt_length );
return VLC_SUCCESS;
}
demux_sys_t *p_sys = p_demux->p_sys;
TaskToken task;
- bool b_send_pcr = true;
+ bool b_send_pcr = true;
int64_t i_pcr = 0;
int i;
p_sys->b_timeout_call = false;
}
-
for( i = 0; i < p_sys->i_track; i++ )
{
live_track_t *tk = p_sys->track[i];
tk->b_rtcp_sync = true;
/* reset PCR */
tk->i_pts = 0;
+ tk->i_npt = 0.;
p_sys->i_pcr = 0;
+ p_sys->i_npt = 0.;
i_pcr = 0;
}
}
msg_Err( p_demux, "TCP rollover failed, aborting" );
return 0;
}
+ return 1;
}
msg_Err( p_demux, "no data received in 10s, aborting" );
return 0;
static int Control( demux_t *p_demux, int i_query, va_list args )
{
demux_sys_t *p_sys = p_demux->p_sys;
- int64_t *pi64;
+ int64_t *pi64, i64;
double *pf, f;
bool *pb, *pb2, b_bool;
int *pi_int;
switch( i_query )
{
case DEMUX_GET_TIME:
+ pi64 = (int64_t*)va_arg( args, int64_t * );
+ if( p_sys->i_npt > 0 )
+ {
+ *pi64 = (int64_t)(p_sys->i_npt * 1000000.);
+ return VLC_SUCCESS;
+ }
return VLC_EGENERIC;
case DEMUX_GET_LENGTH:
pi64 = (int64_t*)va_arg( args, int64_t * );
if( p_sys->i_npt_length > 0 )
{
- *pi64 = p_sys->i_npt_length;
+ *pi64 = p_sys->i_npt_length * 1000000.0;
return VLC_SUCCESS;
}
return VLC_EGENERIC;
case DEMUX_GET_POSITION:
+ pf = (double*)va_arg( args, double* );
+ if( p_sys->i_npt_length > 0 && p_sys->i_npt > 0)
+ {
+ *pf = ( (double)p_sys->i_npt / (double)p_sys->i_npt_length );
+ return VLC_SUCCESS;
+ }
return VLC_EGENERIC;
case DEMUX_SET_POSITION:
- {
- float time;
-
- f = (double)va_arg( args, double );
+ case DEMUX_SET_TIME:
if( p_sys->rtsp && p_sys->i_npt_length > 0 )
{
int i;
- time = f * (double)p_sys->i_npt_length / (double)1000000.0; /* in second */
+ float time;
+
+ if( i_query == DEMUX_SET_TIME && p_sys->i_npt > 0 )
+ {
+ i64 = (int64_t)va_arg( args, int64_t );
+ time = (float)((double)i64 / (double)1000000.0); /* in second */
+ }
+ else if( i_query == DEMUX_SET_TIME )
+ return VLC_EGENERIC;
+ else
+ {
+ f = (double)va_arg( args, double );
+ time = f * (double)p_sys->i_npt_length; /* in second */
+ }
+
if( !p_sys->rtsp->playMediaSession( *p_sys->ms, time, -1, 1 ) )
{
msg_Err( p_demux, "PLAY failed %s",
p_sys->env->getResultMsg() );
return VLC_EGENERIC;
}
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
p_sys->i_pcr = 0;
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1195257600)
+
/* Retrieve RTP-Info values */
for( i = 0; i < p_sys->i_track; i++ )
{
- //if( !p_sys->track[i]->b_rtcp_sync )
p_sys->track[i]->b_rtcp_sync = false;
- p_sys->track[i]->i_pts = (int64_t) ( p_sys->track[i]->sub->rtpInfo.timestamp * (double)1000000.0 );
- p_sys->track[i]->i_start_seq = p_sys->track[i]->sub->rtpInfo.seqNum;
- msg_Info( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq );
+ p_sys->track[i]->i_pts = 0;
}
-#endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
+
/* Retrieve the starttime if possible */
- p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
-#else
- p_sys->i_npt_start = -1;
-#endif
- if( p_sys->i_npt_start < 0 )
- p_sys->i_npt_start = -1;
+ p_sys->i_npt = p_sys->i_npt_start = p_sys->ms->playStartTime();
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* Retrieve the duration if possible */
- p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
-#else
- p_sys->i_npt_length = -1;
-#endif
- if( p_sys->i_npt_length < 0 )
- p_sys->i_npt_length = -1;
+ p_sys->i_npt_length = p_sys->ms->playEndTime();
- msg_Dbg( p_demux, "seek start: %lld stop:%lld", p_sys->i_npt_start, p_sys->i_npt_length );
+ msg_Dbg( p_demux, "seek start: %f stop:%f", p_sys->i_npt_start, p_sys->i_npt_length );
return VLC_SUCCESS;
}
return VLC_EGENERIC;
- }
+
/* Special for access_demux */
case DEMUX_CAN_PAUSE:
case DEMUX_CAN_SEEK:
pb = (bool*)va_arg( args, bool * );
- if( p_sys->rtsp && p_sys->i_npt_length )
+ if( p_sys->rtsp && p_sys->i_npt_length > 0 )
/* Not always true, but will be handled in SET_PAUSE_STATE */
*pb = true;
else
/* ReSync the stream */
p_sys->i_npt_start = 0;
p_sys->i_pcr = 0;
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+ p_sys->i_npt = 0.;
*pi_int = (int)( INPUT_RATE_DEFAULT / p_sys->ms->scale() + 0.5 );
return VLC_SUCCESS;
else if( !b_bool && p_sys->p_timeout != NULL )
p_sys->p_timeout->b_handle_keep_alive = false;
- es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
- p_sys->i_pcr = 0;
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1195257600)
- for( i = 0; i < p_sys->i_track; i++ )
+ for( i = 0; !b_bool && i < p_sys->i_track; i++ )
{
- if( !p_sys->track[i]->b_rtcp_sync )
- p_sys->track[i]->i_pts = 0; // (int64_t) ( p_sys->track[i]->sub->rtpInfo.timestamp * (double)1000000.0 );
- p_sys->track[i]->i_start_seq = p_sys->track[i]->sub->rtpInfo.seqNum;
- msg_Info( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq );
+ live_track_t *tk = p_sys->track[i];
+ tk->b_rtcp_sync = false;
+ tk->i_pts = 0;
+ p_sys->i_pcr = 0;
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
}
-#endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
+
/* Retrieve the starttime if possible */
- p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 );
-#else
- p_sys->i_npt_start = -1;
-#endif
- if( p_sys->i_npt_start < 0 )
- p_sys->i_npt_start = -1;
+ p_sys->i_npt = p_sys->i_npt_start = p_sys->ms->playStartTime();
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1199404800)
/* Retrieve the duration if possible */
- p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
-#else
- p_sys->i_npt_length = -1;
-#endif
- if( p_sys->i_npt_length < 0 )
- p_sys->i_npt_length = -1;
+ p_sys->i_npt_length = p_sys->ms->playEndTime();
- msg_Dbg( p_demux, "pause start: %lld stop:%lld", p_sys->i_npt_start, p_sys->i_npt_length );
+ msg_Dbg( p_demux, "pause start: %f stop:%f", p_sys->i_npt_start, p_sys->i_npt_length );
return VLC_SUCCESS;
}
case DEMUX_GET_TITLE_INFO:
live_track_t *tk = p_sys->track[i];
if( tk->b_muxed ) stream_DemuxDelete( tk->p_out_muxed );
+ if( tk->p_es ) es_out_Del( p_demux->out, tk->p_es );
es_format_Clean( &tk->fmt );
free( tk->p_buffer );
free( tk );
p_sys->i_track = 0;
/* Reopen rtsp client */
- if( ( p_demux->s != NULL ) &&
- ( i_return = Connect( p_demux ) ) != VLC_SUCCESS )
+ if( ( i_return = Connect( p_demux ) ) != VLC_SUCCESS )
{
msg_Err( p_demux, "Failed to connect with rtsp://%s",
p_sys->psz_path );
//msg_Dbg( p_demux, "pts: %d", pts.tv_sec );
- int64_t i_pts = (uint64_t)pts.tv_sec * UINT64_C(1000000) +
- (uint64_t)pts.tv_usec;
+ int64_t i_pts = (int64_t)pts.tv_sec * INT64_C(1000000) +
+ (int64_t)pts.tv_usec;
/* XXX Beurk beurk beurk Avoid having negative value XXX */
- i_pts &= UINT64_C(0x00ffffffffffffff);
+ i_pts &= INT64_C(0x00ffffffffffffff);
+
+ /* Retrieve NPT for this pts */
+ tk->i_npt = tk->sub->getNormalPlayTime(pts);
if( tk->b_quicktime && tk->p_es == NULL )
{
}
else if( tk->fmt.i_codec == VLC_FOURCC('H','2','6','1') )
{
-#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1081468800
H261VideoRTPSource *h261Source = (H261VideoRTPSource*)tk->sub->rtpSource();
uint32_t header = h261Source->lastSpecialHeader();
-#else
- uint32_t header = 0;
- msg_Warn( p_demux, "need livemedia library >= \"2004.04.09\"" );
-#endif
p_block = block_New( p_demux, i_size + 4 );
memcpy( p_block->p_buffer, &header, 4 );
memcpy( p_block->p_buffer + 4, tk->p_buffer, i_size );
{
p_block->i_pts = i_pts;
}
+
+ /* Update our global npt value */
+ if( tk->i_npt > 0 && tk->i_npt > p_sys->i_npt && tk->i_npt < p_sys->i_npt_length)
+ p_sys->i_npt = tk->i_npt;
+
if( !tk->b_muxed )
{
/*FIXME: for h264 you should check that packetization-mode=1 in sdp-file */
/*****************************************************************************
*
*****************************************************************************/
-static void TimeoutPrevention( timeout_thread_t *p_timeout )
+static void* TimeoutPrevention( void *p_data )
{
- p_timeout->b_die = false;
- p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2;
- p_timeout->i_remain *= 1000000;
-
- vlc_thread_ready( p_timeout );
+ timeout_thread_t *p_timeout = (timeout_thread_t *)p_data;
- /* Avoid lock */
- while( vlc_object_alive (p_timeout) )
+ for( ;; )
{
- if( p_timeout->i_remain <= 0 )
+ /* Voodoo (= no) thread safety here! *Ahem* */
+ if( p_timeout->b_handle_keep_alive )
{
char *psz_bye = NULL;
- p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2;
- p_timeout->i_remain *= 1000000;
- msg_Dbg( p_timeout, "reset the timeout timer" );
- if( p_timeout->b_handle_keep_alive == true )
- {
-#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1138089600
- p_timeout->p_sys->rtsp->getMediaSessionParameter( *p_timeout->p_sys->ms, NULL, psz_bye );
-#endif
- p_timeout->p_sys->b_timeout_call = false;
- }
- else
- {
- p_timeout->p_sys->b_timeout_call = true;
- }
+ int canc = vlc_savecancel ();
+
+ p_timeout->p_sys->rtsp->getMediaSessionParameter( *p_timeout->p_sys->ms, NULL, psz_bye );
+ vlc_restorecancel (canc);
}
- p_timeout->i_remain -= 200000;
- msleep( 200000 ); /* 200 ms */
+ p_timeout->p_sys->b_timeout_call = !p_timeout->b_handle_keep_alive;
+
+ msleep (((int64_t)p_timeout->p_sys->i_timeout - 2) * CLOCK_FREQ);
}
+ assert(0); /* dead code */
}
/*****************************************************************************
projects / vlc / blobdiff