Commit 10ff158f authored by Jean-Paul Saman's avatar Jean-Paul Saman

Remove unused label

parent 337d1056
...@@ -224,7 +224,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -224,7 +224,7 @@ static int Open ( vlc_object_t *p_this )
{ {
demux_t *p_demux = (demux_t*)p_this; demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = NULL; demux_sys_t *p_sys = NULL;
MediaSubsessionIterator *iter = NULL; MediaSubsessionIterator *iter = NULL;
MediaSubsession *sub = NULL; MediaSubsession *sub = NULL;
int i_return; int i_return;
...@@ -299,7 +299,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -299,7 +299,7 @@ static int Open ( vlc_object_t *p_this )
int i_sdp = 0; int i_sdp = 0;
int i_sdp_max = 1000; int i_sdp_max = 1000;
uint8_t *p_sdp = (uint8_t*) malloc( i_sdp_max ); uint8_t *p_sdp = (uint8_t*) malloc( i_sdp_max );
for( ;; ) for( ;; )
{ {
int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp], int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp],
...@@ -335,7 +335,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -335,7 +335,7 @@ static int Open ( vlc_object_t *p_this )
msg_Err( p_demux, "Failed to connect with rtsp://%s", p_sys->psz_path ); msg_Err( p_demux, "Failed to connect with rtsp://%s", p_sys->psz_path );
goto error; goto error;
} }
if( p_sys->p_sdp == NULL ) if( p_sys->p_sdp == NULL )
{ {
msg_Err( p_demux, "Failed to retrieve the RTSP Session Description" ); msg_Err( p_demux, "Failed to retrieve the RTSP Session Description" );
...@@ -349,7 +349,7 @@ static int Open ( vlc_object_t *p_this ) ...@@ -349,7 +349,7 @@ static int Open ( vlc_object_t *p_this )
p_sys->env->getResultMsg() ); p_sys->env->getResultMsg() );
goto error; goto error;
} }
if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS ) if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS )
{ {
msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path ); msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path );
...@@ -726,23 +726,22 @@ createnew: ...@@ -726,23 +726,22 @@ createnew:
psz_user = var_CreateGetString( p_demux, "rtsp-user" ); psz_user = var_CreateGetString( p_demux, "rtsp-user" );
psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" ); psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" );
describe:
authenticator.setUsernameAndPassword( (const char*)psz_user, (const char*)psz_pwd ); authenticator.setUsernameAndPassword( (const char*)psz_user, (const char*)psz_pwd );
p_sdp = p_sys->rtsp->describeURL( psz_url, p_sdp = p_sys->rtsp->describeURL( psz_url,
&authenticator, var_CreateGetBool( p_demux, "rtsp-kasenna" ) ); &authenticator, var_CreateGetBool( p_demux, "rtsp-kasenna" ) );
if( psz_user ) free( psz_user ); if( psz_user ) free( psz_user );
if( psz_pwd ) free( psz_pwd ); if( psz_pwd ) free( psz_pwd );
if( p_sdp == NULL ) if( p_sdp == NULL )
{ {
/* failure occured */ /* failure occured */
int i_code = 0; int i_code = 0;
const char *psz_error = p_sys->env->getResultMsg(); const char *psz_error = p_sys->env->getResultMsg();
msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error ); msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error );
sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code ); sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code );
if( i_code == 401 ) if( i_code == 401 )
{ {
msg_Err( p_demux, "RTSP authentication failed" ); msg_Err( p_demux, "RTSP authentication failed" );
...@@ -819,7 +818,7 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -819,7 +818,7 @@ static int SessionsSetup( demux_t *p_demux )
bInit = sub->initiate( 4 ); /* Constant ? */ bInit = sub->initiate( 4 ); /* Constant ? */
else else
bInit = sub->initiate(); bInit = sub->initiate();
if( !bInit ) if( !bInit )
{ {
msg_Warn( p_demux, "RTP subsession '%s/%s' failed (%s)", msg_Warn( p_demux, "RTP subsession '%s/%s' failed (%s)",
...@@ -831,11 +830,11 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -831,11 +830,11 @@ static int SessionsSetup( demux_t *p_demux )
if( sub->rtpSource() != NULL ) if( sub->rtpSource() != NULL )
{ {
int fd = sub->rtpSource()->RTPgs()->socketNum(); int fd = sub->rtpSource()->RTPgs()->socketNum();
/* Increase the buffer size */ /* Increase the buffer size */
if( i_buffer > 0 ) if( i_buffer > 0 )
increaseReceiveBufferTo( *p_sys->env, fd, i_buffer ); increaseReceiveBufferTo( *p_sys->env, fd, i_buffer );
/* Increase the RTP reorder timebuffer just a bit */ /* Increase the RTP reorder timebuffer just a bit */
sub->rtpSource()->setPacketReorderingThresholdTime(thresh); sub->rtpSource()->setPacketReorderingThresholdTime(thresh);
} }
...@@ -873,7 +872,7 @@ static int SessionsSetup( demux_t *p_demux ) ...@@ -873,7 +872,7 @@ static int SessionsSetup( demux_t *p_demux )
static int Play( demux_t *p_demux ) static int Play( demux_t *p_demux )
{ {
demux_sys_t *p_sys = p_demux->p_sys; demux_sys_t *p_sys = p_demux->p_sys;
if( p_sys->rtsp ) if( p_sys->rtsp )
{ {
/* The PLAY */ /* The PLAY */
...@@ -1101,7 +1100,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) ...@@ -1101,7 +1100,6 @@ static int Control( demux_t *p_demux, int i_query, va_list args )
float time; float time;
f = (double)va_arg( args, double ); f = (double)va_arg( args, double );
if( p_sys->rtsp && p_sys->i_length > 0 ) if( p_sys->rtsp && p_sys->i_length > 0 )
{ {
time = f * (double)p_sys->i_length / 1000000.0; /* in second */ time = f * (double)p_sys->i_length / 1000000.0; /* in second */
...@@ -1196,7 +1194,7 @@ static int RollOverTcp( demux_t *p_demux ) ...@@ -1196,7 +1194,7 @@ static int RollOverTcp( demux_t *p_demux )
int i_return; int i_return;
var_SetBool( p_demux, "rtsp-tcp", VLC_TRUE ); var_SetBool( p_demux, "rtsp-tcp", VLC_TRUE );
/* We close the old RTSP session */ /* We close the old RTSP session */
p_sys->rtsp->teardownMediaSession( *p_sys->ms ); p_sys->rtsp->teardownMediaSession( *p_sys->ms );
...@@ -1212,7 +1210,7 @@ static int RollOverTcp( demux_t *p_demux ) ...@@ -1212,7 +1210,7 @@ static int RollOverTcp( demux_t *p_demux )
msg_Err( p_demux, "Failed to connect with rtsp://%s", p_sys->psz_path ); msg_Err( p_demux, "Failed to connect with rtsp://%s", p_sys->psz_path );
goto error; goto error;
} }
if( p_sys->p_sdp == NULL ) if( p_sys->p_sdp == NULL )
{ {
msg_Err( p_demux, "Failed to retrieve the RTSP Session Description" ); msg_Err( p_demux, "Failed to retrieve the RTSP Session Description" );
...@@ -1476,7 +1474,7 @@ static void TimeoutPrevention( timeout_thread_t *p_timeout ) ...@@ -1476,7 +1474,7 @@ static void TimeoutPrevention( timeout_thread_t *p_timeout )
p_timeout->i_remain *= 1000000; p_timeout->i_remain *= 1000000;
vlc_thread_ready( p_timeout ); vlc_thread_ready( p_timeout );
/* Avoid lock */ /* Avoid lock */
while( !p_timeout->b_die ) while( !p_timeout->b_die )
{ {
......
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