X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fdemux%2Flive555.cpp;h=cb31cfb42163dc7b2b9dec66d53e4a01798a4145;hb=c426fd12c57569987c8f2b78c592bc288a96c8d2;hp=2a1c68fec5fe16847d2a47172500bd7e8c22715a;hpb=bf43238e937fb0d2a9366bb82e19003375d696c7;p=vlc diff --git a/modules/demux/live555.cpp b/modules/demux/live555.cpp index 2a1c68fec5..cb31cfb421 100644 --- a/modules/demux/live555.cpp +++ b/modules/demux/live555.cpp @@ -1,10 +1,12 @@ /***************************************************************************** * live555.cpp : LIVE555 Streaming Media support. ***************************************************************************** - * Copyright (C) 2003-2006 the VideoLAN team + * Copyright (C) 2003-2007 the VideoLAN team * $Id$ * * Authors: Laurent Aimar + * Derk-Jan Hartman + * Derk-Jan Hartman for M2X * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,18 +26,35 @@ /***************************************************************************** * Preamble *****************************************************************************/ -#include /* malloc(), free() */ -#include -#include -#include "network.h" +/* For inttypes.h + * Note: config.h may include inttypes.h, so make sure we define this option + * early enough. */ +#define __STDC_CONSTANT_MACROS 1 + +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + +#include + +#include +#include + +#include +#include +#include +#include #include +#include + #if defined( WIN32 ) # include #endif +#include "UsageEnvironment.hh" #include "BasicUsageEnvironment.hh" #include "GroupsockHelper.hh" #include "liveMedia.hh" @@ -44,12 +63,6 @@ extern "C" { #include "../access/mms/asf.h" /* Who said ugly ? */ } -#if (LIVEMEDIA_LIBRARY_VERSION_INT < 1089936000) -#define RECLAIM_ENV(env) delete (env) -#else -#define RECLAIM_ENV(env) (env)->reclaim() -#endif - using namespace std; /***************************************************************************** @@ -76,8 +89,8 @@ static void Close( vlc_object_t * ); "used for the connection.") vlc_module_begin(); - set_description( _("RTP/RTSP/SDP demuxer (using Live555)" ) ); - set_capability( "demux2", 50 ); + set_description( N_("RTP/RTSP/SDP demuxer (using Live555)" ) ); + set_capability( "demux", 50 ); set_shortname( "RTP/RTSP"); set_callbacks( Open, Close ); add_shortcut( "live" ); @@ -86,44 +99,37 @@ vlc_module_begin(); set_subcategory( SUBCAT_INPUT_DEMUX ); add_submodule(); - set_description( _("RTSP/RTP access and demux") ); + set_description( N_("RTSP/RTP access and demux") ); add_shortcut( "rtsp" ); add_shortcut( "sdp" ); set_capability( "access_demux", 0 ); set_callbacks( Open, Close ); add_bool( "rtsp-tcp", 0, NULL, N_("Use RTP over RTSP (TCP)"), - N_("Use RTP over RTSP (TCP)"), VLC_TRUE ); + N_("Use RTP over RTSP (TCP)"), 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 + N_("Port to use for the RTP source of the session"), true ); + add_bool( "rtsp-mcast", false, NULL, + N_("Force multicast RTP via RTSP"), + N_("Force multicast RTP via RTSP"), true ); add_bool( "rtsp-http", 0, NULL, N_("Tunnel RTSP and RTP over HTTP"), - N_("Tunnel RTSP and RTP over HTTP"), VLC_TRUE ); + N_("Tunnel RTSP and RTP over HTTP"), 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 ); - add_bool( "rtsp-kasenna", VLC_FALSE, NULL, KASENNA_TEXT, - KASENNA_LONGTEXT, VLC_TRUE ); + true ); + add_integer("rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL, + CACHING_TEXT, CACHING_LONGTEXT, true ); + add_bool( "rtsp-kasenna", false, NULL, KASENNA_TEXT, + KASENNA_LONGTEXT, true ); add_string( "rtsp-user", NULL, NULL, USER_TEXT, - USER_LONGTEXT, VLC_TRUE ); + USER_LONGTEXT, true ); add_string( "rtsp-pwd", NULL, NULL, PASS_TEXT, - PASS_LONGTEXT, VLC_TRUE ); + PASS_LONGTEXT, true ); vlc_module_end(); -/* TODO: - * - Improve support of PS/TS - * - Support X-QT/X-QUICKTIME generic codec for audio. - * - * - Check memory leak, delete/free -> still one when using rtsp-tcp but I'm - * not sure if it comes from me. - * - */ /***************************************************************************** * Local prototypes @@ -131,27 +137,24 @@ vlc_module_end(); typedef struct { - demux_t *p_demux; - - vlc_bool_t b_quicktime; - vlc_bool_t b_muxed; - vlc_bool_t b_asf; - - es_format_t fmt; - es_out_id_t *p_es; - - stream_t *p_out_muxed; /* for muxed stream */ + demux_t *p_demux; + MediaSubsession *sub; - RTPSource *rtpSource; - FramedSource *readSource; - vlc_bool_t b_rtcp_sync; + es_format_t fmt; + es_out_id_t *p_es; - uint8_t *p_buffer; - unsigned int i_buffer; + bool b_muxed; + bool b_quicktime; + bool b_asf; + stream_t *p_out_muxed; /* for muxed stream */ - char waiting; + uint8_t *p_buffer; + unsigned int i_buffer; - mtime_t i_pts; + bool b_rtcp_sync; + char waiting; + int64_t i_pts; + u_int32_t i_start_seq; } live_track_t; @@ -160,13 +163,15 @@ struct timeout_thread_t VLC_COMMON_MEMBERS int64_t i_remain; + bool b_handle_keep_alive; demux_sys_t *p_sys; }; struct demux_sys_t { - char *p_sdp; /* XXX mallocated */ - char *psz_path; /* URL-encoded path */ + char *p_sdp; /* XXX mallocated */ + char *psz_path; /* URL-encoded path */ + vlc_url_t url; MediaSession *ms; TaskScheduler *scheduler; @@ -176,28 +181,26 @@ struct demux_sys_t /* */ int i_track; 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 */ + /* Weird formats */ asf_header_t asfh; stream_t *p_out_asf; + bool b_real; /* */ - mtime_t i_length; - mtime_t i_start; + int64_t i_pcr; /* The clock */ + int64_t i_npt_length; + int64_t i_npt_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 */ + bool 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 */ + bool b_force_mcast; + bool b_multicast; /* if one of the tracks is multicasted */ + bool b_no_data; /* if we never received any data */ int i_no_data_ti; /* consecutive number of TaskInterrupt */ char event; @@ -206,20 +209,21 @@ struct demux_sys_t static int Demux ( demux_t * ); static int Control( demux_t *, int, va_list ); -static int ParseASF( demux_t * ); -static int RollOverTcp( demux_t * ); +static int Connect ( demux_t * ); +static int SessionsSetup( demux_t * ); +static int Play ( demux_t *); +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 StreamRead ( void *, unsigned int, unsigned int, + struct timeval, unsigned int ); +static void StreamClose ( void * ); static void TaskInterrupt( void * ); static void TimeoutPrevention( timeout_thread_t * ); -#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1117756800 static unsigned char* parseH264ConfigStr( char const* configStr, unsigned int& configSize ); -#endif /***************************************************************************** * DemuxOpen: @@ -229,27 +233,20 @@ static int Open ( vlc_object_t *p_this ) demux_t *p_demux = (demux_t*)p_this; 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; + MediaSubsessionIterator *iter = NULL; + MediaSubsession *sub = NULL; + int i, i_return; + int i_error = VLC_EGENERIC; if( p_demux->s ) { /* See if it looks like a SDP v, o, s fields are mandatory and in this order */ + 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; @@ -272,22 +269,22 @@ static int Open ( vlc_object_t *p_this ) p_sys->rtsp = NULL; p_sys->i_track = 0; 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->i_pcr = 0; + p_sys->i_npt_start = 0; + p_sys->i_npt_length = 0; p_sys->p_out_asf = NULL; - p_sys->b_no_data = VLC_TRUE; + p_sys->b_no_data = 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); + p_sys->b_timeout_call = false; + p_sys->b_multicast = false; + p_sys->b_real = false; + p_sys->psz_path = strdup( p_demux->psz_path ); + p_sys->b_force_mcast = var_CreateGetBool( p_demux, "rtsp-mcast" ); + /* 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 ) { @@ -306,78 +303,35 @@ static int Open ( vlc_object_t *p_this ) while( (p = strchr( p, ' ' )) != NULL ) *p = '+'; } - if( p_demux->s == NULL && !strcasecmp( p_demux->psz_access, "rtsp" ) ) + if( p_demux->s != NULL ) { - char *psz_url; - char *psz_options; -#if LIVEMEDIA_LIBRARY_VERSION_INT > 1130457500 - int i_http_port = 0; - - 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() ); - goto error; - } - 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; - - psz_user = var_CreateGetString( p_demux, "rtsp-user" ); - psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" ); + /* Gather the complete sdp file */ + int i_sdp = 0; + int i_sdp_max = 1000; + uint8_t *p_sdp = (uint8_t*) malloc( i_sdp_max ); - 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 ) + if( !p_sdp ) { - msg_Err( p_demux, "describeURL failed (%s)", - p_sys->env->getResultMsg() ); - free( psz_url ); + i_error = VLC_ENOMEM; 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; - 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_sys->psz_path ); - } - else - { - /* Gather the complete sdp file */ - i_sdp = 0; - i_sdp_max = 1000; - 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 ); + if( !vlc_object_alive (p_demux) || p_demux->b_error ) + { + free( p_sdp ); + goto error; + } + if( i_read < 0 ) { msg_Err( p_demux, "failed to read SDP" ); - free( p_sys ); - return VLC_EGENERIC; + free( p_sdp ); + goto error; } i_sdp += i_read; @@ -392,49 +346,356 @@ static int Open ( vlc_object_t *p_this ) p_sdp = (uint8_t*)realloc( p_sdp, i_sdp_max ); } p_sys->p_sdp = (char*)p_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 ); + } + else if( ( i_return = Connect( p_demux ) ) != VLC_SUCCESS ) + { + msg_Err( p_demux, "Failed to connect with rtsp://%s", p_sys->psz_path ); + goto error; + } - msg_Dbg( p_demux, "sdp=%s\n", p_sys->p_sdp ); + if( p_sys->p_sdp == NULL ) + { + msg_Err( p_demux, "Failed to retrieve the RTSP Session Description" ); + i_error = VLC_ENOMEM; + goto error; } - if( !( p_sys->ms = MediaSession::createNew( *p_sys->env, p_sys->p_sdp ) ) ) + + if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS ) { - msg_Err( p_demux, "MediaSession::createNew failed" ); + msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path ); + goto error; + } + + if( p_sys->b_real ) goto error; + + if( ( i_return = Play( p_demux ) ) != VLC_SUCCESS ) + goto error; + + if( p_sys->p_out_asf && ParseASF( p_demux ) ) + { + msg_Err( p_demux, "cannot find a usable asf header" ); + /* TODO Clean tracks */ + goto error; + } + + if( p_sys->i_track <= 0 ) goto error; + + 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_DemuxDelete( 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_DemuxDelete( p_sys->p_out_asf ); + if( p_sys->rtsp && p_sys->ms ) p_sys->rtsp->teardownMediaSession( *p_sys->ms ); + 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(); + if( p_sys->p_timeout ) + { + vlc_object_kill( p_sys->p_timeout ); + vlc_thread_join( p_sys->p_timeout ); + vlc_object_detach( p_sys->p_timeout ); + vlc_object_release( p_sys->p_timeout ); + } + delete p_sys->scheduler; + free( p_sys->p_sdp ); + free( p_sys->psz_path ); + + vlc_UrlClean( &p_sys->url ); + + free( p_sys ); + return i_error; +} + +/***************************************************************************** + * 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; + + 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 ); + 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_DemuxDelete( p_sys->p_out_asf ); + if( p_sys->rtsp && p_sys->ms ) p_sys->rtsp->teardownMediaSession( *p_sys->ms ); + 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(); + if( p_sys->p_timeout ) + { + vlc_object_kill( p_sys->p_timeout ); + vlc_thread_join( p_sys->p_timeout ); + vlc_object_detach( p_sys->p_timeout ); + vlc_object_release( p_sys->p_timeout ); } + delete p_sys->scheduler; + free( p_sys->p_sdp ); + free( p_sys->psz_path ); - b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" ); + vlc_UrlClean( &p_sys->url ); + + free( p_sys ); +} + +/***************************************************************************** + * Connect: connects to the RTSP server to setup the session DESCRIBE + *****************************************************************************/ +static int Connect( demux_t *p_demux ) +{ + 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; + char *psz_options = NULL; + char *p_sdp = NULL; + int i_http_port = 0; + int i_ret = VLC_SUCCESS; + int i_lefttries; + + if( p_sys->url.i_port == 0 ) p_sys->url.i_port = 554; + if( p_sys->url.psz_username || p_sys->url.psz_password ) + { + 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 ); + } + else + { + int err; + err = asprintf( &psz_url, "rtsp://%s", p_sys->psz_path ); + if( err == -1 ) return VLC_ENOMEM; + + psz_user = var_CreateGetString( p_demux, "rtsp-user" ); + psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" ); + } + + i_lefttries = 3; +createnew: + i_lefttries--; + if( !vlc_object_alive (p_demux) || p_demux->b_error ) + { + free( psz_user ); + free( psz_pwd ); + free( psz_url ); + return VLC_EGENERIC; + } + + 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, + var_CreateGetInteger( p_demux, "verbose" ) > 1, + "VLC media player", i_http_port ) ) == NULL ) + { + msg_Err( p_demux, "RTSPClient::createNew failed (%s)", + p_sys->env->getResultMsg() ); + free( psz_user ); + free( psz_pwd ); + free( psz_url ); + return VLC_EGENERIC; + } + + /* Kasenna enables KeepAlive by analysing the User-Agent string. + * Appending _KA to the string should be enough to enable this feature, + * however, there is a bug where the _KA doesn't get parsed from the + * default User-Agent as created by VLC/Live555 code. This is probably due + * to spaces in the string or the string being too long. Here we override + * the default string with a more compact version. + */ + if( var_CreateGetBool( p_demux, "rtsp-kasenna" )) + { + p_sys->rtsp->setUserAgentString( "VLC_MEDIA_PLAYER_KA" ); + } + +describe: + authenticator.setUsernameAndPassword( (const char*)psz_user, + (const char*)psz_pwd ); + + psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd, + &authenticator ); + delete [] psz_options; + + p_sdp = p_sys->rtsp->describeURL( psz_url, &authenticator, + var_GetBool( p_demux, "rtsp-kasenna" ) ); + if( p_sdp == NULL ) + { + /* failure occurred */ + int i_code = 0; + const char *psz_error = p_sys->env->getResultMsg(); + + if( var_GetBool( p_demux, "rtsp-http" ) ) + sscanf( psz_error, "%*s %*s HTTP GET %*s HTTP/%*u.%*u %3u %*s", + &i_code ); + else + { + const char *psz_tmp = strstr( psz_error, "RTSP" ); + if( psz_tmp ) + sscanf( psz_tmp, "RTSP/%*s%3u", &i_code ); + else + i_code = 0; + } + 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 ) + { + int i_result; + msg_Dbg( p_demux, "authentication failed" ); + + free( psz_user ); + free( psz_pwd ); + psz_user = psz_pwd = NULL; + + i_result = intf_UserLoginPassword( p_demux, _("RTSP authentication"), + _("Please enter a valid login name and a password."), + &psz_user, &psz_pwd ); + if( i_result == DIALOG_OK_YES ) + { + msg_Dbg( p_demux, "retrying with user=%s, pwd=%s", + psz_user, psz_pwd ); + 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 ); + if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp ); + p_sys->rtsp = NULL; + goto createnew; + } + else + { + msg_Dbg( p_demux, "connection timeout, retrying" ); + if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp ); + p_sys->rtsp = NULL; + if( i_lefttries > 0 ) + 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; + + return i_ret; +} + +/***************************************************************************** + * SessionsSetup: prepares the subsessions and does the SETUP + *****************************************************************************/ +static int SessionsSetup( demux_t *p_demux ) +{ + demux_sys_t *p_sys = p_demux->p_sys; + MediaSubsessionIterator *iter = NULL; + MediaSubsession *sub = NULL; + + bool b_rtsp_tcp = false; + int i_client_port; + int i_return = VLC_SUCCESS; + 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" ) || + 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->ms = MediaSession::createNew( *p_sys->env, p_sys->p_sdp ) ) ) + { + msg_Err( p_demux, "Could not create the RTSP Session: %s", + p_sys->env->getResultMsg() ); + return VLC_EGENERIC; + } /* Initialise each media subsession */ iter = new MediaSubsessionIterator( *p_sys->ms ); while( ( sub = iter->next() ) != NULL ) { - unsigned int i_buffer = 0; Boolean bInit; - int i_client_port; + live_track_t *tk; - i_client_port = var_CreateGetInteger( p_demux, "rtp-client-port" ); - if( i_client_port != -1 ) - sub->setClientPortNum( i_client_port ); + if( !vlc_object_alive (p_demux) || p_demux->b_error ) + { + delete iter; + return VLC_EGENERIC; + } /* Value taken from mplayer */ if( !strcmp( sub->mediumName(), "audio" ) ) i_buffer = 100000; else if( !strcmp( sub->mediumName(), "video" ) ) i_buffer = 2000000; - else - continue; + else continue; - if( !strcmp( sub->codecName(), "X-ASF-PF" ) ) - bInit = sub->initiate( 4 ); /* Constant ? */ - else - bInit = sub->initiate(); + if( i_client_port != -1 ) + { + sub->setClientPortNum( i_client_port ); + i_client_port += 2; + } if( strcasestr( sub->codecName(), "REAL" ) ) { msg_Info( p_demux, "real codec detected, using real-RTSP instead" ); - delete iter; - goto error; + p_sys->b_real = true; /* This is a problem, we'll handle it later */ + continue; } + 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)", @@ -443,391 +704,380 @@ static int Open ( vlc_object_t *p_this ) } else { - if( sub->rtpSource() ) + if( sub->rtpSource() != NULL ) { int fd = sub->rtpSource()->RTPgs()->socketNum(); + /* Increase the buffer size */ - increaseReceiveBufferTo( *p_sys->env, fd, i_buffer ); - } + if( i_buffer > 0 ) + increaseReceiveBufferTo( *p_sys->env, fd, i_buffer ); + /* Increase the RTP reorder timebuffer just a bit */ + sub->rtpSource()->setPacketReorderingThresholdTime(thresh); + } 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 ); + if( !p_sys->rtsp->setupMediaSubsession( *sub, False, + b_rtsp_tcp ? True : False, + ( p_sys->b_force_mcast && !b_rtsp_tcp ) ? 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, + !b_rtsp_tcp ? False : True, + False ) ) + { + 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 */ + if( sub->readSource() == NULL ) continue; 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 ) - { - /* The PLAY */ - 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 ) ) + tk = (live_track_t*)malloc( sizeof( live_track_t ) ); + if( !tk ) { - msg_Err( p_demux, "cannot spawn liveMedia timeout thread" ); delete iter; - vlc_object_destroy( p_sys->p_timeout ); - goto error; + return VLC_ENOMEM; } - msg_Dbg( p_demux, "spawned timeout thread" ); - vlc_object_attach( p_sys->p_timeout, p_demux ); - } - } - - /* Create all es struct */ - iter->reset(); - while( ( sub = iter->next() ) != NULL ) - { - live_track_t *tk; - - if( sub->readSource() == NULL ) continue; - - tk = (live_track_t*)malloc( sizeof( live_track_t ) ); - tk->p_demux = p_demux; - tk->waiting = 0; - tk->i_pts = 0; - tk->b_quicktime = VLC_FALSE; - tk->b_muxed = VLC_FALSE; - tk->b_asf = VLC_FALSE; - tk->b_rtcp_sync = VLC_FALSE; - tk->p_out_muxed = NULL; - tk->p_es = NULL; - tk->i_buffer = 65536; - tk->p_buffer = (uint8_t *)malloc( 65536 ); - - /* Value taken from mplayer */ - if( !strcmp( sub->mediumName(), "audio" ) ) - { - 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->rtpTimestampFrequency(); - - if( !strcmp( sub->codecName(), "MPA" ) || - !strcmp( sub->codecName(), "MPA-ROBUST" ) || - !strcmp( sub->codecName(), "X-MP3-DRAFT-00" ) ) + tk->p_demux = p_demux; + tk->sub = sub; + tk->p_es = NULL; + tk->b_quicktime = false; + tk->b_asf = false; + tk->b_muxed = false; + tk->p_out_muxed = NULL; + tk->waiting = 0; + tk->b_rtcp_sync = false; + tk->i_pts = 0; + tk->i_buffer = 65536; + tk->p_buffer = (uint8_t *)malloc( 65536 ); + if( !tk->p_buffer ) { - tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' ); - tk->fmt.audio.i_rate = 0; - } - else if( !strcmp( sub->codecName(), "AC3" ) ) - { - tk->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); - tk->fmt.audio.i_rate = 0; - } - else if( !strcmp( sub->codecName(), "L16" ) ) - { - tk->fmt.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' ); - tk->fmt.audio.i_bitspersample = 16; - } - else if( !strcmp( sub->codecName(), "L8" ) ) - { - tk->fmt.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' ); - tk->fmt.audio.i_bitspersample = 8; - } - else if( !strcmp( sub->codecName(), "PCMU" ) ) - { - tk->fmt.i_codec = VLC_FOURCC( 'u', 'l', 'a', 'w' ); - } - else if( !strcmp( sub->codecName(), "PCMA" ) ) - { - 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' ); + delete iter; + return VLC_ENOMEM; } - else if( !strcmp( sub->codecName(), "MP4A-LATM" ) ) - { - unsigned int i_extra; - uint8_t *p_extra; - tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); + /* Value taken from mplayer */ + if( !strcmp( sub->mediumName(), "audio" ) ) + { + 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->rtpTimestampFrequency(); - if( ( p_extra = parseStreamMuxConfigStr( sub->fmtp_config(), - i_extra ) ) ) + if( !strcmp( sub->codecName(), "MPA" ) || + !strcmp( sub->codecName(), "MPA-ROBUST" ) || + !strcmp( sub->codecName(), "X-MP3-DRAFT-00" ) ) { - 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; + tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', 'g', 'a' ); + tk->fmt.audio.i_rate = 0; } - -#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" ) ) - { - unsigned int i_extra; - uint8_t *p_extra; - - tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); - - if( ( p_extra = parseGeneralConfigStr( sub->fmtp_config(), - i_extra ) ) ) + else if( !strcmp( sub->codecName(), "AC3" ) ) { - 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; + tk->fmt.i_codec = VLC_FOURCC( 'a', '5', '2', ' ' ); + tk->fmt.audio.i_rate = 0; } - } - 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 ); - } - } - else if( !strcmp( sub->mediumName(), "video" ) ) - { - 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' ); - } - else if( !strcmp( sub->codecName(), "H263" ) || - !strcmp( sub->codecName(), "H263-1998" ) || - !strcmp( sub->codecName(), "H263-2000" ) ) - { - tk->fmt.i_codec = VLC_FOURCC( 'H', '2', '6', '3' ); - } - else if( !strcmp( sub->codecName(), "H261" ) ) - { - 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 ) ) ) + else if( !strcmp( sub->codecName(), "L16" ) ) { - 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; + tk->fmt.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' ); + tk->fmt.audio.i_bitspersample = 16; + } + else if( !strcmp( sub->codecName(), "L8" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' ); + tk->fmt.audio.i_bitspersample = 8; + } + else if( !strcmp( sub->codecName(), "PCMU" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'u', 'l', 'a', 'w' ); + } + else if( !strcmp( sub->codecName(), "PCMA" ) ) + { + 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; + uint8_t *p_extra; + + tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); + + 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; + } + /* 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" ) ) + { + unsigned int i_extra; + uint8_t *p_extra; + + tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'a' ); + + if( ( p_extra = parseGeneralConfigStr( 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; + } + } + else if( !strcmp( sub->codecName(), "X-ASF-PF" ) ) + { + tk->b_asf = true; + if( p_sys->p_out_asf == NULL ) + p_sys->p_out_asf = stream_DemuxNew( p_demux, "asf", + p_demux->out ); + } + else if( !strcmp( sub->codecName(), "X-QT" ) || + !strcmp( sub->codecName(), "X-QUICKTIME" ) ) + { + tk->b_quicktime = 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; + } } -#endif - } - else if( !strcmp( sub->codecName(), "JPEG" ) ) - { - tk->fmt.i_codec = VLC_FOURCC( 'M', 'J', 'P', 'G' ); } - else if( !strcmp( sub->codecName(), "MP4V-ES" ) ) + else if( !strcmp( sub->mediumName(), "video" ) ) { - unsigned int i_extra; - uint8_t *p_extra; + 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' ); + } + else if( !strcmp( sub->codecName(), "H263" ) || + !strcmp( sub->codecName(), "H263-1998" ) || + !strcmp( sub->codecName(), "H263-2000" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'H', '2', '6', '3' ); + } + else if( !strcmp( sub->codecName(), "H261" ) ) + { + tk->fmt.i_codec = VLC_FOURCC( 'H', '2', '6', '1' ); + } + else if( !strcmp( sub->codecName(), "H264" ) ) + { + unsigned int i_extra = 0; + uint8_t *p_extra = NULL; + + tk->fmt.i_codec = VLC_FOURCC( 'h', '2', '6', '4' ); + tk->fmt.b_packetized = false; - tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); + 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 ); - if( ( p_extra = parseGeneralConfigStr( sub->fmtp_config(), - i_extra ) ) ) + delete[] p_extra; + } + } + else if( !strcmp( sub->codecName(), "JPEG" ) ) { - 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; + tk->fmt.i_codec = VLC_FOURCC( 'M', 'J', 'P', 'G' ); + } + else if( !strcmp( sub->codecName(), "MP4V-ES" ) ) + { + unsigned int i_extra; + uint8_t *p_extra; + + tk->fmt.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); + + if( ( p_extra = parseGeneralConfigStr( 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; + } + } + 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 = true; + } + else if( !strcmp( sub->codecName(), "MP2T" ) ) + { + tk->b_muxed = true; + tk->p_out_muxed = stream_DemuxNew( p_demux, "ts", p_demux->out ); + } + else if( !strcmp( sub->codecName(), "MP2P" ) || + !strcmp( sub->codecName(), "MP1S" ) ) + { + tk->b_muxed = true; + tk->p_out_muxed = stream_DemuxNew( p_demux, "ps", + p_demux->out ); + } + else if( !strcmp( sub->codecName(), "X-ASF-PF" ) ) + { + tk->b_asf = true; + if( p_sys->p_out_asf == NULL ) + p_sys->p_out_asf = stream_DemuxNew( p_demux, "asf", + p_demux->out );; } } - 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; - } - else if( !strcmp( sub->codecName(), "MP2T" ) ) + + if( !tk->b_quicktime && !tk->b_muxed && !tk->b_asf ) { - tk->b_muxed = VLC_TRUE; - tk->p_out_muxed = stream_DemuxNew( p_demux, "ts", p_demux->out ); + tk->p_es = es_out_Add( p_demux->out, &tk->fmt ); } - else if( !strcmp( sub->codecName(), "MP2P" ) || - !strcmp( sub->codecName(), "MP1S" ) ) + + if( sub->rtcpInstance() != NULL ) { - tk->b_muxed = VLC_TRUE; - tk->p_out_muxed = stream_DemuxNew( p_demux, "ps", - p_demux->out ); + sub->rtcpInstance()->setByeHandler( StreamClose, tk ); } - else if( !strcmp( sub->codecName(), "X-ASF-PF" ) ) + + if( tk->p_es || tk->b_quicktime || tk->b_muxed || tk->b_asf ) { - 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 );; + /* Append */ + p_sys->track = (live_track_t**)realloc( p_sys->track, sizeof( live_track_t ) * ( p_sys->i_track + 1 ) ); + p_sys->track[p_sys->i_track++] = tk; } - } - - tk->p_es = es_out_Add( p_demux->out, &tk->fmt ); - - if( sub->rtcpInstance() != NULL ) - { - sub->rtcpInstance()->setByeHandler( StreamClose, tk ); - } - - if( tk->p_es || tk->b_quicktime || tk->b_muxed || tk->b_asf ) - { - tk->readSource = sub->readSource(); - tk->rtpSource = sub->rtpSource(); - - /* Append */ - p_sys->track = (live_track_t**)realloc( p_sys->track, sizeof( live_track_t ) * ( p_sys->i_track + 1 ) ); - p_sys->track[p_sys->i_track++] = tk; - } - else - { - free( tk ); - } - } - - delete iter; - - if( p_sys->p_out_asf && ParseASF( p_demux ) ) - { - msg_Err( p_demux, "cannot find a usable asf header" ); - /* TODO Clean tracks */ - goto error; - } - - p_sys->i_length = (mtime_t)(p_sys->ms->playEndTime() * 1000000.0); - if( p_sys->i_length < 0 ) - { - p_sys->i_length = 0; - } - else if( p_sys->i_length > 0 ) - { - /* FIXME */ - /* p_input->stream.p_selected_area->i_size = 1000;*/ /* needed for now */ - } - - if( p_sys->i_track <= 0 ) - { - msg_Err( p_demux, "no codec supported, aborting" ); - goto error; + else + { + /* BUG ??? */ + msg_Err( p_demux, "unusable RTSP track. this should not happen" ); + es_format_Clean( &tk->fmt ); + free( tk ); + } + } } + delete iter; + if( p_sys->i_track <= 0 ) i_return = VLC_EGENERIC; - return VLC_SUCCESS; + /* Retrieve the starttime if possible */ + p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); + if( p_sys->i_npt_start < 0 ) + p_sys->i_npt_start = -1; -error: - 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 ) - { - 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 ); + /* Retrieve the duration if possible */ + p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); + if( p_sys->i_npt_length < 0 ) + p_sys->i_npt_length = -1; - free( p_sys ); - return VLC_EGENERIC; + msg_Dbg( p_demux, "setup start: %lld stop:%lld", p_sys->i_npt_start, p_sys->i_npt_length ); + return i_return; } /***************************************************************************** - * DemuxClose: + * Play: starts the actual playback of the stream *****************************************************************************/ -static void Close( vlc_object_t *p_this ) +static int Play( demux_t *p_demux ) { - demux_t *p_demux = (demux_t*)p_this; demux_sys_t *p_sys = p_demux->p_sys; int i; - for( i = 0; i < p_sys->i_track; i++ ) + if( p_sys->rtsp ) { - live_track_t *tk = p_sys->track[i]; + /* The PLAY */ + if( !p_sys->rtsp->playMediaSession( *p_sys->ms, p_sys->i_npt_start, -1, 1 ) ) + { + msg_Err( p_demux, "RTSP PLAY failed %s", p_sys->env->getResultMsg() ); + return VLC_EGENERIC; + } - if( tk->b_muxed ) stream_DemuxDelete( tk->p_out_muxed ); - free( tk->p_buffer ); - free( tk ); - } + /* 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->i_timeout = 60; /* default value from RFC2326 */ - if( p_sys->i_track ) free( p_sys->track ); - if( p_sys->p_out_asf ) stream_DemuxDelete( p_sys->p_out_asf ); + /* start timeout-thread only on x-asf streams (wms), it has rtcp support but doesn't + * seem to use it for liveness/keep-alive, get_parameter seems to work for it. get_parameter + * doesn't work with dss 5.5.4 & 5.5.5, they seems to work with rtcp */ + if( !p_sys->p_timeout && p_sys->p_out_asf ) + { + 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, true ) ) + { + msg_Err( p_demux, "cannot spawn liveMedia timeout thread" ); + vlc_object_release( p_sys->p_timeout ); + } + msg_Dbg( p_demux, "spawned timeout thread" ); + vlc_object_attach( p_sys->p_timeout, p_demux ); + } + } + p_sys->i_pcr = 0; - if( p_sys->rtsp && p_sys->ms ) + for( i = 0; i < p_sys->i_track; i++ ) { - /* TEARDOWN */ - p_sys->rtsp->teardownMediaSession( *p_sys->ms ); + if( !p_sys->track[i]->b_rtcp_sync ) + 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_Info( p_demux, "set startseq: %u", p_sys->track[i]->i_start_seq ); } - Medium::close( p_sys->ms ); + /* Retrieve the starttime if possible */ + p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); + if( p_sys->i_npt_start < 0 ) + p_sys->i_npt_start = -1; - if( p_sys->p_timeout ) - { - 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 ); - } + p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); + if( p_sys->i_npt_length < 0 ) + p_sys->i_npt_length = -1; - 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 ); + msg_Dbg( p_demux, "play start: %lld stop:%lld", p_sys->i_npt_start, p_sys->i_npt_length ); + return VLC_SUCCESS; } + /***************************************************************************** * Demux: *****************************************************************************/ @@ -836,27 +1086,26 @@ static int Demux( demux_t *p_demux ) demux_sys_t *p_sys = p_demux->p_sys; TaskToken task; - vlc_bool_t b_send_pcr = VLC_TRUE; - mtime_t i_pcr = 0; + bool b_send_pcr = true; + int64_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; + p_sys->b_timeout_call = false; } + for( i = 0; i < p_sys->i_track; i++ ) { live_track_t *tk = p_sys->track[i]; if( tk->b_asf || tk->b_muxed ) - b_send_pcr = VLC_FALSE; - + b_send_pcr = false; +#if 0 if( i_pcr == 0 ) { i_pcr = tk->i_pts; @@ -865,43 +1114,15 @@ static int Demux( demux_t *p_demux ) { i_pcr = tk->i_pts ; } +#endif } - if( i_pcr != p_sys->i_pcr && i_pcr > 0 ) + if( p_sys->i_pcr > 0 ) { - p_sys->i_pcr = i_pcr; - if( b_send_pcr ) - es_out_Control( p_demux->out, ES_OUT_SET_PCR, i_pcr ); - if( p_sys->i_pcr_start <= 0 || p_sys->i_pcr_start > i_pcr || - ( p_sys->i_length > 0 && i_pcr - p_sys->i_pcr_start > p_sys->i_length ) ) - { - p_sys->i_pcr_start = i_pcr; - } - } - - /* 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; + es_out_Control( p_demux->out, ES_OUT_SET_PCR, p_sys->i_pcr ); } - /* First warm we want to read data */ + /* First warn we want to read data */ p_sys->event = 0; for( i = 0; i < p_sys->i_track; i++ ) { @@ -910,7 +1131,7 @@ static int Demux( demux_t *p_demux ) if( tk->waiting == 0 ) { tk->waiting = 1; - tk->readSource->getNextFrame( tk->p_buffer, tk->i_buffer, + tk->sub->readSource()->getNextFrame( tk->p_buffer, tk->i_buffer, StreamRead, tk, StreamClose, tk ); } } @@ -929,31 +1150,32 @@ static int Demux( demux_t *p_demux ) live_track_t *tk = p_sys->track[i]; if( !tk->b_muxed && !tk->b_rtcp_sync && - tk->rtpSource && tk->rtpSource->hasBeenSynchronizedUsingRTCP() ) + tk->sub->rtpSource() && tk->sub->rtpSource()->hasBeenSynchronizedUsingRTCP() ) { msg_Dbg( p_demux, "tk->rtpSource->hasBeenSynchronizedUsingRTCP()" ); es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); - tk->b_rtcp_sync = VLC_TRUE; - - /* reset PCR and PCR start, mmh won't work well for multi-stream I fear */ + tk->b_rtcp_sync = true; + /* reset PCR */ tk->i_pts = 0; - p_sys->i_pcr_start = 0; p_sys->i_pcr = 0; i_pcr = 0; } } - 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" ); + bool 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 ) { @@ -963,21 +1185,17 @@ static int Demux( demux_t *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; + return 1; } + 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 ) + else if( !p_sys->b_multicast && p_sys->i_no_data_ti > 34 ) { /* EOF ? */ msg_Warn( p_demux, "no data received in 10s, eof ?" ); - return 0; + return 0; } - return p_demux->b_error ? 0 : 1; } @@ -989,106 +1207,193 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) demux_sys_t *p_sys = p_demux->p_sys; int64_t *pi64; double *pf, f; - vlc_bool_t *pb, b_bool; + bool *pb, *pb2, b_bool; + int *pi_int; switch( i_query ) { case DEMUX_GET_TIME: - pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = p_sys->i_pcr - p_sys->i_pcr_start + p_sys->i_start; - return VLC_SUCCESS; + return VLC_EGENERIC; case DEMUX_GET_LENGTH: pi64 = (int64_t*)va_arg( args, int64_t * ); - *pi64 = p_sys->i_length; - return VLC_SUCCESS; - - case DEMUX_GET_POSITION: - 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); - } - else + if( p_sys->i_npt_length > 0 ) { - *pf = 0; + *pi64 = p_sys->i_npt_length; + return VLC_SUCCESS; } - return VLC_SUCCESS; + return VLC_EGENERIC; + + case DEMUX_GET_POSITION: + return VLC_EGENERIC; case DEMUX_SET_POSITION: { float time; f = (double)va_arg( args, double ); - time = f * (double)p_sys->i_length / 1000000.0; /* in second */ - - if( p_sys->rtsp && p_sys->i_length > 0 ) + if( p_sys->rtsp && p_sys->i_npt_length > 0 ) { - if( !p_sys->rtsp->playMediaSession( *p_sys->ms, time ) ) + int i; + time = f * (double)p_sys->i_npt_length / (double)1000000.0; /* in second */ + if( !p_sys->rtsp->playMediaSession( *p_sys->ms, time, -1, 1 ) ) { msg_Err( p_demux, "PLAY failed %s", p_sys->env->getResultMsg() ); return VLC_EGENERIC; } - p_sys->i_start = (mtime_t)(f * (double)p_sys->i_length); - p_sys->i_pcr_start = 0; - p_sys->i_pcr = 0; + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + p_sys->i_pcr = 0; + + /* Retrieve RTP-Info values */ + for( i = 0; i < p_sys->i_track; i++ ) + { + p_sys->track[i]->b_rtcp_sync = false; + 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_Info( p_demux, "set pos startseq: %u", p_sys->track[i]->i_start_seq ); + } + + /* Retrieve the starttime if possible */ + p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); + if( p_sys->i_npt_start < 0 ) + p_sys->i_npt_start = -1; + + /* Retrieve the duration if possible */ + p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); + if( p_sys->i_npt_length < 0 ) + p_sys->i_npt_length = -1; + msg_Dbg( p_demux, "seek start: %lld stop:%lld", p_sys->i_npt_start, p_sys->i_npt_length ); return VLC_SUCCESS; } - return VLC_SUCCESS; + return VLC_EGENERIC; } - /* Special for access_demux */ case DEMUX_CAN_PAUSE: - pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); - if( p_sys->rtsp && p_sys->i_length ) + case DEMUX_CAN_SEEK: + pb = (bool*)va_arg( args, bool * ); + if( p_sys->rtsp && p_sys->i_npt_length ) /* Not always true, but will be handled in SET_PAUSE_STATE */ - *pb = VLC_TRUE; + *pb = true; else - *pb = VLC_FALSE; + *pb = false; return VLC_SUCCESS; case DEMUX_CAN_CONTROL_PACE: - pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * ); + pb = (bool*)va_arg( args, bool * ); -#if 0 /* Disable for now until we have a clock synchro algo +#if 1 /* Disable for now until we have a clock synchro algo * which works with something else than MPEG over UDP */ - *pb = VLC_FALSE; + *pb = false; #else - *pb = VLC_TRUE; + *pb = true; #endif return VLC_SUCCESS; - case DEMUX_SET_PAUSE_STATE: - double d_npt; +#if 0 + case DEMUX_CAN_CONTROL_RATE: + pb = (bool*)va_arg( args, bool * ); + pb2 = (bool*)va_arg( args, bool * ); + + *pb = p_sys->rtsp != NULL && p_sys->i_npt_length > 0 && !var_GetBool( p_demux, "rtsp-kasenna" ); + *pb2 = false; + return VLC_SUCCESS; + + case DEMUX_SET_RATE: + { + double f_scale; + + if( !p_sys->rtsp || p_sys->i_npt_length <= 0 || var_GetBool( p_demux, "rtsp-kasenna" ) ) + return VLC_EGENERIC; + + /* TODO we might want to ensure that the new rate is different from + * old rate after playMediaSession... + * I have no idea how the server map the requested rate to the + * ones it supports. + * ex: + * current is x2 we request x1.5 if the server return x2 we will + * never succeed to return to x1. + * In this case we should retry with a lower rate until we have + * one (even x1). + */ + + pi_int = (int*)va_arg( args, int * ); + f_scale = (double)INPUT_RATE_DEFAULT / (*p_int); + + /* Passing -1 for the start and end time will mean liveMedia won't + * create a Range: section for the RTSP message. The server should + * pick up from the current position */ + if( !p_sys->rtsp->playMediaSession( *p_sys->ms, -1, -1, f_scale ) ) + { + msg_Err( p_demux, "PLAY with Scale %0.2f failed %s", f_scale, + p_sys->env->getResultMsg() ); + return VLC_EGENERIC; + } + /* ReSync the stream */ + p_sys->i_npt_start = 0; + p_sys->i_pcr = 0; + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + + *pi_int = (int)( INPUT_RATE_DEFAULT / p_sys->ms->scale() + 0.5 ); + return VLC_SUCCESS; + } +#endif - d_npt = ( (double)( p_sys->i_pcr - p_sys->i_pcr_start + - p_sys->i_start ) ) / 1000000.00; + case DEMUX_SET_PAUSE_STATE: + { + int i; - b_bool = (vlc_bool_t)va_arg( args, vlc_bool_t ); + b_bool = (bool)va_arg( args, int ); if( p_sys->rtsp == NULL ) return VLC_EGENERIC; + /* FIXME */ 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 ) ) ) + -1 ) ) ) { msg_Err( p_demux, "PLAY or PAUSE failed %s", p_sys->env->getResultMsg() ); return VLC_EGENERIC; } -#if 0 - /* reset PCR and PCR start, mmh won't work well for multi-stream I fear */ + + /* When we Pause, we'll need the TimeoutPrevention thread to + * handle sending the "Keep Alive" message to the server. + * Unfortunately Live555 isn't thread safe and so can't + * do this normally while the main Demux thread is handling + * a live stream. We end up with the Timeout thread blocking + * waiting for a response from the server. So when we PAUSE + * we set a flag that the TimeoutPrevention function will check + * and if it's set, it will trigger the GET_PARAMETER message */ + if( b_bool && p_sys->p_timeout != NULL ) + p_sys->p_timeout->b_handle_keep_alive = true; + else if( !b_bool && p_sys->p_timeout != NULL ) + p_sys->p_timeout->b_handle_keep_alive = false; + + es_out_Control( p_demux->out, ES_OUT_RESET_PCR ); + p_sys->i_pcr = 0; + for( i = 0; i < p_sys->i_track; i++ ) { - p_sys->track[i]->i_pts = 0; + if( !p_sys->track[i]->b_rtcp_sync ) + p_sys->track[i]->i_pts = 0; // (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_Info( p_demux, "set pause startseq: %u", p_sys->track[i]->i_start_seq ); } - p_sys->i_pcr_start = 0; /* FIXME Wrong */ - p_sys->i_pcr = 0; -#endif - return VLC_SUCCESS; + /* Retrieve the starttime if possible */ + p_sys->i_npt_start = (int64_t)( p_sys->ms->playStartTime() * (double)1000000.0 ); + if( p_sys->i_npt_start < 0 ) + p_sys->i_npt_start = -1; + + /* Retrieve the duration if possible */ + p_sys->i_npt_length = (int64_t)( p_sys->ms->playEndTime() * (double)1000000.0 ); + if( p_sys->i_npt_length < 0 ) + p_sys->i_npt_length = -1; + + msg_Dbg( p_demux, "pause start: %lld stop:%lld", p_sys->i_npt_start, p_sys->i_npt_length ); + return VLC_SUCCESS; + } case DEMUX_GET_TITLE_INFO: case DEMUX_SET_TITLE: case DEMUX_SET_SEEKPOINT: @@ -1107,139 +1412,65 @@ static int Control( demux_t *p_demux, int i_query, va_list args ) /***************************************************************************** * RollOverTcp: reopen the rtsp into TCP mode * XXX: ugly, a lot of code are duplicated from Open() + * This should REALLY be fixed *****************************************************************************/ 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; + int i, i_return; + + var_SetBool( p_demux, "rtsp-tcp", true ); /* We close the old RTSP session */ - p_sys->rtsp->teardownMediaSession( *p_sys->ms ); + 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->p_es ) es_out_Del( p_demux->out, tk->p_es ); + 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_DemuxDelete( p_sys->p_out_asf ); + p_sys->rtsp->teardownMediaSession( *p_sys->ms ); Medium::close( p_sys->ms ); - Medium::close( p_sys->rtsp ); + RTSPClient::close( p_sys->rtsp ); p_sys->ms = NULL; p_sys->rtsp = NULL; + p_sys->track = NULL; + p_sys->i_track = 0; /* 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 ) + if( ( i_return = Connect( p_demux ) ) != VLC_SUCCESS ) { - 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 */ ); + msg_Err( p_demux, "Failed to connect with rtsp://%s", + p_sys->psz_path ); + goto error; } - /* The PLAY */ - if( !p_sys->rtsp->playMediaSession( *p_sys->ms ) ) + if( p_sys->p_sdp == NULL ) { - msg_Err( p_demux, "PLAY failed %s", p_sys->env->getResultMsg() ); - return VLC_EGENERIC; + msg_Err( p_demux, "Failed to retrieve the RTSP Session Description" ); + goto error; } - /* Update all tracks */ - iter->reset(); - i_tk = 0; - while( ( sub = iter->next() ) != NULL ) + if( ( i_return = SessionsSetup( p_demux ) ) != VLC_SUCCESS ) { - 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++; + msg_Err( p_demux, "Nothing to play for rtsp://%s", p_sys->psz_path ); + goto error; } - delete iter; + if( ( i_return = Play( p_demux ) ) != VLC_SUCCESS ) + goto error; return VLC_SUCCESS; + +error: + return VLC_EGENERIC; } @@ -1255,34 +1486,70 @@ static void StreamRead( void *p_private, unsigned int i_size, demux_sys_t *p_sys = p_demux->p_sys; block_t *p_block; - mtime_t i_pts = (uint64_t)pts.tv_sec * UI64C(1000000) + + //msg_Dbg( p_demux, "pts: %d", pts.tv_sec ); + + int64_t i_pts = (uint64_t)pts.tv_sec * UINT64_C(1000000) + (uint64_t)pts.tv_usec; /* XXX Beurk beurk beurk Avoid having negative value XXX */ - i_pts &= UI64C(0x00ffffffffffffff); + i_pts &= UINT64_C(0x00ffffffffffffff); if( tk->b_quicktime && tk->p_es == NULL ) { QuickTimeGenericRTPSource *qtRTPSource = - (QuickTimeGenericRTPSource*)tk->rtpSource; + (QuickTimeGenericRTPSource*)tk->sub->rtpSource(); QuickTimeGenericRTPSource::QTState &qtState = qtRTPSource->qtState; uint8_t *sdAtom = (uint8_t*)&qtState.sdAtom[4]; - if( qtState.sdAtomSize < 16 + 32 ) - { - /* invalid */ - p_sys->event = 0xff; - tk->waiting = 0; - return; - } - 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]; - - tk->fmt.i_extra = qtState.sdAtomSize - 16; - tk->fmt.p_extra = malloc( tk->fmt.i_extra ); - memcpy( tk->fmt.p_extra, &sdAtom[12], tk->fmt.i_extra ); + if( tk->fmt.i_cat == VIDEO_ES ) { + if( qtState.sdAtomSize < 16 + 32 ) + { + /* invalid */ + p_sys->event = 0xff; + tk->waiting = 0; + return; + } + 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]; + if( tk->fmt.i_codec == VLC_FOURCC('a', 'v', 'c', '1') ) + { + uint8_t *pos = (uint8_t*)qtRTPSource->qtState.sdAtom + 86; + uint8_t *endpos = (uint8_t*)qtRTPSource->qtState.sdAtom + + qtRTPSource->qtState.sdAtomSize; + while (pos+8 < endpos) { + unsigned int atomLength = pos[0]<<24 | pos[1]<<16 | pos[2]<<8 | pos[3]; + if( atomLength == 0 || atomLength > (unsigned int)(endpos-pos)) break; + if( memcmp(pos+4, "avcC", 4) == 0 && + atomLength > 8 && + atomLength <= INT_MAX ) + { + tk->fmt.i_extra = atomLength-8; + tk->fmt.p_extra = malloc( tk->fmt.i_extra ); + memcpy(tk->fmt.p_extra, pos+8, atomLength-8); + break; + } + pos += atomLength; + } + } + else + { + tk->fmt.i_extra = qtState.sdAtomSize - 16; + tk->fmt.p_extra = malloc( tk->fmt.i_extra ); + memcpy( tk->fmt.p_extra, &sdAtom[12], tk->fmt.i_extra ); + } + } + else { + if( qtState.sdAtomSize < 4 ) + { + /* invalid */ + p_sys->event = 0xff; + tk->waiting = 0; + return; + } + tk->fmt.i_codec = VLC_FOURCC(sdAtom[0],sdAtom[1],sdAtom[2],sdAtom[3]); + } tk->p_es = es_out_Add( p_demux->out, &tk->fmt ); } @@ -1301,7 +1568,7 @@ static void StreamRead( void *p_private, unsigned int i_size, msg_Dbg( p_demux, "increasing buffer size to %d", tk->i_buffer * 2 ); tk->i_buffer *= 2; p_tmp = realloc( tk->p_buffer, tk->i_buffer ); - if (p_tmp == NULL) + if( p_tmp == NULL ) { msg_Warn( p_demux, "realloc failed" ); } @@ -1318,7 +1585,7 @@ static void StreamRead( void *p_private, unsigned int i_size, 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; + AMRAudioSource *amrSource = (AMRAudioSource*)tk->sub->readSource(); p_block = block_New( p_demux, i_size + 1 ); p_block->p_buffer[0] = amrSource->lastFrameHeader(); @@ -1326,21 +1593,16 @@ static void StreamRead( void *p_private, unsigned int 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; + H261VideoRTPSource *h261Source = (H261VideoRTPSource*)tk->sub->rtpSource(); uint32_t header = h261Source->lastSpecialHeader(); -#else - uint32_t header = 0; - msg_Warn( p_demux, "need livemedia library >= \"2004.04.09\"" ); -#endif 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() ) + if( tk->sub->rtpSource()->curPacketMarkerBit() ) p_block->i_flags |= BLOCK_FLAG_END_OF_FRAME; } - else if( tk->fmt.i_codec == VLC_FOURCC('H','2','6','4') ) + 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" ); @@ -1366,13 +1628,20 @@ static void StreamRead( void *p_private, unsigned int i_size, memcpy( p_block->p_buffer, tk->p_buffer, i_size ); } - //p_block->i_rate = p_input->stream.control.i_rate; + if( p_sys->i_pcr < i_pts ) + { + p_sys->i_pcr = i_pts; + } - if( i_pts != tk->i_pts && !tk->b_muxed ) + if( (i_pts != tk->i_pts) && (!tk->b_muxed) ) { - p_block->i_dts = ( tk->fmt.i_cat == VIDEO_ES ) ? 0 : i_pts; p_block->i_pts = i_pts; } + 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_FOURCC( 'm', 'p', 'g', 'v' ) ) ? 0 : i_pts; + } if( tk->b_muxed ) { @@ -1387,12 +1656,12 @@ static void StreamRead( void *p_private, unsigned int i_size, es_out_Send( p_demux->out, tk->p_es, p_block ); } - /* warm that's ok */ + /* warn that's ok */ p_sys->event = 0xff; /* we have read data */ tk->waiting = 0; - p_demux->p_sys->b_no_data = VLC_FALSE; + p_demux->p_sys->b_no_data = false; p_demux->p_sys->i_no_data_ti = 0; if( i_pts > 0 && !tk->b_muxed ) @@ -1413,7 +1682,7 @@ static void StreamClose( void *p_private ) msg_Dbg( p_demux, "StreamClose" ); p_sys->event = 0xff; - p_demux->b_error = VLC_TRUE; + p_demux->b_error = true; } @@ -1431,25 +1700,34 @@ static void TaskInterrupt( void *p_private ) } /***************************************************************************** - * + * *****************************************************************************/ static void TimeoutPrevention( timeout_thread_t *p_timeout ) { - p_timeout->b_die = VLC_FALSE; + p_timeout->b_die = 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 ) + while( vlc_object_alive (p_timeout) ) { if( p_timeout->i_remain <= 0 ) { + char *psz_bye = NULL; 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" ); + if( p_timeout->b_handle_keep_alive == true ) + { + p_timeout->p_sys->rtsp->getMediaSessionParameter( *p_timeout->p_sys->ms, NULL, psz_bye ); + p_timeout->p_sys->b_timeout_call = false; + } + else + { + p_timeout->p_sys->b_timeout_call = true; + } } p_timeout->i_remain -= 200000; msleep( 200000 ); /* 200 ms */ @@ -1498,7 +1776,7 @@ static int ParseASF( demux_t *p_demux ) } /* Parse it to get packet size */ - E_(asf_HeaderParse)( &p_sys->asfh, p_header->p_buffer, p_header->i_buffer ); + asf_HeaderParse( &p_sys->asfh, p_header->p_buffer, p_header->i_buffer ); /* Send it to demuxer */ stream_DemuxSend( p_sys->p_out_asf, p_header ); @@ -1507,11 +1785,12 @@ static int ParseASF( demux_t *p_demux ) return VLC_SUCCESS; } -#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1117756800 + static unsigned char* parseH264ConfigStr( char const* configStr, unsigned int& configSize ) { char *dup, *psz; + int i, i_records = 1; if( configSize ) configSize = 0; @@ -1521,28 +1800,32 @@ static unsigned char* parseH264ConfigStr( char const* configStr, psz = dup = strdup( configStr ); - unsigned char *cfg = new unsigned char[5 * strlen(psz)]; - for( ;; ) + /* Count the number of comma's */ + for( psz = dup; *psz != '\0'; ++psz ) { - char *p = strchr( psz, ',' ); - if( p ) - *p++ = '\0'; + if( *psz == ',') + { + ++i_records; + *psz = '\0'; + } + } + unsigned char *cfg = new unsigned char[5 * strlen(dup)]; + psz = dup; + for( i = 0; i < i_records; i++ ) + { 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; + configSize += b64_decode( (char*)&cfg[configSize], psz ); + psz += strlen(psz)+1; } - if( dup ) free( dup ); + free( dup ); return cfg; } -#endif /*char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";*/ static int b64_decode( char *dest, char *src )