#include <vlc_input.h>
#include <vlc_demux.h>
#include <vlc_dialog.h>
-#include <vlc_network.h>
#include <vlc_url.h>
#include <vlc_strings.h>
# include <winsock2.h>
#endif
-#include "UsageEnvironment.hh"
-#include "BasicUsageEnvironment.hh"
-#include "GroupsockHelper.hh"
-#include "liveMedia.hh"
+#include <UsageEnvironment.hh>
+#include <BasicUsageEnvironment.hh>
+#include <GroupsockHelper.hh>
+#include <liveMedia.hh>
extern "C" {
#include "../access/mms/asf.h" /* Who said ugly ? */
KASENNA_LONGTEXT, true )
add_string( "rtsp-user", NULL, NULL, USER_TEXT,
USER_LONGTEXT, true )
- add_string( "rtsp-pwd", NULL, NULL, PASS_TEXT,
- PASS_LONGTEXT, true )
+ add_password( "rtsp-pwd", NULL, NULL, PASS_TEXT,
+ PASS_LONGTEXT, true )
vlc_module_end ()
bool b_muxed;
bool b_quicktime;
bool b_asf;
+ bool b_discard_trunc;
stream_t *p_out_muxed; /* for muxed stream */
uint8_t *p_buffer;
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = NULL;
- int i, i_return;
+ int i_return;
int i_error = VLC_EGENERIC;
if( p_demux->s )
return VLC_SUCCESS;
error:
- for( i = 0; i < p_sys->i_track; i++ )
- {
- live_track_t *tk = p_sys->track[i];
-
- if( tk->b_muxed ) stream_Delete( tk->p_out_muxed );
- es_format_Clean( &tk->fmt );
- free( tk->p_buffer );
- free( tk );
- }
-
- if( p_sys->i_track ) free( p_sys->track );
- if( p_sys->p_out_asf ) stream_Delete( p_sys->p_out_asf );
- if( p_sys->rtsp && p_sys->ms ) p_sys->rtsp->teardownMediaSession( *p_sys->ms );
- if( p_sys->p_timeout )
- {
- vlc_cancel( p_sys->p_timeout->handle );
- vlc_join( p_sys->p_timeout->handle, NULL );
- free( p_sys->p_timeout );
- }
- if( p_sys->ms ) Medium::close( p_sys->ms );
- if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
- if( p_sys->env ) p_sys->env->reclaim();
- delete p_sys->scheduler;
- free( p_sys->p_sdp );
- free( p_sys->psz_path );
-
- vlc_UrlClean( &p_sys->url );
-
- free( p_sys );
+ Close( p_this );
return i_error;
}
free( p_sys );
}
+static inline const char *strempty( const char *s ) { return s?s:""; }
+static inline Boolean toBool( bool b ) { return b?True:False; } // silly, no?
+
/*****************************************************************************
* Connect: connects to the RTSP server to setup the session DESCRIBE
*****************************************************************************/
int i_http_port = 0;
int i_ret = VLC_SUCCESS;
- if( p_sys->url.i_port == 0 ) p_sys->url.i_port = 554;
- if( p_sys->url.psz_username || p_sys->url.psz_password )
+ /* Create the url using the port number if available */
+ if( p_sys->url.i_port == 0 )
{
- int err;
- err = asprintf( &psz_url, "rtsp://%s:%d%s", p_sys->url.psz_host,
- p_sys->url.i_port, p_sys->url.psz_path );
- if( err == -1 ) return VLC_ENOMEM;
-
- psz_user = strdup( p_sys->url.psz_username );
- psz_pwd = strdup( p_sys->url.psz_password );
+ p_sys->url.i_port = 554;
+ if( asprintf( &psz_url, "rtsp://%s", p_sys->psz_path ) == -1 )
+ return VLC_ENOMEM;
}
else
{
- int err;
- err = asprintf( &psz_url, "rtsp://%s", p_sys->psz_path );
- if( err == -1 ) return VLC_ENOMEM;
+ if( asprintf( &psz_url, "rtsp://%s:%d%s", p_sys->url.psz_host,
+ p_sys->url.i_port, p_sys->url.psz_path ) == -1 )
+ return VLC_ENOMEM;
+ }
+ /* Get the user name and password */
+ if( p_sys->url.psz_username || p_sys->url.psz_password )
+ {
+ psz_user = strdup( strempty( p_sys->url.psz_username ) );
+ psz_pwd = strdup( strempty( p_sys->url.psz_password ) );
+ }
+ else
+ {
psz_user = var_CreateGetString( p_demux, "rtsp-user" );
psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" );
}
createnew:
if( !vlc_object_alive (p_demux) || p_demux->b_error )
{
- free( psz_user );
- free( psz_pwd );
- free( psz_url );
- return VLC_EGENERIC;
+ i_ret = VLC_EGENERIC;
+ goto bailout;
}
if( var_CreateGetBool( p_demux, "rtsp-http" ) )
{
msg_Err( p_demux, "RTSPClient::createNew failed (%s)",
p_sys->env->getResultMsg() );
- free( psz_user );
- free( psz_pwd );
- free( psz_url );
- return VLC_EGENERIC;
+ i_ret = VLC_EGENERIC;
+ goto bailout;
}
/* Kasenna enables KeepAlive by analysing the User-Agent string.
}
describe:
- authenticator.setUsernameAndPassword( (const char*)psz_user,
- (const char*)psz_pwd );
+ authenticator.setUsernameAndPassword( psz_user, psz_pwd );
/* */
- const int i_timeout = var_CreateGetInteger(p_demux, "ipv4-timeout") / 1000;
-
+ { /* i_timeout hack scope */
#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1223337600
+ const int i_timeout = var_CreateGetInteger(p_demux, "ipv4-timeout") / 1000;
psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
&authenticator, i_timeout );
#else
#endif
}
if( psz_options )
- p_sys->b_get_param = strstr( psz_options, "GET_PARAMETER" ) ? true : false ;
+ p_sys->b_get_param = (bool)strstr( psz_options, "GET_PARAMETER" );
delete [] psz_options;
#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1223337600
- p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd,
- var_GetBool( p_demux, "rtsp-kasenna" ), i_timeout );
+ p_sdp = p_sys->rtsp->describeWithPassword( psz_url, psz_user, psz_pwd,
+ var_GetBool( p_demux, "rtsp-kasenna" ), i_timeout );
#else
- p_sdp = p_sys->rtsp->describeWithPassword( psz_url, (const char*)psz_user, (const char*)psz_pwd,
- var_GetBool( p_demux, "rtsp-kasenna" ) );
+ p_sdp = p_sys->rtsp->describeWithPassword( psz_url, psz_user, psz_pwd,
+ var_GetBool( p_demux, "rtsp-kasenna" ) );
#endif
+ } /* i_timeout scope end */
if( p_sdp == NULL )
{
free( psz_user );
free( psz_pwd );
dialog_Login( p_demux, &psz_user, &psz_pwd,
- _("RTSP authentication"),
+ _("RTSP authentication"), "%s",
_("Please enter a valid login name and a password.") );
if( psz_user != NULL && psz_pwd != NULL )
{
- msg_Dbg( p_demux, "retrying with user=%s, pwd=%s",
- psz_user, psz_pwd );
+ msg_Dbg( p_demux, "retrying with user=%s", psz_user );
goto describe;
}
}
else if( (i_code != 0) && !var_GetBool( p_demux, "rtsp-http" ) )
{
/* Perhaps a firewall is being annoying. Try HTTP tunneling mode */
- vlc_value_t val;
- val.b_bool = true;
msg_Dbg( p_demux, "we will now try HTTP tunneling mode" );
- var_Set( p_demux, "rtsp-http", val );
+ var_SetBool( p_demux, "rtsp-http", true );
if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
p_sys->rtsp = NULL;
goto createnew;
i_ret = VLC_EGENERIC;
}
- /* malloc-ated copy */
- free( psz_url );
- free( psz_user );
- free( psz_pwd );
-
free( p_sys->p_sdp );
p_sys->p_sdp = NULL;
if( p_sdp ) p_sys->p_sdp = strdup( (char*)p_sdp );
delete[] p_sdp;
+bailout:
+ /* malloc-ated copy */
+ free( psz_url );
+ free( psz_user );
+ free( psz_pwd );
+
return i_ret;
}
if( p_sys->rtsp )
{
if( !p_sys->rtsp->setupMediaSubsession( *sub, False,
- b_rtsp_tcp ? True : False,
- ( p_sys->b_force_mcast && !b_rtsp_tcp ) ? True : False ) )
+ toBool( b_rtsp_tcp ),
+ toBool( p_sys->b_force_mcast && !b_rtsp_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,
- b_rtsp_tcp ? False : True,
- False ) )
+ /* 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,
+ toBool( b_rtsp_tcp ), False ) )
{
- msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(),
- sub->codecName(), p_sys->env->getResultMsg() );
+ msg_Err( p_demux, "SETUP of'%s/%s' failed %s",
+ sub->mediumName(), sub->codecName(),
+ p_sys->env->getResultMsg() );
continue;
}
}
}
- /* Check if we will receive data from this subsession for this track */
+ /* Check if we will receive data from this subsession for
+ * this track */
if( sub->readSource() == NULL ) continue;
if( !p_sys->b_multicast )
{
- /* Check, because we need diff. rollover behaviour for multicast */
+ /* We need different rollover behaviour for multicast */
p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );
}
tk->b_quicktime = false;
tk->b_asf = false;
tk->b_muxed = false;
+ tk->b_discard_trunc = false;
tk->p_out_muxed = NULL;
tk->waiting = 0;
tk->b_rtcp_sync = false;
memcpy( tk->fmt.p_extra, p_extra, i_extra );
delete[] p_extra;
}
- /* Because the "faad" decoder does not handle the LATM data length field
- at the start of each returned LATM frame, tell the RTP source to omit it. */
+ /* Because the "faad" decoder does not handle the LATM
+ * data length field at the start of each returned LATM
+ * frame, tell the RTP source to omit it. */
((MPEG4LATMAudioRTPSource*)sub->rtpSource())->omitLATMDataLengthField();
}
else if( !strcmp( sub->codecName(), "MPEG4-GENERIC" ) )
else if( !strcmp( sub->codecName(), "DV" ) )
{
tk->b_muxed = true;
+ tk->b_discard_trunc = true;
tk->p_out_muxed = stream_DemuxNew( p_demux, "rawdv",
p_demux->out );
}
/* Retrieve the starttime if possible */
p_sys->i_npt_start = p_sys->ms->playStartTime();
- p_sys->i_npt_length = p_sys->ms->playEndTime();
+ if( p_sys->ms->playEndTime() > 0 )
+ p_sys->i_npt_length = p_sys->ms->playEndTime();
msg_Dbg( p_demux, "play start: %f stop:%f", p_sys->i_npt_start, p_sys->i_npt_length );
return VLC_SUCCESS;
p_sys->i_npt = p_sys->i_npt_start = p_sys->ms->playStartTime();
/* Retrieve the duration if possible */
- p_sys->i_npt_length = p_sys->ms->playEndTime();
+ if( p_sys->ms->playEndTime() > 0 )
+ p_sys->i_npt_length = p_sys->ms->playEndTime();
msg_Dbg( p_demux, "seek start: %f stop:%f", p_sys->i_npt_start, p_sys->i_npt_length );
return VLC_SUCCESS;
p_sys->i_npt_start = p_sys->ms->playStartTime();
/* Retrieve the duration if possible */
- p_sys->i_npt_length = p_sys->ms->playEndTime();
+ if( p_sys->ms->playEndTime() )
+ p_sys->i_npt_length = p_sys->ms->playEndTime();
msg_Dbg( p_demux, "pause start: %f stop:%f", p_sys->i_npt_start, p_sys->i_npt_length );
return VLC_SUCCESS;
/* grow buffer if it looks like buffer is too small, but don't eat
* up all the memory on strange streams */
- if( i_truncated_bytes > 0 && tk->i_buffer < 2000000 )
+ if( i_truncated_bytes > 0 )
{
- void *p_tmp;
- msg_Dbg( p_demux, "lost %d bytes", i_truncated_bytes );
- msg_Dbg( p_demux, "increasing buffer size to %d", tk->i_buffer * 2 );
- p_tmp = realloc( tk->p_buffer, tk->i_buffer * 2 );
- if( p_tmp == NULL )
+ if( tk->i_buffer < 2000000 )
{
- msg_Warn( p_demux, "realloc failed" );
+ void *p_tmp;
+ msg_Dbg( p_demux, "lost %d bytes", i_truncated_bytes );
+ msg_Dbg( p_demux, "increasing buffer size to %d", tk->i_buffer * 2 );
+ p_tmp = realloc( tk->p_buffer, tk->i_buffer * 2 );
+ if( p_tmp == NULL )
+ {
+ msg_Warn( p_demux, "realloc failed" );
+ }
+ else
+ {
+ tk->p_buffer = (uint8_t*)p_tmp;
+ tk->i_buffer *= 2;
+ }
}
- else
+
+ if( tk->b_discard_trunc )
{
- tk->p_buffer = (uint8_t*)p_tmp;
- tk->i_buffer *= 2;
+ p_sys->event = 0xff;
+ tk->waiting = 0;
+ return;
}
}
projects / vlc / blobdiff