*****************************************************************************/
#include <vlc/vlc.h>
-#include <stdlib.h> /* malloc(), free() */
-#include <string.h>
#include <vlc_demux.h>
#include <vlc_interface.h>
#include <vlc_network.h>
+#include <vlc_url.h>
#include <iostream>
# include <winsock2.h>
#endif
+#include "UsageEnvironment.hh"
#include "BasicUsageEnvironment.hh"
#include "GroupsockHelper.hh"
#include "liveMedia.hh"
{
char *p_sdp; /* XXX mallocated */
char *psz_path; /* URL-encoded path */
+ vlc_url_t url;
MediaSession *ms;
TaskScheduler *scheduler;
{
/* See if it looks like a SDP
v, o, s fields are mandatory and in this order */
- uint8_t *p_peek;
+ const uint8_t *p_peek;
if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 ) return VLC_EGENERIC;
- if( memcmp( (char*)p_peek, "v=0\r\n", 5 ) &&
- memcmp( (char*)p_peek, "v=0\n", 4 ) &&
+ if( memcmp( p_peek, "v=0\r\n", 5 ) &&
+ memcmp( p_peek, "v=0\n", 4 ) &&
( p_peek[0] < 'a' || p_peek[0] > 'z' || p_peek[1] != '=' ) )
{
return VLC_EGENERIC;
p_sys->b_real = VLC_FALSE;
p_sys->psz_path = strdup( p_demux->psz_path );
+ /* parse URL for rtsp://[user:[passwd]@]serverip:port/options */
+ vlc_UrlParse( &p_sys->url, p_sys->psz_path, 0 );
+
if( ( p_sys->scheduler = BasicTaskScheduler::createNew() ) == NULL )
{
msg_Err( p_demux, "BasicTaskScheduler::createNew failed" );
}
p_sys->p_sdp = (char*)p_sdp;
}
- else if( p_demux->s == NULL && !strcasecmp( p_demux->psz_access, "sdp" ) )
+ else if( ( p_demux->s == NULL ) &&
+ !strcasecmp( p_demux->psz_access, "sdp" ) )
{
/* sdp:// link from SAP */
p_sys->p_sdp = strdup( p_sys->psz_path );
if( p_sys->env ) p_sys->env->reclaim();
if( p_sys->p_timeout )
{
- p_sys->p_timeout->b_die = VLC_TRUE;
+ vlc_object_kill( p_sys->p_timeout );
vlc_thread_join( p_sys->p_timeout );
vlc_object_detach( p_sys->p_timeout );
vlc_object_destroy( p_sys->p_timeout );
if( p_sys->p_sdp ) free( p_sys->p_sdp );
if( p_sys->psz_path ) free( p_sys->psz_path );
+ vlc_UrlClean( &p_sys->url );
+
free( p_sys );
return VLC_EGENERIC;
}
if( p_sys->env ) p_sys->env->reclaim();
if( p_sys->p_timeout )
{
- p_sys->p_timeout->b_die = VLC_TRUE;
+ vlc_object_kill( p_sys->p_timeout );
vlc_thread_join( p_sys->p_timeout );
vlc_object_detach( p_sys->p_timeout );
vlc_object_destroy( p_sys->p_timeout );
if( p_sys->p_sdp ) free( p_sys->p_sdp );
if( p_sys->psz_path ) free( p_sys->psz_path );
+ vlc_UrlClean( &p_sys->url );
+
free( p_sys );
}
if( var_CreateGetBool( p_demux, "rtsp-http" ) )
i_http_port = var_CreateGetInteger( p_demux, "rtsp-http-port" );
- if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1 /*verbose*/,
+ if( ( p_sys->rtsp = RTSPClient::createNew( *p_sys->env,
+ p_demux->p_libvlc->i_verbose > 1,
"VLC media player", i_http_port ) ) == NULL )
{
msg_Err( p_demux, "RTSPClient::createNew failed (%s)",
p_sys->env->getResultMsg() );
return VLC_EGENERIC;
}
+
psz_url = (char*)malloc( strlen( p_sys->psz_path ) + 8 );
- sprintf( psz_url, "rtsp://%s", p_sys->psz_path );
+ if( !psz_url ) return VLC_ENOMEM;
- psz_options = p_sys->rtsp->sendOptionsCmd( psz_url );
- if( psz_options ) delete [] psz_options;
+ if( p_sys->url.psz_username || p_sys->url.psz_password )
+ {
+ sprintf( psz_url, "rtsp://%s%s", p_sys->url.psz_host,
+ p_sys->url.psz_path );
- psz_user = var_CreateGetString( p_demux, "rtsp-user" );
- psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" );
+ psz_user = strdup( p_sys->url.psz_username );
+ psz_pwd = strdup( p_sys->url.psz_password );
+ }
+ else
+ {
+ sprintf( psz_url, "rtsp://%s", p_sys->psz_path );
+
+ psz_user = var_CreateGetString( p_demux, "rtsp-user" );
+ 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 );
+
+ psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
+ &authenticator );
+ if( psz_options ) delete [] psz_options;
+
p_sdp = p_sys->rtsp->describeURL( psz_url,
&authenticator, var_CreateGetBool( p_demux, "rtsp-kasenna" ) );
const char *psz_error = p_sys->env->getResultMsg();
msg_Dbg( p_demux, "DESCRIBE failed with %d: %s", i_code, psz_error );
- sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code );
+ if( var_CreateGetBool( p_demux, "rtsp-http" ) )
+ sscanf( psz_error, "%*s %*s HTTP GET %*s HTTP/%*u.%*u %3u %*s", &i_code );
+ else sscanf( psz_error, "%*sRTSP/%*s%3u", &i_code );
if( i_code == 401 )
{
{
msg_Dbg( p_demux, "retrying with user=%s, pwd=%s",
psz_login, psz_password );
+ if( psz_url ) free( psz_url );
if( psz_login ) psz_user = psz_login;
if( psz_password ) psz_pwd = psz_password;
goto describe;
if( psz_login ) free( psz_login );
if( psz_password ) free( psz_password );
}
- else if( !var_CreateGetBool( p_demux, "rtsp-http" ) )
+ else if( !var_GetBool( p_demux, "rtsp-http" ) )
{
/* Perhaps a firewall is being annoying. Try HTTP tunneling mode */
vlc_value_t val;
/* malloc-ated copy */
if( p_sys->p_sdp ) free( p_sys->p_sdp );
+ p_sys->p_sdp = NULL;
if( p_sdp ) p_sys->p_sdp = strdup( (char*)p_sdp );
delete[] p_sdp;
}
/*****************************************************************************
- * Connect: prepares the subsessions and does the SETUP
+ * SessionsSetup: prepares the subsessions and does the SETUP
*****************************************************************************/
static int SessionsSetup( demux_t *p_demux )
{
unsigned int i_buffer = 0;
unsigned const thresh = 200000; /* RTP reorder threshold .2 second (default .1) */
- b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" );
+ b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" ) ||
+ var_GetBool( p_demux, "rtsp-http" );
i_client_port = var_CreateGetInteger( p_demux, "rtp-client-port" );
/* Create the session from the SDP */
if( !( p_sys->rtsp->setupMediaSubsession( *sub, False,
b_rtsp_tcp ? True : False ) ) )
{
- msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(),
- sub->codecName(), p_sys->env->getResultMsg() );
- continue;
+ /* 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 ) ) )
+ {
+ msg_Err( p_demux, "SETUP of'%s/%s' failed %s", sub->mediumName(),
+ sub->codecName(), p_sys->env->getResultMsg() );
+ continue;
+ }
}
}
}
else if( !strncmp( sub->codecName(), "G726", 4 ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 'g', '7', '2', '6' );
+ tk->fmt.i_codec = VLC_FOURCC( 'g', '7', '2', '6' );
tk->fmt.audio.i_rate = 8000;
tk->fmt.audio.i_channels = 1;
if( !strcmp( sub->codecName()+5, "40" ) )
{
tk->b_quicktime = VLC_TRUE;
}
+ else if( !strcmp( sub->codecName(), "SPEEX" ) )
+ {
+ tk->fmt.i_codec = VLC_FOURCC( 's', 'p', 'x', 'r' );
+ if ( sub->rtpTimestampFrequency() )
+ tk->fmt.audio.i_rate = sub->rtpTimestampFrequency();
+ else
+ {
+ msg_Warn( p_demux,"Using 8kHz as default sample rate." );
+ tk->fmt.audio.i_rate = 8000;
+ }
+ }
}
else if( !strcmp( sub->mediumName(), "video" ) )
{
delete iter;
if( p_sys->i_track <= 0 ) i_return = VLC_EGENERIC;
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* 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;
+ p_sys->i_npt_start = (int64_t) -1;
#endif
if( p_sys->i_npt_start < 0 )
p_sys->i_npt_start = -1;
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* Retrieve the duration if possible */
p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
#else
/* Retrieve the timeout value and set up a timeout prevention thread */
p_sys->i_timeout = p_sys->rtsp->sessionTimeoutParameter();
- if( p_sys->i_timeout > 0 && !p_sys->p_timeout )
+ if( p_sys->i_timeout <= 0 )
+ p_sys->i_timeout = 60; /* default value from RFC2326 */
+ if( !p_sys->p_timeout )
{
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->i_pcr = 0;
-#if 0
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1195257600)
/* TODO */
for( i = 0; i < p_sys->i_track; i++ )
{
- //p_sys->track[i]->i_pts = 0;
+ 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_Dbg( p_demux, "set startseq: %u", p_sys->track[i]->i_start_seq );
+ msg_Info( p_demux, "set startseq: %u", p_sys->track[i]->i_start_seq );
}
#endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* 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;
+ p_sys->i_npt_start = -1;
#endif
if( p_sys->i_npt_start < 0 )
{
else
p_sys->i_npt = p_sys->i_npt_start;
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* Retrieve the duration if possible */
p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
#else
/* 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->rtsp->setMediaSessionParameter( *p_sys->ms, "vlc" , "1" );
p_sys->b_timeout_call = VLC_FALSE;
}
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
tk->b_rtcp_sync = VLC_TRUE;
-#if 0
/* reset PCR */
tk->i_pts = 0;
p_sys->i_pcr = 0;
i_pcr = 0;
-#endif
}
}
- if( p_sys->b_multicast && p_sys->b_no_data && p_sys->i_no_data_ti > 120 )
+ if( p_sys->b_multicast && p_sys->b_no_data &&
+ ( p_sys->i_no_data_ti > 120 ) )
{
/* FIXME Make this configurable
msg_Err( p_demux, "no multicast data received in 36s, aborting" );
return 0;
*/
}
- else if( !p_sys->b_multicast && p_sys->b_no_data && p_sys->i_no_data_ti > 34 )
+ else if( !p_sys->b_multicast && p_sys->b_no_data &&
+ ( p_sys->i_no_data_ti > 34 ) )
{
- vlc_bool_t b_rtsp_tcp = var_GetBool( p_demux, "rtsp-tcp" );
+ vlc_bool_t b_rtsp_tcp = var_GetBool( p_demux, "rtsp-tcp" ) ||
+ var_GetBool( p_demux, "rtsp-http" );
if( !b_rtsp_tcp && p_sys->rtsp && p_sys->ms )
{
}
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
p_sys->i_pcr = 0;
-#if 0
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1195257600)
/* Retrieve RTP-Info values */
for( i = 0; i < p_sys->i_track; i++ )
{
- //p_sys->track[i]->i_pts = 0;
+ 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_Dbg( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq );
+ msg_Info( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq );
}
#endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* 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;
+ p_sys->i_npt_start = -1;
#endif
if( p_sys->i_npt_start < 0 )
{
else
p_sys->i_npt = p_sys->i_npt_start;
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* Retrieve the duration if possible */
p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
#else
- p_sys->i_npt_lenght = (int64_t) -1;
+ p_sys->i_npt_length = -1;
#endif
if( p_sys->i_npt_length < 0 )
p_sys->i_npt_length = -1;
}
es_out_Control( p_demux->out, ES_OUT_RESET_PCR );
p_sys->i_pcr = 0;
-#if 0
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1195257600)
for( i = 0; i < p_sys->i_track; i++ )
{
- //p_sys->track[i]->i_pts = 0;
+ 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_Dbg( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq );
+ msg_Info( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq );
}
#endif
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* 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;
+ p_sys->i_npt_start = -1;
#endif
if( p_sys->i_npt_start < 0 )
{
else
p_sys->i_npt = p_sys->i_npt_start;
-#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 1171929600)
+#if (LIVEMEDIA_LIBRARY_VERSION_INT >= 9999999999)
/* Retrieve the duration if possible */
p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 );
#else
- p_sys->i_npt_lenght = (int64_t) -1;
+ p_sys->i_npt_length = -1;
#endif
if( p_sys->i_npt_length < 0 )
p_sys->i_npt_length = -1;
p_sys->i_track = 0;
/* Reopen rtsp client */
- if( p_demux->s != NULL && ( i_return = Connect( p_demux ) ) != VLC_SUCCESS )
+ if( ( p_demux->s != NULL ) &&
+ ( i_return = Connect( p_demux ) ) != VLC_SUCCESS )
{
- 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;
}
demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_block;
- msg_Dbg( p_demux, "pts: %d", pts.tv_sec );
+ //msg_Dbg( p_demux, "pts: %d", pts.tv_sec );
int64_t i_pts = (uint64_t)pts.tv_sec * UI64C(1000000) +
(uint64_t)pts.tv_usec;
{
p_sys->i_npt += __MAX( 0, i_pts - p_sys->i_pcr );
p_sys->i_pcr = i_pts;
- msg_Dbg( p_demux, "npt update" );
+ //msg_Dbg( p_demux, "npt update" );
}
- else if( (tk->fmt.i_cat == VIDEO_ES) && (p_sys->i_pcr < i_pts) )
+ else if( /*tk->fmt.i_cat == VIDEO_ES &&*/ p_sys->i_pcr < i_pts )
{
p_sys->i_pcr = i_pts;
}
- msg_Dbg( p_demux, "npt %lld", p_sys->i_npt );
+ //msg_Dbg( p_demux, "npt %lld", p_sys->i_npt );
if( (i_pts != tk->i_pts) && (!tk->b_muxed) )
{
}
/*****************************************************************************
- *
+ *
*****************************************************************************/
static void TimeoutPrevention( timeout_thread_t *p_timeout )
{
projects / vlc / blobdiff