add_shortcut( "livedotcom" )
set_capability( "access_demux", 0 )
set_callbacks( Open, Close )
- add_bool( "rtsp-tcp", 0, NULL,
+ add_bool( "rtsp-tcp", false, NULL,
N_("Use RTP over RTSP (TCP)"),
N_("Use RTP over RTSP (TCP)"), true )
change_safe()
N_("Force multicast RTP via RTSP"),
N_("Force multicast RTP via RTSP"), true )
change_safe()
- add_bool( "rtsp-http", 0, NULL,
+ add_bool( "rtsp-http", false, NULL,
N_("Tunnel RTSP and RTP over HTTP"),
N_("Tunnel RTSP and RTP over HTTP"), true )
change_safe()
bool b_get_param; /* Does the server support GET_PARAMETER */
bool b_paused; /* Are we paused? */
+ bool b_error;
+
+ float f_seek_request;/* In case we receive a seek request while paused*/
};
static int Demux ( demux_t * );
p_sys->b_force_mcast = var_CreateGetBool( p_demux, "rtsp-mcast" );
p_sys->b_get_param = false;
p_sys->b_paused = false;
+ p_sys->f_seek_request = -1;
+ p_sys->b_error = false;
/* parse URL for rtsp://[user:[passwd]@]serverip:port/options */
vlc_UrlParse( &p_sys->url, p_sys->psz_path, 0 );
int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp],
i_sdp_max - i_sdp - 1 );
- if( !vlc_object_alive (p_demux) || p_demux->b_error )
+ if( !vlc_object_alive (p_demux) )
{
free( p_sdp );
goto error;
}
i_sdp_max += 1000;
- p_sdp = (uint8_t*)realloc( p_sdp, i_sdp_max );
+ p_sdp = (uint8_t*)xrealloc( p_sdp, i_sdp_max );
}
p_sys->p_sdp = (char*)p_sdp;
}
{
demux_sys_t *p_sys = p_demux->p_sys;
Authenticator authenticator;
- bool b_firstpass = true;
char *psz_user = NULL;
char *psz_pwd = NULL;
char *psz_url = NULL;
}
createnew:
- if( !vlc_object_alive (p_demux) || p_demux->b_error )
+ if( !vlc_object_alive (p_demux) )
{
i_ret = VLC_EGENERIC;
goto bailout;
}
msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error );
- if( b_firstpass )
- { /* describeURL always returns an "RTSP/1.0 401 Unauthorized" the
- * first time. This is a workaround to avoid asking for a
- * user/passwd the first time the code passess here. */
- i_code = 0;
- b_firstpass = false;
- }
-
if( i_code == 401 )
{
msg_Dbg( p_demux, "authentication failed" );
Boolean bInit;
live_track_t *tk;
- if( !vlc_object_alive (p_demux) || p_demux->b_error )
+ if( !vlc_object_alive (p_demux) )
{
delete iter;
return VLC_EGENERIC;
i_buffer = 100000;
else if( !strcmp( sub->mediumName(), "video" ) )
i_buffer = 2000000;
+ else if( !strcmp( sub->mediumName(), "text" ) )
+ ;
else continue;
if( i_client_port != -1 )
tk->p_out_muxed = NULL;
tk->waiting = 0;
tk->b_rtcp_sync = false;
- tk->i_pts = 0;
+ tk->i_pts = VLC_TS_INVALID;
tk->i_npt = 0.;
tk->i_buffer = 65536;
tk->p_buffer = (uint8_t *)malloc( 65536 );
i_extra ) ) )
{
tk->fmt.i_extra = i_extra;
- tk->fmt.p_extra = malloc( i_extra );
+ tk->fmt.p_extra = xmalloc( i_extra );
memcpy( tk->fmt.p_extra, p_extra, i_extra );
delete[] p_extra;
}
i_extra ) ) )
{
tk->fmt.i_extra = i_extra;
- tk->fmt.p_extra = malloc( i_extra );
+ tk->fmt.p_extra = xmalloc( i_extra );
memcpy( tk->fmt.p_extra, p_extra, i_extra );
delete[] p_extra;
}
i_extra ) ) )
{
tk->fmt.i_extra = i_extra;
- tk->fmt.p_extra = malloc( i_extra );
+ tk->fmt.p_extra = xmalloc( i_extra );
memcpy( tk->fmt.p_extra, p_extra, i_extra );
delete[] p_extra;
i_extra ) ) )
{
tk->fmt.i_extra = i_extra;
- tk->fmt.p_extra = malloc( i_extra );
+ tk->fmt.p_extra = xmalloc( i_extra );
memcpy( tk->fmt.p_extra, p_extra, i_extra );
delete[] p_extra;
}
p_demux->out );
}
}
+ else if( !strcmp( sub->mediumName(), "text" ) )
+ {
+ es_format_Init( &tk->fmt, SPU_ES, VLC_FOURCC('u','n','d','f') );
+
+ if( !strcmp( sub->codecName(), "T140" ) )
+ {
+ tk->fmt.i_codec = VLC_CODEC_ITU_T140;
+ }
+ }
if( !tk->b_quicktime && !tk->b_muxed && !tk->b_asf )
{
if( tk->p_es || tk->b_quicktime || tk->b_muxed || tk->b_asf )
{
/* Append */
- p_sys->track = (live_track_t**)realloc( p_sys->track, sizeof( live_track_t ) * ( p_sys->i_track + 1 ) );
+ p_sys->track = (live_track_t**)xrealloc( p_sys->track,
+ sizeof( live_track_t ) * ( p_sys->i_track + 1 ) );
p_sys->track[p_sys->i_track++] = tk;
}
else
if( p_sys->i_pcr > 0 )
{
if( b_send_pcr )
- es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr );
+ es_out_Control( p_demux->out, ES_OUT_SET_PCR, 1 + p_sys->i_pcr );
}
/* First warn we want to read data */
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
tk->b_rtcp_sync = true;
/* reset PCR */
- tk->i_pts = 0;
+ tk->i_pts = VLC_TS_INVALID;
tk->i_npt = 0.;
p_sys->i_pcr = 0;
p_sys->i_npt = 0.;
msg_Warn( p_demux, "no data received in 10s, eof ?" );
return 0;
}
- return p_demux->b_error ? 0 : 1;
+ return p_sys->b_error ? 0 : 1;
}
/*****************************************************************************
demux_sys_t *p_sys = p_demux->p_sys;
int64_t *pi64, i64;
double *pf, f;
- bool *pb, *pb2, b_bool;
+ bool *pb, *pb2;
int *pi_int;
switch( i_query )
time = f * (double)p_sys->i_npt_length; /* in second */
}
- if( !p_sys->rtsp->pauseMediaSession( *p_sys->ms ) ||
- !p_sys->rtsp->playMediaSession( *p_sys->ms, time, -1, 1 ) )
+ if( p_sys->b_paused )
+ {
+ p_sys->f_seek_request = time;
+ return VLC_SUCCESS;
+ }
+
+ if( !p_sys->rtsp->pauseMediaSession( *p_sys->ms ) )
+ {
+ msg_Err( p_demux, "PAUSE before seek failed %s",
+ p_sys->env->getResultMsg() );
+ return VLC_EGENERIC;
+ }
+ if( !p_sys->rtsp->playMediaSession( *p_sys->ms, time, -1, 1 ) )
{
- msg_Err( p_demux, "PLAY failed %s",
+ msg_Err( p_demux, "seek PLAY failed %s",
p_sys->env->getResultMsg() );
return VLC_EGENERIC;
}
for( i = 0; i < p_sys->i_track; i++ )
{
p_sys->track[i]->b_rtcp_sync = false;
- p_sys->track[i]->i_pts = 0;
+ p_sys->track[i]->i_pts = VLC_TS_INVALID;
}
/* Retrieve the starttime if possible */
case DEMUX_SET_PAUSE_STATE:
{
- int i;
-
- p_sys->b_paused = (bool)va_arg( args, int );
+ bool b_pause = (bool)va_arg( args, int );
if( p_sys->rtsp == NULL )
return VLC_EGENERIC;
- /* FIXME */
- if( ( p_sys->b_paused && !p_sys->rtsp->pauseMediaSession( *p_sys->ms ) ) ||
- ( !p_sys->b_paused && !p_sys->rtsp->playMediaSession( *p_sys->ms,
- -1 ) ) )
+ if( b_pause == p_sys->b_paused )
+ return VLC_SUCCESS;
+ if( ( b_pause && !p_sys->rtsp->pauseMediaSession( *p_sys->ms ) ) ||
+ ( !b_pause && !p_sys->rtsp->playMediaSession( *p_sys->ms,
+ p_sys->f_seek_request, -1.0f, p_sys->ms->scale() ) ) )
{
msg_Err( p_demux, "PLAY or PAUSE failed %s", p_sys->env->getResultMsg() );
return VLC_EGENERIC;
}
+ p_sys->f_seek_request = -1;
+ p_sys->b_paused = b_pause;
/* When we Pause, we'll need the TimeoutPrevention thread to
* handle sending the "Keep Alive" message to the server.
else if( !p_sys->b_paused && p_sys->p_timeout != NULL )
p_sys->p_timeout->b_handle_keep_alive = false;
- for( i = 0; !b_bool && i < p_sys->i_track; i++ )
+ if( !p_sys->b_paused )
{
- 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 );
+ for( int i = 0; i < p_sys->i_track; i++ )
+ {
+ live_track_t *tk = p_sys->track[i];
+ tk->b_rtcp_sync = false;
+ tk->i_pts = VLC_TS_INVALID;
+ p_sys->i_pcr = 0;
+ es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
+ }
}
/* Reset data received counter */
atomLength <= INT_MAX )
{
tk->fmt.i_extra = atomLength-8;
- tk->fmt.p_extra = malloc( tk->fmt.i_extra );
+ tk->fmt.p_extra = xmalloc( tk->fmt.i_extra );
memcpy(tk->fmt.p_extra, pos+8, atomLength-8);
break;
}
else
{
tk->fmt.i_extra = qtState.sdAtomSize - 16;
- tk->fmt.p_extra = malloc( tk->fmt.i_extra );
+ tk->fmt.p_extra = xmalloc( tk->fmt.i_extra );
memcpy( tk->fmt.p_extra, &sdAtom[12], tk->fmt.i_extra );
}
}
if( (i_pts != tk->i_pts) && (!tk->b_muxed) )
{
- p_block->i_pts = i_pts;
+ p_block->i_pts = VLC_TS_0 + i_pts;
}
/* Update our global npt value */
if( !tk->b_muxed )
{
/*FIXME: for h264 you should check that packetization-mode=1 in sdp-file */
- p_block->i_dts = ( tk->fmt.i_codec == VLC_CODEC_MPGV ) ? 0 : i_pts;
+ p_block->i_dts = ( tk->fmt.i_codec == VLC_CODEC_MPGV ) ? VLC_TS_INVALID : (VLC_TS_0 + i_pts);
}
if( tk->b_muxed )
msg_Dbg( p_demux, "StreamClose" );
p_sys->event = 0xff;
- p_demux->b_error = true;
+ p_sys->b_error = true;
}
projects / vlc / blobdiff