/*****************************************************************************
- * live.cpp : live.com support.
+ * live555.cpp : LIVE555 Streaming Media support.
*****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2006 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <vlc/vlc.h>
#include <vlc/input.h>
+#include "network.h"
#include <iostream>
#define RECLAIM_ENV(env) (env)->reclaim()
#endif
-
using namespace std;
/*****************************************************************************
"value should be set in millisecond units." )
#define KASENNA_TEXT N_( "Kasenna RTSP dialect")
-#define KASENNA_LONGTEXT N_( "Kasenna server speaks an old and unstandard dialect of RTSP. " \
- "When you set this parameter, VLC will try this dialect for communication. In " \
- "this mode you cannot talk to normal RTSP servers." )
+#define KASENNA_LONGTEXT N_( "Kasenna servers use an old and unstandard " \
+ "dialect of RTSP. When you set this parameter, VLC will try this dialect "\
+ "for communication. In this mode you cannot connect to normal RTSP servers." )
+
+#define USER_TEXT N_("RTSP user name")
+#define USER_LONGTEXT N_("Allows you to modify the user name that will " \
+ "be used for authenticating the connection.")
+#define PASS_TEXT N_("RTSP password")
+#define PASS_LONGTEXT N_("Allows you to modify the password that will be " \
+ "used for the connection.")
vlc_module_begin();
- set_description( _("live.com (RTSP/RTP/SDP) demuxer" ) );
+ set_description( _("RTP/RTSP/SDP demuxer (using Live555)" ) );
set_capability( "demux2", 50 );
- set_shortname( "Live.com RTP/RTSP");
+ set_shortname( "RTP/RTSP");
set_callbacks( Open, Close );
add_shortcut( "live" );
+ add_shortcut( "livedotcom" );
set_category( CAT_INPUT );
set_subcategory( SUBCAT_INPUT_DEMUX );
add_bool( "rtsp-tcp", 0, NULL,
N_("Use RTP over RTSP (TCP)"),
N_("Use RTP over RTSP (TCP)"), VLC_TRUE );
+ add_integer( "rtp-client-port", -1, NULL,
+ N_("Client port"),
+ N_("Port to use for the RTP source of the session"), VLC_TRUE );
+#if LIVEMEDIA_LIBRARY_VERSION_INT > 1130457500
+ add_bool( "rtsp-http", 0, NULL,
+ N_("Tunnel RTSP and RTP over HTTP"),
+ N_("Tunnel RTSP and RTP over HTTP"), VLC_TRUE );
+ add_integer( "rtsp-http-port", 80, NULL,
+ N_("HTTP tunnel port"),
+ N_("Port to use for tunneling the RTSP/RTP over HTTP."),
+ VLC_TRUE );
+#endif
add_integer( "rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
- CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
+ CACHING_TEXT, CACHING_LONGTEXT, VLC_TRUE );
add_bool( "rtsp-kasenna", VLC_FALSE, NULL, KASENNA_TEXT,
KASENNA_LONGTEXT, VLC_TRUE );
+ add_string( "rtsp-user", NULL, NULL, USER_TEXT,
+ USER_LONGTEXT, VLC_TRUE );
+ add_string( "rtsp-pwd", NULL, NULL, PASS_TEXT,
+ PASS_LONGTEXT, VLC_TRUE );
vlc_module_end();
/* TODO:
/*****************************************************************************
* Local prototypes
*****************************************************************************/
+
typedef struct
{
demux_t *p_demux;
char waiting;
mtime_t i_pts;
+
} live_track_t;
+struct timeout_thread_t
+{
+ VLC_COMMON_MEMBERS
+
+ int64_t i_remain;
+ demux_sys_t *p_sys;
+};
+
struct demux_sys_t
{
char *p_sdp; /* XXX mallocated */
+ char *psz_path; /* URL-encoded path */
MediaSession *ms;
TaskScheduler *scheduler;
live_track_t **track; /* XXX mallocated */
mtime_t i_pcr;
mtime_t i_pcr_start;
+ mtime_t i_pcr_previous;
+ mtime_t i_pcr_repeatdate;
+ int i_pcr_repeats;
/* Asf */
asf_header_t asfh;
mtime_t i_length;
mtime_t i_start;
+ /* timeout thread information */
+ int i_timeout; /* session timeout value in seconds */
+ vlc_bool_t 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 */
+
+ /* */
+ vlc_bool_t b_multicast; /* true if one of the tracks is multicasted */
+ vlc_bool_t b_no_data; /* true if we never receive any data */
+ int i_no_data_ti; /* consecutive number of TaskInterrupt */
+
char event;
};
static int Control( demux_t *, int, va_list );
static int ParseASF( demux_t * );
+static int RollOverTcp( demux_t * );
+
+static void StreamRead( void *, unsigned int, unsigned int,
+ struct timeval, unsigned int );
+static void StreamClose( void * );
+static void TaskInterrupt( void * );
-static void StreamRead( void *p_private, unsigned int i_size, unsigned int i_truncated_bytes, struct timeval pts, unsigned int i_duration );
-static void StreamClose( void *p_private );
-static void TaskInterrupt( void *p_private );
+static void TimeoutPrevention( timeout_thread_t * );
+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1117756800
+static unsigned char* parseH264ConfigStr( char const* configStr,
+ unsigned int& configSize );
+#endif
/*****************************************************************************
* DemuxOpen:
static int Open ( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
- demux_sys_t *p_sys;
+ demux_sys_t *p_sys = NULL;
MediaSubsessionIterator *iter;
MediaSubsession *sub;
vlc_bool_t b_rtsp_tcp;
uint8_t *p_peek;
+ char *psz_user = NULL;
+ char *psz_pwd = NULL;
+
int i_sdp;
int i_sdp_max;
uint8_t *p_sdp;
{
/* See if it looks like a SDP
v, o, s fields are mandatory and in this order */
- if( stream_Peek( p_demux->s, &p_peek, 7 ) < 7 )
- {
- msg_Err( p_demux, "cannot peek" );
- return VLC_EGENERIC;
- }
- if( strncmp( (char*)p_peek, "v=0\r\n", 5 ) && strncmp( (char*)p_peek, "v=0\n", 4 ) &&
+ 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 ) &&
( p_peek[0] < 'a' || p_peek[0] > 'z' || p_peek[1] != '=' ) )
{
- msg_Warn( p_demux, "SDP module discarded" );
return VLC_EGENERIC;
}
}
p_demux->pf_demux = Demux;
p_demux->pf_control= Control;
p_demux->p_sys = p_sys = (demux_sys_t*)malloc( sizeof( demux_sys_t ) );
+ if( !p_sys ) return VLC_ENOMEM;
+
p_sys->p_sdp = NULL;
p_sys->scheduler = NULL;
p_sys->env = NULL;
p_sys->track = NULL;
p_sys->i_pcr = 0;
p_sys->i_pcr_start = 0;
+ p_sys->i_pcr_previous = 0;
+ p_sys->i_pcr_repeatdate = 0;
+ p_sys->i_pcr_repeats = 0;
p_sys->i_length = 0;
p_sys->i_start = 0;
p_sys->p_out_asf = NULL;
+ p_sys->b_no_data = VLC_TRUE;
+ p_sys->i_no_data_ti = 0;
+ p_sys->p_timeout = NULL;
+ p_sys->i_timeout = 0;
+ p_sys->b_timeout_call = VLC_FALSE;
+ p_sys->b_multicast = VLC_FALSE;
+ p_sys->psz_path = strdup(p_demux->psz_path);
if( ( p_sys->scheduler = BasicTaskScheduler::createNew() ) == NULL )
msg_Err( p_demux, "BasicTaskScheduler::createNew failed" );
goto error;
}
- if( ( p_sys->env = BasicUsageEnvironment::createNew(*p_sys->scheduler) ) == NULL )
+ if( !( p_sys->env = BasicUsageEnvironment::createNew(*p_sys->scheduler) ) )
{
msg_Err( p_demux, "BasicUsageEnvironment::createNew failed" );
goto error;
}
+ if( strcasecmp( p_demux->psz_access, "sdp" ) )
+ {
+ char *p = p_sys->psz_path;
+ while( (p = strchr( p, ' ' )) != NULL ) *p = '+';
+ }
+
if( p_demux->s == NULL && !strcasecmp( p_demux->psz_access, "rtsp" ) )
{
char *psz_url;
char *psz_options;
+#if LIVEMEDIA_LIBRARY_VERSION_INT > 1130457500
+ int i_http_port = 0;
- if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1/*verbose*/, "VLC Media Player" ) ) == NULL )
+ 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*/,
+ "VLC media player", i_http_port ) ) == NULL )
+#else
+ if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1/*verbose*/,
+ "VLC media player" ) ) == NULL )
+#endif
{
- msg_Err( p_demux, "RTSPClient::createNew failed (%s)", p_sys->env->getResultMsg() );
+ msg_Err( p_demux, "RTSPClient::createNew failed (%s)",
+ p_sys->env->getResultMsg() );
goto error;
}
- psz_url = (char*)malloc( strlen( p_demux->psz_path ) + 8 );
- sprintf( psz_url, "rtsp://%s", p_demux->psz_path );
+ psz_url = (char*)malloc( strlen( p_sys->psz_path ) + 8 );
+ sprintf( psz_url, "rtsp://%s", p_sys->psz_path );
psz_options = p_sys->rtsp->sendOptionsCmd( psz_url );
- if( psz_options )
- delete [] psz_options;
+ if( psz_options ) delete [] psz_options;
- p_sdp = (uint8_t*)p_sys->rtsp->describeURL( psz_url,
- NULL, var_CreateGetBool( p_demux, "rtsp-kasenna" ) );
+ psz_user = var_CreateGetString( p_demux, "rtsp-user" );
+ psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" );
+
+ if ((*psz_user) && (*psz_pwd))
+ p_sdp = (uint8_t*)p_sys->rtsp->describeWithPassword( psz_url,
+ psz_user, psz_pwd);
+ else
+ p_sdp = (uint8_t*)p_sys->rtsp->describeURL( psz_url,
+ NULL, var_CreateGetBool( p_demux, "rtsp-kasenna" ) );
if( p_sdp == NULL )
{
- msg_Err( p_demux, "describeURL failed (%s)", p_sys->env->getResultMsg() );
-
+ msg_Err( p_demux, "describeURL failed (%s)",
+ p_sys->env->getResultMsg() );
free( psz_url );
goto error;
}
free( psz_url );
+ free( psz_user );
+ free( psz_pwd );
/* malloc-ated copy */
p_sys->p_sdp = strdup( (char*)p_sdp );
delete[] p_sdp;
- fprintf( stderr, "sdp=%s\n", p_sys->p_sdp );
+ msg_Dbg( p_demux, "sdp=%s\n", p_sys->p_sdp );
}
else if( p_demux->s == NULL && !strcasecmp( p_demux->psz_access, "sdp" ) )
{
- p_sys->p_sdp = strdup( p_demux->psz_path );
+ p_sys->p_sdp = strdup( p_sys->psz_path );
}
else
{
p_sdp = (uint8_t*)malloc( i_sdp_max );
for( ;; )
{
- int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp], i_sdp_max - i_sdp - 1 );
+ int i_read = stream_Read( p_demux->s, &p_sdp[i_sdp],
+ i_sdp_max - i_sdp - 1 );
if( i_read < 0 )
{
msg_Dbg( p_demux, "sdp=%s\n", p_sys->p_sdp );
}
- if( ( p_sys->ms = MediaSession::createNew(*p_sys->env, p_sys->p_sdp ) ) == NULL )
+ if( !( p_sys->ms = MediaSession::createNew( *p_sys->env, p_sys->p_sdp ) ) )
{
msg_Err( p_demux, "MediaSession::createNew failed" );
goto error;
{
unsigned int i_buffer = 0;
Boolean bInit;
+ int i_client_port;
+
+ i_client_port = var_CreateGetInteger( p_demux, "rtp-client-port" );
+ if( i_client_port != -1 )
+ sub->setClientPortNum( i_client_port );
/* Value taken from mplayer */
if( !strcmp( sub->mediumName(), "audio" ) )
bInit = sub->initiate( 4 ); /* Constant ? */
else
bInit = sub->initiate();
+
+ if( strcasestr( sub->codecName(), "REAL" ) )
+ {
+ msg_Info( p_demux, "real codec detected, using real-RTSP instead" );
+ delete iter;
+ goto error;
+ }
if( !bInit )
{
- msg_Warn( p_demux, "RTP subsession '%s/%s' failed(%s)", sub->mediumName(), sub->codecName(), p_sys->env->getResultMsg() );
+ msg_Warn( p_demux, "RTP subsession '%s/%s' failed (%s)",
+ sub->mediumName(), sub->codecName(),
+ p_sys->env->getResultMsg() );
}
else
{
increaseReceiveBufferTo( *p_sys->env, fd, i_buffer );
}
- msg_Dbg( p_demux, "RTP subsession '%s/%s'", sub->mediumName(), sub->codecName() );
+ msg_Dbg( p_demux, "RTP subsession '%s/%s'", sub->mediumName(),
+ sub->codecName() );
/* Issue the SETUP */
if( p_sys->rtsp )
{
- p_sys->rtsp->setupMediaSubsession( *sub, False, b_rtsp_tcp ? True : False );
+ p_sys->rtsp->setupMediaSubsession( *sub, False,
+ b_rtsp_tcp ? True : False );
+ }
+ if( !p_sys->b_multicast )
+ {
+ /* Check, because we need diff. rollover behaviour for multicast */
+ p_sys->b_multicast = IsMulticastAddress( sub->connectionEndpointAddress() );
}
}
}
if( !p_sys->rtsp->playMediaSession( *p_sys->ms ) )
{
msg_Err( p_demux, "PLAY failed %s", p_sys->env->getResultMsg() );
+ delete iter;
goto error;
}
+
+ /* Retrieve the timeout value and set up a timeout prevention thread */
+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1138089600
+ p_sys->i_timeout = p_sys->rtsp->sessionTimeoutParameter();
+#endif
+ if( p_sys->i_timeout > 0 )
+ {
+ 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->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, VLC_TRUE ) )
+ {
+ msg_Err( p_demux, "cannot spawn liveMedia timeout thread" );
+ delete iter;
+ vlc_object_destroy( p_sys->p_timeout );
+ goto error;
+ }
+ msg_Dbg( p_demux, "spawned timeout thread" );
+ vlc_object_attach( p_sys->p_timeout, p_demux );
+ }
}
/* Create all es struct */
{
live_track_t *tk;
- if( sub->readSource() == NULL )
- {
- continue;
- }
+ if( sub->readSource() == NULL ) continue;
tk = (live_track_t*)malloc( sizeof( live_track_t ) );
tk->p_demux = p_demux;
/* Value taken from mplayer */
if( !strcmp( sub->mediumName(), "audio" ) )
{
- es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC( 'u', 'n', 'd', 'f' ) );
+ es_format_Init( &tk->fmt, AUDIO_ES, VLC_FOURCC('u','n','d','f') );
tk->fmt.audio.i_channels = sub->numChannels();
- tk->fmt.audio.i_rate = sub->rtpSource()->timestampFrequency();
+ tk->fmt.audio.i_rate = sub->rtpTimestampFrequency();
if( !strcmp( sub->codecName(), "MPA" ) ||
!strcmp( sub->codecName(), "MPA-ROBUST" ) ||
{
tk->fmt.i_codec = VLC_FOURCC( 'a', 'l', 'a', 'w' );
}
+ else if( !strncmp( sub->codecName(), "G726", 4 ) )
+ {
+ 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->fmt.i_bitrate = 40000;
+ else if( !strcmp( sub->codecName()+5, "32" ) )
+ tk->fmt.i_bitrate = 32000;
+ else if( !strcmp( sub->codecName()+5, "24" ) )
+ tk->fmt.i_bitrate = 24000;
+ else if( !strcmp( sub->codecName()+5, "16" ) )
+ tk->fmt.i_bitrate = 16000;
+ }
+ else if( !strcmp( sub->codecName(), "AMR" ) )
+ {
+ tk->fmt.i_codec = VLC_FOURCC( 's', 'a', 'm', 'r' );
+ }
+ else if( !strcmp( sub->codecName(), "AMR-WB" ) )
+ {
+ tk->fmt.i_codec = VLC_FOURCC( 's', 'a', 'w', 'b' );
+ }
else if( !strcmp( sub->codecName(), "MP4A-LATM" ) )
{
unsigned int i_extra;
tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' );
- if( ( p_extra = parseStreamMuxConfigStr( sub->fmtp_config(), i_extra ) ) )
+ if( ( p_extra = parseStreamMuxConfigStr( sub->fmtp_config(),
+ i_extra ) ) )
{
tk->fmt.i_extra = i_extra;
tk->fmt.p_extra = malloc( i_extra );
memcpy( tk->fmt.p_extra, p_extra, i_extra );
delete[] p_extra;
}
+
+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1141257600
+ /* 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();
+#endif
}
else if( !strcmp( sub->codecName(), "MPEG4-GENERIC" ) )
{
tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' );
- if( ( p_extra = parseGeneralConfigStr( sub->fmtp_config(), i_extra ) ) )
+ if( ( p_extra = parseGeneralConfigStr( sub->fmtp_config(),
+ i_extra ) ) )
{
tk->fmt.i_extra = i_extra;
tk->fmt.p_extra = malloc( i_extra );
{
tk->b_asf = VLC_TRUE;
if( p_sys->p_out_asf == NULL )
- p_sys->p_out_asf = stream_DemuxNew( p_demux, "asf", p_demux->out );;
+ p_sys->p_out_asf = stream_DemuxNew( p_demux, "asf",
+ p_demux->out );
}
}
else if( !strcmp( sub->mediumName(), "video" ) )
{
- es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC( 'u', 'n', 'd', 'f' ) );
+ es_format_Init( &tk->fmt, VIDEO_ES, VLC_FOURCC('u','n','d','f') );
if( !strcmp( sub->codecName(), "MPV" ) )
{
tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'v' );
{
tk->fmt.i_codec = VLC_FOURCC( 'H', '2', '6', '1' );
}
+ else if( !strcmp( sub->codecName(), "H264" ) )
+ {
+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1117756800
+ unsigned int i_extra = 0;
+ uint8_t *p_extra = NULL;
+#endif
+ tk->fmt.i_codec = VLC_FOURCC( 'H', '2', '6', '4' );
+ tk->fmt.b_packetized = VLC_FALSE;
+
+ /* XXX not the right minimal version I fear */
+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1117756800
+ if((p_extra=parseH264ConfigStr( sub->fmtp_spropparametersets(),
+ i_extra ) ) )
+ {
+ tk->fmt.i_extra = i_extra;
+ tk->fmt.p_extra = malloc( i_extra );
+ memcpy( tk->fmt.p_extra, p_extra, i_extra );
+
+ delete[] p_extra;
+ }
+#endif
+ }
else if( !strcmp( sub->codecName(), "JPEG" ) )
{
tk->fmt.i_codec = VLC_FOURCC( 'M', 'J', 'P', 'G' );
tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' );
- if( ( p_extra = parseGeneralConfigStr( sub->fmtp_config(), i_extra ) ) )
+ if( ( p_extra = parseGeneralConfigStr( sub->fmtp_config(),
+ i_extra ) ) )
{
tk->fmt.i_extra = i_extra;
tk->fmt.p_extra = malloc( i_extra );
delete[] p_extra;
}
}
- else if( !strcmp( sub->codecName(), "X-QT" ) || !strcmp( sub->codecName(), "X-QUICKTIME" ) ||
- !strcmp( sub->codecName(), "X-QDM" ) || !strcmp( sub->codecName(), "X-SV3V-ES" ) ||
+ else if( !strcmp( sub->codecName(), "X-QT" ) ||
+ !strcmp( sub->codecName(), "X-QUICKTIME" ) ||
+ !strcmp( sub->codecName(), "X-QDM" ) ||
+ !strcmp( sub->codecName(), "X-SV3V-ES" ) ||
!strcmp( sub->codecName(), "X-SORENSONVIDEO" ) )
{
tk->b_quicktime = VLC_TRUE;
tk->b_muxed = VLC_TRUE;
tk->p_out_muxed = stream_DemuxNew( p_demux, "ts", p_demux->out );
}
- else if( !strcmp( sub->codecName(), "MP2P" ) || !strcmp( sub->codecName(), "MP1S" ) )
+ else if( !strcmp( sub->codecName(), "MP2P" ) ||
+ !strcmp( sub->codecName(), "MP1S" ) )
{
tk->b_muxed = VLC_TRUE;
- tk->p_out_muxed = stream_DemuxNew( p_demux, "ps", p_demux->out );
+ tk->p_out_muxed = stream_DemuxNew( p_demux, "ps",
+ p_demux->out );
}
else if( !strcmp( sub->codecName(), "X-ASF-PF" ) )
{
tk->b_asf = VLC_TRUE;
if( p_sys->p_out_asf == NULL )
- p_sys->p_out_asf = stream_DemuxNew( p_demux, "asf", p_demux->out );;
+ p_sys->p_out_asf = stream_DemuxNew( p_demux, "asf",
+ p_demux->out );;
}
}
return VLC_SUCCESS;
error:
- if( p_sys->p_out_asf )
- {
- stream_DemuxDelete( p_sys->p_out_asf );
- }
- if( p_sys->ms )
+ if( p_sys->p_out_asf ) stream_DemuxDelete( p_sys->p_out_asf );
+ if( p_sys->ms ) Medium::close( p_sys->ms );
+ if( p_sys->rtsp ) Medium::close( p_sys->rtsp );
+ if( p_sys->env ) RECLAIM_ENV(p_sys->env);
+ if( p_sys->p_timeout )
{
- Medium::close( p_sys->ms );
- }
- if( p_sys->rtsp )
- {
- Medium::close( p_sys->rtsp );
- }
- if( p_sys->env )
- {
- RECLAIM_ENV(p_sys->env);
- }
- if( p_sys->scheduler )
- {
- delete p_sys->scheduler;
- }
- if( p_sys->p_sdp )
- {
- free( p_sys->p_sdp );
+ p_sys->p_timeout->b_die = VLC_TRUE;
+ vlc_thread_join( p_sys->p_timeout );
+ vlc_object_detach( p_sys->p_timeout );
+ vlc_object_destroy( p_sys->p_timeout );
}
+ if( p_sys->scheduler ) delete p_sys->scheduler;
+ if( p_sys->p_sdp ) free( p_sys->p_sdp );
+ if( p_sys->psz_path ) free( p_sys->psz_path );
+
free( p_sys );
return VLC_EGENERIC;
}
-
-
/*****************************************************************************
* DemuxClose:
*****************************************************************************/
static void Close( vlc_object_t *p_this )
{
demux_t *p_demux = (demux_t*)p_this;
- demux_sys_t *p_sys = p_demux->p_sys;
- int i;
+ demux_sys_t *p_sys = p_demux->p_sys;
+ int i;
for( i = 0; i < p_sys->i_track; i++ )
{
live_track_t *tk = p_sys->track[i];
- if( tk->b_muxed )
- {
- stream_DemuxDelete( tk->p_out_muxed );
- }
+ if( tk->b_muxed ) stream_DemuxDelete( tk->p_out_muxed );
free( tk->p_buffer );
free( tk );
}
- if( p_sys->i_track )
- {
- free( p_sys->track );
- }
- if( p_sys->p_out_asf )
- {
- stream_DemuxDelete( p_sys->p_out_asf );
- }
+
+ if( p_sys->i_track ) free( p_sys->track );
+ if( p_sys->p_out_asf ) stream_DemuxDelete( p_sys->p_out_asf );
if( p_sys->rtsp && p_sys->ms )
{
/* TEARDOWN */
p_sys->rtsp->teardownMediaSession( *p_sys->ms );
}
+
Medium::close( p_sys->ms );
- if( p_sys->rtsp )
- {
- Medium::close( p_sys->rtsp );
- }
- if( p_sys->env )
- {
- RECLAIM_ENV(p_sys->env);
- }
- if( p_sys->scheduler )
+ if( p_sys->p_timeout )
{
- delete p_sys->scheduler;
- }
- if( p_sys->p_sdp )
- {
- free( p_sys->p_sdp );
+ p_sys->p_timeout->b_die = VLC_TRUE;
+ vlc_thread_join( p_sys->p_timeout );
+ vlc_object_detach( p_sys->p_timeout );
+ vlc_object_destroy( p_sys->p_timeout );
}
+
+ if( p_sys->rtsp ) Medium::close( p_sys->rtsp );
+ if( p_sys->env ) RECLAIM_ENV(p_sys->env);
+ if( p_sys->scheduler ) delete p_sys->scheduler;
+ if( p_sys->p_sdp ) free( p_sys->p_sdp );
+ if( p_sys->psz_path ) free( p_sys->psz_path );
free( p_sys );
}
mtime_t i_pcr = 0;
int i;
+ /* 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 )
+ {
+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1138089600
+ char *psz_bye = NULL;
+ p_sys->rtsp->getMediaSessionParameter( *p_sys->ms, NULL, psz_bye );
+#endif
+ p_sys->b_timeout_call = VLC_FALSE;
+ }
+
for( i = 0; i < p_sys->i_track; i++ )
{
live_track_t *tk = p_sys->track[i];
}
}
+ /* When a On Demand QT stream ends, the last frame keeps going with the same PCR/PTS value */
+ /* This tests for that, so we can later decide to end this session */
+ if( i_pcr > 0 && p_sys->i_pcr == p_sys->i_pcr_previous )
+ {
+ if( p_sys->i_pcr_repeats == 0 )
+ p_sys->i_pcr_repeatdate = mdate();
+ p_sys->i_pcr_repeats++;
+ }
+ else
+ {
+ p_sys->i_pcr_previous = p_sys->i_pcr;
+ p_sys->i_pcr_repeatdate = 0;
+ p_sys->i_pcr_repeats = 0;
+ }
+
+ if( p_sys->i_pcr_repeats > 5 && mdate() > p_sys->i_pcr_repeatdate + 1000000 )
+ {
+ /* We need at least 5 repeats over at least a second of time before we EOF */
+ msg_Dbg( p_demux, "suspect EOF due to end of VoD session" );
+ return 0;
+ }
+
/* First warm we want to read data */
p_sys->event = 0;
for( i = 0; i < p_sys->i_track; i++ )
{
tk->waiting = 1;
tk->readSource->getNextFrame( tk->p_buffer, tk->i_buffer,
- StreamRead, tk,
- StreamClose, tk );
+ StreamRead, tk, StreamClose, tk );
}
}
/* Create a task that will be called if we wait more than 300ms */
{
live_track_t *tk = p_sys->track[i];
- if( !tk->b_muxed && !tk->b_rtcp_sync && tk->rtpSource->hasBeenSynchronizedUsingRTCP() )
+ if( !tk->b_muxed && !tk->b_rtcp_sync &&
+ tk->rtpSource && tk->rtpSource->hasBeenSynchronizedUsingRTCP() )
{
msg_Dbg( p_demux, "tk->rtpSource->hasBeenSynchronizedUsingRTCP()" );
}
}
+ 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 )
+ {
+ vlc_bool_t b_rtsp_tcp = var_GetBool( p_demux, "rtsp-tcp" );
+
+ if( !b_rtsp_tcp && p_sys->rtsp && p_sys->ms )
+ {
+ msg_Warn( p_demux, "no data received in 10s. Switching to TCP" );
+ if( RollOverTcp( p_demux ) )
+ {
+ msg_Err( p_demux, "TCP rollover failed, aborting" );
+ return 0;
+ }
+ var_SetBool( p_demux, "rtsp-tcp", VLC_TRUE );
+ }
+ else if( p_sys->i_no_data_ti > 34 )
+ {
+ msg_Err( p_demux, "no data received in 10s, aborting" );
+ return 0;
+ }
+ }
+ else if( !p_sys->b_multicast && p_sys->b_no_data&& p_sys->i_no_data_ti > 34 )
+ {
+ /* EOF ? */
+ msg_Warn( p_demux, "no data received in 10s, eof ?" );
+ return 0;
+ }
+
return p_demux->b_error ? 0 : 1;
}
int64_t *pi64;
double *pf, f;
vlc_bool_t *pb, b_bool;
- int i;
switch( i_query )
{
pf = (double*)va_arg( args, double* );
if( p_sys->i_length > 0 )
{
- *pf = (double)( p_sys->i_pcr - p_sys->i_pcr_start + p_sys->i_start)/
- (double)(p_sys->i_length);
+ *pf = (double)( p_sys->i_pcr - p_sys->i_pcr_start +
+ p_sys->i_start ) / (double)(p_sys->i_length);
}
else
{
if( p_sys->rtsp && p_sys->i_length > 0 )
{
- MediaSubsessionIterator *iter = new MediaSubsessionIterator( *p_sys->ms );
- MediaSubsession *sub;
- int i;
-
- while( ( sub = iter->next() ) != NULL )
+ if( !p_sys->rtsp->playMediaSession( *p_sys->ms, time ) )
{
- p_sys->rtsp->playMediaSubsession( *sub, time );
+ msg_Err( p_demux, "PLAY failed %s",
+ p_sys->env->getResultMsg() );
+ return VLC_EGENERIC;
}
- delete iter;
p_sys->i_start = (mtime_t)(f * (double)p_sys->i_length);
p_sys->i_pcr_start = 0;
p_sys->i_pcr = 0;
-
- for( i = 0; i < p_sys->i_track; i++ )
- {
- p_sys->track[i]->i_pts = 0;
- }
+
return VLC_SUCCESS;
}
return VLC_SUCCESS;
case DEMUX_CAN_PAUSE:
pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
if( p_sys->rtsp && p_sys->i_length )
- *pb = VLC_TRUE; /* Not always true, but will be handled in SET_PAUSE_STATE */
+ /* Not always true, but will be handled in SET_PAUSE_STATE */
+ *pb = VLC_TRUE;
else
*pb = VLC_FALSE;
return VLC_SUCCESS;
case DEMUX_CAN_CONTROL_PACE:
pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
+
+#if 0 /* Disable for now until we have a clock synchro algo
+ * which works with something else than MPEG over UDP */
*pb = VLC_FALSE;
+#else
+ *pb = VLC_TRUE;
+#endif
return VLC_SUCCESS;
case DEMUX_SET_PAUSE_STATE:
double d_npt;
- MediaSubsessionIterator *iter;
- MediaSubsession *sub;
- d_npt = ( (double)( p_sys->i_pcr - p_sys->i_pcr_start + p_sys->i_start ) ) / 1000000.00;
+ d_npt = ( (double)( p_sys->i_pcr - p_sys->i_pcr_start +
+ p_sys->i_start ) ) / 1000000.00;
b_bool = (vlc_bool_t)va_arg( args, vlc_bool_t );
if( p_sys->rtsp == NULL )
return VLC_EGENERIC;
- iter = new MediaSubsessionIterator( *p_sys->ms );
- while( ( sub = iter->next() ) != NULL )
+ if( ( b_bool && !p_sys->rtsp->pauseMediaSession( *p_sys->ms ) ) ||
+ ( !b_bool && !p_sys->rtsp->playMediaSession( *p_sys->ms,
+ d_npt > 0 ? d_npt : -1 ) ) )
{
- if( ( b_bool && !p_sys->rtsp->pauseMediaSubsession( *sub ) ) ||
- ( !b_bool && !p_sys->rtsp->playMediaSubsession( *sub, d_npt > 0 ? d_npt : -1 ) ) )
- {
- delete iter;
+ msg_Err( p_demux, "PLAY or PAUSE failed %s", p_sys->env->getResultMsg() );
return VLC_EGENERIC;
- }
}
- delete iter;
#if 0
/* reset PCR and PCR start, mmh won't work well for multi-stream I fear */
for( i = 0; i < p_sys->i_track; i++ )
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = (int64_t)var_GetInteger( p_demux, "rtsp-caching" ) * I64C(1000);
+ *pi64 = (int64_t)var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
return VLC_SUCCESS;
default:
}
}
+/*****************************************************************************
+ * RollOverTcp: reopen the rtsp into TCP mode
+ * XXX: ugly, a lot of code are duplicated from Open()
+ *****************************************************************************/
+static int RollOverTcp( demux_t *p_demux )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+ MediaSubsessionIterator *iter;
+ MediaSubsession *sub;
+ char *psz_url;
+ char *psz_options;
+ char *psz_user;
+ char *psz_pwd;
+ uint8_t *p_sdp;
+ int i_tk;
+
+ /* We close the old RTSP session */
+ p_sys->rtsp->teardownMediaSession( *p_sys->ms );
+
+ Medium::close( p_sys->ms );
+ Medium::close( p_sys->rtsp );
+
+ p_sys->ms = NULL;
+ p_sys->rtsp = NULL;
+
+ /* Reopen rtsp client */
+ if( ( p_sys->rtsp = RTSPClient::createNew(*p_sys->env, 1/*verbose*/,
+ "VLC media player" ) ) == NULL )
+ {
+ msg_Err( p_demux, "RTSPClient::createNew failed (%s)",
+ p_sys->env->getResultMsg() );
+ return VLC_EGENERIC;
+ }
+
+ asprintf( &psz_url, "rtsp://%s", p_sys->psz_path );
+
+ if( ( psz_options = p_sys->rtsp->sendOptionsCmd( psz_url ) ) )
+ delete [] psz_options;
+
+ psz_user = var_CreateGetString( p_demux, "rtsp-user" );
+ psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" );
+
+ if ((*psz_user) && (*psz_pwd))
+ p_sdp = (uint8_t*)p_sys->rtsp->describeWithPassword( psz_url,
+ psz_user, psz_pwd);
+ else
+ p_sdp = (uint8_t*)p_sys->rtsp->describeURL( psz_url,
+ NULL, var_CreateGetBool( p_demux, "rtsp-kasenna" ) );
+
+ free( psz_url );
+ free( psz_user );
+ free( psz_pwd );
+
+ if( p_sdp == NULL )
+ {
+ msg_Err( p_demux, "describeURL failed (%s)",
+ p_sys->env->getResultMsg() );
+ return VLC_EGENERIC;
+ }
+
+ /* malloc-ated copy */
+ p_sys->p_sdp = strdup( (char*)p_sdp );
+ delete[] p_sdp;
+
+ if( !( p_sys->ms = MediaSession::createNew( *p_sys->env, p_sys->p_sdp ) ) )
+ {
+ msg_Err( p_demux, "MediaSession::createNew failed" );
+ return VLC_EGENERIC;
+ }
+
+ /* Initialise each media subsession */
+ iter = new MediaSubsessionIterator( *p_sys->ms );
+ while( ( sub = iter->next() ) != NULL )
+ {
+ Boolean bInit;
+
+ if( !strcmp( sub->codecName(), "X-ASF-PF" ) )
+ bInit = sub->initiate( 4 ); /* Constant ? */
+ else
+ bInit = sub->initiate();
+
+ if( !bInit )
+ {
+ msg_Warn( p_demux, "RTP subsession '%s/%s' failed (%s)",
+ sub->mediumName(), sub->codecName(),
+ p_sys->env->getResultMsg() );
+ continue;
+ }
+ msg_Dbg( p_demux, "RTP subsession '%s/%s'", sub->mediumName(),
+ sub->codecName() );
+
+ /* Issue the SETUP */
+ p_sys->rtsp->setupMediaSubsession( *sub, False, True /* tcp */ );
+ }
+
+ /* The PLAY */
+ if( !p_sys->rtsp->playMediaSession( *p_sys->ms ) )
+ {
+ msg_Err( p_demux, "PLAY failed %s", p_sys->env->getResultMsg() );
+ return VLC_EGENERIC;
+ }
+
+ /* Update all tracks */
+ iter->reset();
+ i_tk = 0;
+ while( ( sub = iter->next() ) != NULL )
+ {
+ live_track_t *tk;
+
+ if( sub->readSource() == NULL )
+ continue;
+ if( i_tk >= p_sys->i_track )
+ {
+ msg_Err( p_demux, "WTF !" );
+ break;
+ }
+
+ tk = p_sys->track[i_tk];
+
+ /* Reset state */
+ tk->waiting = 0;
+ tk->i_pts = 0;
+ tk->b_rtcp_sync = VLC_FALSE;
+
+ if( sub->rtcpInstance() != NULL )
+ sub->rtcpInstance()->setByeHandler( StreamClose, tk );
+
+ tk->readSource = sub->readSource();
+ tk->rtpSource = sub->rtpSource();
+
+ i_tk++;
+ }
+
+ delete iter;
+
+ return VLC_SUCCESS;
+}
+
+
/*****************************************************************************
*
*****************************************************************************/
-static void StreamRead( void *p_private, unsigned int i_size, unsigned int i_truncated_bytes, struct timeval pts, unsigned int duration )
+static void StreamRead( void *p_private, unsigned int i_size,
+ unsigned int i_truncated_bytes, struct timeval pts,
+ unsigned int duration )
{
live_track_t *tk = (live_track_t*)p_private;
demux_t *p_demux = tk->p_demux;
demux_sys_t *p_sys = p_demux->p_sys;
block_t *p_block;
- mtime_t i_pts = (uint64_t)pts.tv_sec * UI64C(1000000) + (uint64_t)pts.tv_usec;
+ mtime_t i_pts = (uint64_t)pts.tv_sec * UI64C(1000000) +
+ (uint64_t)pts.tv_usec;
/* XXX Beurk beurk beurk Avoid having negative value XXX */
i_pts &= UI64C(0x00ffffffffffffff);
if( tk->b_quicktime && tk->p_es == NULL )
{
- QuickTimeGenericRTPSource *qtRTPSource = (QuickTimeGenericRTPSource*)tk->rtpSource;
+ QuickTimeGenericRTPSource *qtRTPSource =
+ (QuickTimeGenericRTPSource*)tk->rtpSource;
QuickTimeGenericRTPSource::QTState &qtState = qtRTPSource->qtState;
uint8_t *sdAtom = (uint8_t*)&qtState.sdAtom[4];
tk->waiting = 0;
return;
}
- tk->fmt.i_codec = VLC_FOURCC( sdAtom[0], sdAtom[1], sdAtom[2], sdAtom[3] );
+ tk->fmt.i_codec = VLC_FOURCC(sdAtom[0],sdAtom[1],sdAtom[2],sdAtom[3]);
tk->fmt.video.i_width = (sdAtom[28] << 8) | sdAtom[29];
tk->fmt.video.i_height = (sdAtom[30] << 8) | sdAtom[31];
msg_Warn( p_demux, "buffer overflow" );
}
/* FIXME could i_size be > buffer size ? */
- if( tk->fmt.i_codec == VLC_FOURCC('h','2','6','1') )
+ if( tk->fmt.i_codec == VLC_FOURCC('s','a','m','r') ||
+ tk->fmt.i_codec == VLC_FOURCC('s','a','w','b') )
+ {
+ AMRAudioSource *amrSource = (AMRAudioSource*)tk->readSource;
+
+ p_block = block_New( p_demux, i_size + 1 );
+ p_block->p_buffer[0] = amrSource->lastFrameHeader();
+ memcpy( p_block->p_buffer + 1, tk->p_buffer, i_size );
+ }
+ else if( tk->fmt.i_codec == VLC_FOURCC('H','2','6','1') )
{
#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1081468800
H261VideoRTPSource *h261Source = (H261VideoRTPSource*)tk->rtpSource;
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 );
+
+ if( tk->rtpSource->curPacketMarkerBit() )
+ p_block->i_flags |= BLOCK_FLAG_END_OF_FRAME;
+ }
+ else if( tk->fmt.i_codec == VLC_FOURCC('H','2','6','4') )
+ {
+ if( (tk->p_buffer[0] & 0x1f) >= 24 )
+ msg_Warn( p_demux, "unsupported NAL type for H264" );
+
+ /* Normal NAL type */
+ p_block = block_New( p_demux, i_size + 4 );
+ p_block->p_buffer[0] = 0x00;
+ p_block->p_buffer[1] = 0x00;
+ p_block->p_buffer[2] = 0x00;
+ p_block->p_buffer[3] = 0x01;
+ memcpy( &p_block->p_buffer[4], tk->p_buffer, i_size );
}
else if( tk->b_asf )
{
- int i_copy = __MIN( p_sys->asfh.i_min_data_packet_size, i_size );
+ int i_copy = __MIN( p_sys->asfh.i_min_data_packet_size, (int)i_size );
p_block = block_New( p_demux, p_sys->asfh.i_min_data_packet_size );
memcpy( p_block->p_buffer, tk->p_buffer, i_copy );
p_block = block_New( p_demux, i_size );
memcpy( p_block->p_buffer, tk->p_buffer, i_size );
}
- if( tk->fmt.i_codec == VLC_FOURCC('h','2','6','1') &&
- tk->rtpSource->curPacketMarkerBit() )
- {
- p_block->i_flags |= BLOCK_FLAG_END_OF_FRAME;
- }
+
//p_block->i_rate = p_input->stream.control.i_rate;
if( i_pts != tk->i_pts && !tk->b_muxed )
{
- p_block->i_dts = i_pts;
+ p_block->i_dts = ( tk->fmt.i_cat == VIDEO_ES ) ? 0 : i_pts;
p_block->i_pts = i_pts;
}
- //fprintf( stderr, "tk -> dpts=%lld\n", i_pts - tk->i_pts );
if( tk->b_muxed )
{
/* we have read data */
tk->waiting = 0;
+ p_demux->p_sys->b_no_data = VLC_FALSE;
+ p_demux->p_sys->i_no_data_ti = 0;
if( i_pts > 0 && !tk->b_muxed )
{
demux_t *p_demux = tk->p_demux;
demux_sys_t *p_sys = p_demux->p_sys;
- fprintf( stderr, "StreamClose\n" );
+ msg_Dbg( p_demux, "StreamClose" );
p_sys->event = 0xff;
p_demux->b_error = VLC_TRUE;
{
demux_t *p_demux = (demux_t*)p_private;
- fprintf( stderr, "TaskInterrupt\n" );
+ p_demux->p_sys->i_no_data_ti++;
/* Avoid lock */
p_demux->p_sys->event = 0xff;
}
+/*****************************************************************************
+ *
+ *****************************************************************************/
+static void TimeoutPrevention( timeout_thread_t *p_timeout )
+{
+ p_timeout->b_die = VLC_FALSE;
+ p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2;
+ p_timeout->i_remain *= 1000000;
+
+ vlc_thread_ready( p_timeout );
+
+ /* Avoid lock */
+ while( !p_timeout->b_die )
+ {
+ if( p_timeout->i_remain <= 0 )
+ {
+ p_timeout->i_remain = (int64_t)p_timeout->p_sys->i_timeout -2;
+ p_timeout->i_remain *= 1000000;
+ p_timeout->p_sys->b_timeout_call = VLC_TRUE;
+ msg_Dbg( p_timeout, "reset the timeout timer" );
+ }
+ p_timeout->i_remain -= 200000;
+ msleep( 200000 ); /* 200 ms */
+ }
+}
+
/*****************************************************************************
*
*****************************************************************************/
/* Always smaller */
p_header = block_New( p_demux, psz_end - psz_asf );
p_header->i_buffer = b64_decode( (char*)p_header->p_buffer, psz_asf );
- fprintf( stderr, "Size=%d Hdrb64=%s\n", p_header->i_buffer, psz_asf );
+ //msg_Dbg( p_demux, "Size=%d Hdrb64=%s", p_header->i_buffer, psz_asf );
if( p_header->i_buffer <= 0 )
{
free( psz_asf );
free( psz_asf );
return VLC_SUCCESS;
}
+
+#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1117756800
+static unsigned char* parseH264ConfigStr( char const* configStr,
+ unsigned int& configSize )
+{
+ char *dup, *psz;
+
+ if( configSize )
+ configSize = 0;
+
+ if( configStr == NULL || *configStr == '\0' )
+ return NULL;
+
+ psz = dup = strdup( configStr );
+
+ unsigned char *cfg = new unsigned char[5 * strlen(psz)];
+ for( ;; )
+ {
+ char *p = strchr( psz, ',' );
+ if( p )
+ *p++ = '\0';
+
+ cfg[configSize++] = 0x00;
+ cfg[configSize++] = 0x00;
+ cfg[configSize++] = 0x00;
+ cfg[configSize++] = 0x01;
+ configSize += b64_decode( (char*)&cfg[configSize], psz );
+
+ if( p == NULL )
+ break;
+ psz = p;
+ }
+
+ if( dup ) free( dup );
+ return cfg;
+}
+#endif
+
/*char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";*/
static int b64_decode( char *dest, char *src )
{
return dest - dest_start;
}
-
projects / vlc / blobdiff