* Authors: Laurent Aimar <fenrir@via.ecp.fr>
* Derk-Jan Hartman <hartman at videolan. org>
* Derk-Jan Hartman <djhartman at m2x .dot. nl> for M2X
+ * Sébastien Escudier <sebastien-devel celeos eu>
*
* 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
#include <vlc_url.h>
#include <vlc_strings.h>
-#include <iostream>
#include <limits.h>
#include <assert.h>
#include <BasicUsageEnvironment.hh>
#include <GroupsockHelper.hh>
#include <liveMedia.hh>
+#include <liveMedia_version.hh>
extern "C" {
#include "../access/mms/asf.h" /* Who said ugly ? */
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
-#define CACHING_TEXT N_("Caching value (ms)")
-#define CACHING_LONGTEXT N_( \
- "Allows you to modify the default caching value for RTSP streams. This " \
- "value should be set in millisecond units." )
-
#define KASENNA_TEXT N_( "Kasenna RTSP dialect")
#define KASENNA_LONGTEXT N_( "Kasenna servers use an old and nonstandard " \
"dialect of RTSP. With this parameter VLC will try this dialect, but "\
"then it cannot connect to normal RTSP servers." )
#define WMSERVER_TEXT N_("WMServer RTSP dialect")
-#define WMSERVER_LONGTEXT N_("WMServer uses an unstandard dialect " \
+#define WMSERVER_LONGTEXT N_("WMServer uses a nonstandard dialect " \
"of RTSP. Selecting this parameter will tell VLC to assume some " \
"options contrary to RFC 2326 guidelines.")
add_submodule ()
set_description( N_("RTSP/RTP access and demux") )
- add_shortcut( "rtsp", "pnm", "sdp", "live", "livedotcom" )
+ add_shortcut( "rtsp", "pnm", "live", "livedotcom" )
set_capability( "access_demux", 0 )
set_callbacks( Open, Close )
- add_bool( "rtsp-tcp", false, NULL,
+ add_bool( "rtsp-tcp", false,
N_("Use RTP over RTSP (TCP)"),
N_("Use RTP over RTSP (TCP)"), true )
change_safe()
- add_integer( "rtp-client-port", -1, NULL,
+ add_integer( "rtp-client-port", -1,
N_("Client port"),
N_("Port to use for the RTP source of the session"), true )
- add_bool( "rtsp-mcast", false, NULL,
+ add_bool( "rtsp-mcast", false,
N_("Force multicast RTP via RTSP"),
N_("Force multicast RTP via RTSP"), true )
change_safe()
- add_bool( "rtsp-http", false, NULL,
+ add_bool( "rtsp-http", false,
N_("Tunnel RTSP and RTP over HTTP"),
N_("Tunnel RTSP and RTP over HTTP"), true )
change_safe()
- add_integer( "rtsp-http-port", 80, NULL,
+ add_integer( "rtsp-http-port", 80,
N_("HTTP tunnel port"),
N_("Port to use for tunneling the RTSP/RTP over HTTP."),
true )
- add_integer("rtsp-caching", 4 * DEFAULT_PTS_DELAY / 1000, NULL,
- CACHING_TEXT, CACHING_LONGTEXT, true )
- change_safe()
- add_bool( "rtsp-kasenna", false, NULL, KASENNA_TEXT,
+ add_bool( "rtsp-kasenna", false, KASENNA_TEXT,
KASENNA_LONGTEXT, true )
change_safe()
- add_bool( "rtsp-wmserver", false, NULL, WMSERVER_TEXT,
+ add_bool( "rtsp-wmserver", false, WMSERVER_TEXT,
WMSERVER_LONGTEXT, true)
change_safe()
- add_string( "rtsp-user", NULL, NULL, USER_TEXT,
+ add_string( "rtsp-user", NULL, USER_TEXT,
USER_LONGTEXT, true )
change_safe()
- add_password( "rtsp-pwd", NULL, NULL, PASS_TEXT,
+ add_password( "rtsp-pwd", NULL, PASS_TEXT,
PASS_LONGTEXT, true )
change_safe()
vlc_module_end ()
bool b_handle_keep_alive;
};
+class RTSPClientVlc;
+
struct demux_sys_t
{
char *p_sdp; /* XXX mallocated */
MediaSession *ms;
TaskScheduler *scheduler;
UsageEnvironment *env ;
- RTSPClient *rtsp;
+ RTSPClientVlc *rtsp;
/* */
int i_track;
bool b_no_data; /* if we never received any data */
int i_no_data_ti; /* consecutive number of TaskInterrupt */
- char event;
+ char event_rtsp;
+ char event_data;
bool b_get_param; /* Does the server support GET_PARAMETER */
bool b_paused; /* Are we paused? */
bool b_error;
+ int i_live555_ret; /* live555 callback return code */
float f_seek_request;/* In case we receive a seek request while paused*/
};
+
+class RTSPClientVlc : public RTSPClient
+{
+public:
+ RTSPClientVlc( UsageEnvironment& env, char const* rtspURL, int verbosityLevel,
+ char const* applicationName, portNumBits tunnelOverHTTPPortNum,
+ demux_sys_t *p_sys) :
+ RTSPClient( env, rtspURL, verbosityLevel, applicationName,
+ tunnelOverHTTPPortNum )
+ {
+ this->p_sys = p_sys;
+ }
+ demux_sys_t *p_sys;
+};
+
static int Demux ( demux_t * );
static int Control( demux_t *, int, va_list );
static void StreamRead ( void *, unsigned int, unsigned int,
struct timeval, unsigned int );
static void StreamClose ( void * );
-static void TaskInterrupt( void * );
+static void TaskInterruptData( void * );
+static void TaskInterruptRTSP( void * );
static void* TimeoutPrevention( void * );
return VLC_EGENERIC;
}
}
- var_Create( p_demux, "rtsp-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
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;
+ msg_Dbg( p_demux, "version "LIVEMEDIA_LIBRARY_VERSION_STRING );
+
p_sys->p_sdp = NULL;
p_sys->scheduler = NULL;
p_sys->env = NULL;
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" );
+ p_sys->psz_path = strdup( p_demux->psz_location );
+ p_sys->b_force_mcast = var_InheritBool( p_demux, "rtsp-mcast" );
p_sys->b_get_param = false;
p_sys->b_paused = false;
p_sys->f_seek_request = -1;
p_sys->b_error = false;
+ p_sys->i_live555_ret = 0;
/* parse URL for rtsp://[user:[passwd]@]serverip:port/options */
vlc_UrlParse( &p_sys->url, p_sys->psz_path, 0 );
}
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 );
demux_t *p_demux = (demux_t*)p_this;
demux_sys_t *p_sys = p_demux->p_sys;
- if( p_sys->rtsp && p_sys->ms ) p_sys->rtsp->teardownMediaSession( *p_sys->ms );
+ if( p_sys->p_timeout )
+ {
+ vlc_cancel( p_sys->p_timeout->handle );
+ vlc_join( p_sys->p_timeout->handle, NULL );
+ free( p_sys->p_timeout );
+ }
+
+ if( p_sys->rtsp && p_sys->ms ) p_sys->rtsp->sendTeardownCommand( *p_sys->ms, NULL );
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->i_track ) free( p_sys->track );
if( p_sys->p_out_asf ) stream_Delete( p_sys->p_out_asf );
- if( p_sys->p_timeout )
- {
- vlc_cancel( p_sys->p_timeout->handle );
- vlc_join( p_sys->p_timeout->handle, NULL );
- free( p_sys->p_timeout );
- }
delete p_sys->scheduler;
free( p_sys->p_sdp );
free( p_sys->psz_path );
static inline const char *strempty( const char *s ) { return s?s:""; }
static inline Boolean toBool( bool b ) { return b?True:False; } // silly, no?
+static void default_live555_callback( RTSPClient* client, int result_code, char* result_string )
+{
+ RTSPClientVlc *client_vlc = static_cast<RTSPClientVlc *> ( client );
+ demux_sys_t *p_sys = client_vlc->p_sys;
+ delete []result_string;
+ p_sys->i_live555_ret = result_code;
+ p_sys->b_error = p_sys->i_live555_ret != 0;
+ p_sys->event_rtsp = 1;
+}
+
+/* return true if the RTSP command succeeded */
+static bool wait_Live555_response( demux_t *p_demux, int i_timeout = 0 /* ms */ )
+{
+ TaskToken task;
+ demux_sys_t * p_sys = p_demux->p_sys;
+ p_sys->event_rtsp = 0;
+ if( i_timeout > 0 )
+ {
+ /* Create a task that will be called if we wait more than timeout ms */
+ task = p_sys->scheduler->scheduleDelayedTask( i_timeout*1000,
+ TaskInterruptRTSP,
+ p_demux );
+ }
+ p_sys->event_rtsp = 0;
+ p_sys->b_error = true;
+ p_sys->i_live555_ret = 0;
+ p_sys->scheduler->doEventLoop( &p_sys->event_rtsp );
+ //here, if b_error is true and i_live555_ret = 0 we didn't receive a response
+ if( i_timeout > 0 )
+ {
+ /* remove the task */
+ p_sys->scheduler->unscheduleDelayedTask( task );
+ }
+ return !p_sys->b_error;
+}
+
+static void continueAfterDESCRIBE( RTSPClient* client, int result_code,
+ char* result_string )
+{
+ RTSPClientVlc *client_vlc = static_cast<RTSPClientVlc *> ( client );
+ demux_sys_t *p_sys = client_vlc->p_sys;
+ p_sys->i_live555_ret = result_code;
+ if ( result_code == 0 )
+ {
+ char* sdpDescription = result_string;
+ free( p_sys->p_sdp );
+ p_sys->p_sdp = NULL;
+ if( sdpDescription )
+ {
+ p_sys->p_sdp = strdup( sdpDescription );
+ p_sys->b_error = false;
+ }
+ }
+ else
+ p_sys->b_error = true;
+ delete[] result_string;
+ p_sys->event_rtsp = 1;
+}
+
+static void continueAfterOPTIONS( RTSPClient* client, int result_code,
+ char* result_string )
+{
+ RTSPClientVlc *client_vlc = static_cast<RTSPClientVlc *> (client);
+ demux_sys_t *p_sys = client_vlc->p_sys;
+ p_sys->i_live555_ret = result_code;
+ if ( result_code != 0 )
+ {
+ p_sys->b_error = true;
+ p_sys->event_rtsp = 1;
+ }
+ else
+ {
+ p_sys->b_get_param = result_string != NULL && strstr( result_string, "GET_PARAMETER" ) != NULL;
+ client->sendDescribeCommand( continueAfterDESCRIBE );
+ }
+ delete[] result_string;
+}
+
/*****************************************************************************
* Connect: connects to the RTSP server to setup the session DESCRIBE
*****************************************************************************/
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;
+ const int i_timeout = var_InheritInteger( p_demux, "ipv4-timeout" );
/* Get the user name and password */
if( p_sys->url.psz_username || p_sys->url.psz_password )
if( asprintf( &psz_url, "rtsp://%s", p_sys->psz_path ) == -1 )
return VLC_ENOMEM;
- psz_user = var_CreateGetString( p_demux, "rtsp-user" );
- psz_pwd = var_CreateGetString( p_demux, "rtsp-pwd" );
+ psz_user = var_InheritString( p_demux, "rtsp-user" );
+ psz_pwd = var_InheritString( p_demux, "rtsp-pwd" );
}
createnew:
goto bailout;
}
- if( var_CreateGetBool( p_demux, "rtsp-http" ) )
- i_http_port = var_CreateGetInteger( p_demux, "rtsp-http-port" );
+ if( var_InheritBool( p_demux, "rtsp-http" ) )
+ i_http_port = var_InheritInteger( p_demux, "rtsp-http-port" );
- if( ( p_sys->rtsp = RTSPClient::createNew( *p_sys->env,
- var_CreateGetInteger( p_demux, "verbose" ) > 1,
- "LibVLC/"VERSION, i_http_port ) ) == NULL )
+ p_sys->rtsp = new RTSPClientVlc( *p_sys->env, psz_url,
+ var_InheritInteger( p_demux, "verbose" ) > 1 ? 1 : 0,
+ "LibVLC/"VERSION, i_http_port, p_sys );
+ if( !p_sys->rtsp )
{
msg_Err( p_demux, "RTSPClient::createNew failed (%s)",
p_sys->env->getResultMsg() );
* 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" ))
+ if( var_InheritBool( p_demux, "rtsp-kasenna" ))
{
p_sys->rtsp->setUserAgentString( "VLC_MEDIA_PLAYER_KA" );
}
describe:
authenticator.setUsernameAndPassword( psz_user, psz_pwd );
- /* */
- { /* i_timeout hack scope */
-#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1223337600
- const int i_timeout = var_CreateGetInteger(p_demux, "ipv4-timeout") / 1000;
- psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
- &authenticator, i_timeout );
-#else
- psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
- &authenticator );
-#endif
- if( psz_options == NULL && authenticator.realm() != NULL )
- {
- // try again, with the realm set this time
-#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1223337600
- psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
- &authenticator, i_timeout );
-#else
- psz_options = p_sys->rtsp->sendOptionsCmd( psz_url, psz_user, psz_pwd,
- &authenticator );
-#endif
- }
- if( psz_options )
- p_sys->b_get_param = (bool)strstr( psz_options, "GET_PARAMETER" );
- delete [] psz_options;
+ p_sys->rtsp->sendOptionsCommand( &continueAfterOPTIONS, &authenticator );
- if( var_CreateGetBool( p_demux, "rtsp-wmserver" ) )
- p_sys->b_get_param = true;
-
-#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1223337600
- p_sdp = p_sys->rtsp->describeWithPassword( psz_url, psz_user, psz_pwd,
- var_GetBool( p_demux, "rtsp-kasenna" ), i_timeout );
-#else
- p_sdp = p_sys->rtsp->describeWithPassword( psz_url, psz_user, psz_pwd,
- var_GetBool( p_demux, "rtsp-kasenna" ) );
-#endif
- } /* i_timeout scope end */
-
- if( p_sdp == NULL )
+ if( !wait_Live555_response( p_demux, i_timeout ) )
{
- /* 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 );
-
+ int i_code = p_sys->i_live555_ret;
if( i_code == 401 )
{
msg_Dbg( p_demux, "authentication failed" );
goto describe;
}
}
- else if( (i_code != 0) && !var_GetBool( p_demux, "rtsp-http" ) )
+ else if( i_code > 0 && i_code != 404 && !var_GetBool( p_demux, "rtsp-http" ) )
{
/* Perhaps a firewall is being annoying. Try HTTP tunneling mode */
msg_Dbg( p_demux, "we will now try HTTP tunneling mode" );
}
else
{
- msg_Dbg( p_demux, "connection timeout" );
+ if( i_code == 0 )
+ msg_Dbg( p_demux, "connection timeout" );
+ else
+ msg_Dbg( p_demux, "connection error %d", i_code );
if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
p_sys->rtsp = NULL;
}
i_ret = VLC_EGENERIC;
}
- free( p_sys->p_sdp );
- p_sys->p_sdp = NULL;
- if( p_sdp ) p_sys->p_sdp = strdup( (char*)p_sdp );
- delete[] p_sdp;
-
bailout:
/* malloc-ated copy */
free( psz_url );
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" );
+ var_InheritBool( p_demux, "rtsp-http" );
+ i_client_port = var_InheritInteger( p_demux, "rtp-client-port" );
/* Create the session from the SDP */
if( !( p_sys->ms = MediaSession::createNew( *p_sys->env, p_sys->p_sdp ) ) )
/* Issue the SETUP */
if( p_sys->rtsp )
{
- if( !p_sys->rtsp->setupMediaSubsession( *sub, False,
- toBool( b_rtsp_tcp ),
- toBool( p_sys->b_force_mcast && !b_rtsp_tcp ) ) )
+ p_sys->rtsp->sendSetupCommand( *sub, default_live555_callback, False,
+ toBool( b_rtsp_tcp ),
+ toBool( p_sys->b_force_mcast && !b_rtsp_tcp ) );
+ if( !wait_Live555_response( p_demux ) )
{
/* if we get an unsupported transport error, toggle TCP
* use and try again */
- if( !strstr(p_sys->env->getResultMsg(),
- "461 Unsupported Transport")
- || !p_sys->rtsp->setupMediaSubsession( *sub, False,
- toBool( b_rtsp_tcp ), False ) )
+ if( p_sys->i_live555_ret == 461 )
+ p_sys->rtsp->sendSetupCommand( *sub, default_live555_callback, False,
+ !toBool( b_rtsp_tcp ), False );
+ if( p_sys->i_live555_ret != 461 || !wait_Live555_response( p_demux ) )
{
msg_Err( p_demux, "SETUP of'%s/%s' failed %s",
sub->mediumName(), sub->codecName(),
}
else if( !strcmp( sub->codecName(), "L16" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 't', 'w', 'o', 's' );
+ tk->fmt.i_codec = VLC_CODEC_S16B;
tk->fmt.audio.i_bitspersample = 16;
}
+ else if( !strcmp( sub->codecName(), "L20" ) )
+ {
+ tk->fmt.i_codec = VLC_CODEC_S20B;
+ tk->fmt.audio.i_bitspersample = 20;
+ }
+ else if( !strcmp( sub->codecName(), "L24" ) )
+ {
+ tk->fmt.i_codec = VLC_CODEC_S24B;
+ tk->fmt.audio.i_bitspersample = 24;
+ }
else if( !strcmp( sub->codecName(), "L8" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 'a', 'r', 'a', 'w' );
+ tk->fmt.i_codec = VLC_CODEC_U8;
tk->fmt.audio.i_bitspersample = 8;
}
+ else if( !strcmp( sub->codecName(), "DAT12" ) )
+ {
+ tk->fmt.i_codec = VLC_CODEC_DAT12;
+ tk->fmt.audio.i_bitspersample = 12;
+ }
else if( !strcmp( sub->codecName(), "PCMU" ) )
{
tk->fmt.i_codec = VLC_CODEC_MULAW;
+ tk->fmt.audio.i_bitspersample = 8;
}
else if( !strcmp( sub->codecName(), "PCMA" ) )
{
tk->fmt.i_codec = VLC_CODEC_ALAW;
+ tk->fmt.audio.i_bitspersample = 8;
}
else if( !strncmp( sub->codecName(), "G726", 4 ) )
{
if( !strcmp( sub->codecName(), "MPV" ) )
{
tk->fmt.i_codec = VLC_CODEC_MPGV;
+ tk->fmt.b_packetized = false;
}
else if( !strcmp( sub->codecName(), "H263" ) ||
!strcmp( sub->codecName(), "H263-1998" ) ||
sub->rtcpInstance()->setByeHandler( StreamClose, tk );
}
- if( tk->p_es || tk->b_quicktime || tk->b_muxed || tk->b_asf )
+ if( tk->p_es || tk->b_quicktime || ( tk->b_muxed && tk->p_out_muxed ) ||
+ ( tk->b_asf && p_sys->p_out_asf ) )
{
/* Append */
p_sys->track = (live_track_t**)xrealloc( p_sys->track,
if( p_sys->rtsp )
{
/* The PLAY */
- if( !p_sys->rtsp->playMediaSession( *p_sys->ms, p_sys->i_npt_start, -1, 1 ) )
+ p_sys->rtsp->sendPlayCommand( *p_sys->ms, default_live555_callback, p_sys->i_npt_start, -1, 1 );
+
+ if( !wait_Live555_response(p_demux) )
{
msg_Err( p_demux, "RTSP PLAY failed %s", p_sys->env->getResultMsg() );
return VLC_EGENERIC;
if( p_sys->b_timeout_call && p_sys->rtsp && p_sys->ms )
{
char *psz_bye = NULL;
- p_sys->rtsp->getMediaSessionParameter( *p_sys->ms, NULL, psz_bye );
+ p_sys->rtsp->sendGetParameterCommand( *p_sys->ms, NULL, psz_bye );
p_sys->b_timeout_call = false;
}
}
/* First warn we want to read data */
- p_sys->event = 0;
+ p_sys->event_data = 0;
for( i = 0; i < p_sys->i_track; i++ )
{
live_track_t *tk = p_sys->track[i];
}
}
/* Create a task that will be called if we wait more than 300ms */
- task = p_sys->scheduler->scheduleDelayedTask( 300000, TaskInterrupt, p_demux );
+ task = p_sys->scheduler->scheduleDelayedTask( 300000, TaskInterruptData, p_demux );
/* Do the read */
- p_sys->scheduler->doEventLoop( &p_sys->event );
+ p_sys->scheduler->doEventLoop( &p_sys->event_data );
/* remove the task */
p_sys->scheduler->unscheduleDelayedTask( task );
return VLC_SUCCESS;
}
- if( !p_sys->rtsp->pauseMediaSession( *p_sys->ms ) )
+ p_sys->rtsp->sendPauseCommand( *p_sys->ms, default_live555_callback );
+
+ if( !wait_Live555_response( p_demux ) )
{
msg_Err( p_demux, "PAUSE before seek failed %s",
p_sys->env->getResultMsg() );
return VLC_EGENERIC;
}
- if( !p_sys->rtsp->playMediaSession( *p_sys->ms, time, -1, 1 ) )
+
+ p_sys->rtsp->sendPlayCommand( *p_sys->ms, default_live555_callback, time, -1, 1 );
+
+ if( !wait_Live555_response( p_demux ) )
{
msg_Err( p_demux, "seek PLAY failed %s",
p_sys->env->getResultMsg() );
/* 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 ) )
+ p_sys->rtsp->sendPlayCommand( *p_sys->ms, default_live555_callback, -1, -1, f_scale );
+
+ if( !wait_Live555_response( p_demux ) )
{
msg_Err( p_demux, "PLAY with Scale %0.2f failed %s", f_scale,
p_sys->env->getResultMsg() );
if( b_pause == p_sys->b_paused )
return VLC_SUCCESS;
- if( ( b_pause && !p_sys->rtsp->pauseMediaSession( *p_sys->ms ) ) ||
- ( !b_pause && !p_sys->rtsp->playMediaSession( *p_sys->ms,
- p_sys->f_seek_request, -1.0f, p_sys->ms->scale() ) ) )
+ if( b_pause )
+ p_sys->rtsp->sendPauseCommand( *p_sys->ms, default_live555_callback );
+ else
+ p_sys->rtsp->sendPlayCommand( *p_sys->ms, default_live555_callback, p_sys->f_seek_request,
+ -1.0f, p_sys->ms->scale() );
+
+ if( !wait_Live555_response( p_demux ) )
{
- msg_Err( p_demux, "PLAY or PAUSE failed %s", p_sys->env->getResultMsg() );
- return VLC_EGENERIC;
+ msg_Err( p_demux, "PLAY or PAUSE failed %s", p_sys->env->getResultMsg() );
+ return VLC_EGENERIC;
}
p_sys->f_seek_request = -1;
p_sys->b_paused = b_pause;
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = (int64_t)var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
+ *pi64 = INT64_C(1000)
+ * var_GetInteger( p_demux, "network-caching" );
return VLC_SUCCESS;
default:
var_SetBool( p_demux, "rtsp-tcp", true );
/* We close the old RTSP session */
+ p_sys->rtsp->sendTeardownCommand( *p_sys->ms, NULL );
+ Medium::close( p_sys->ms );
+ RTSPClient::close( p_sys->rtsp );
+
for( i = 0; i < p_sys->i_track; i++ )
{
live_track_t *tk = p_sys->track[i];
if( p_sys->i_track ) free( p_sys->track );
if( p_sys->p_out_asf ) stream_Delete( p_sys->p_out_asf );
- p_sys->rtsp->teardownMediaSession( *p_sys->ms );
- Medium::close( p_sys->ms );
- RTSPClient::close( p_sys->rtsp );
-
p_sys->ms = NULL;
p_sys->rtsp = NULL;
p_sys->track = NULL;
unsigned i_length_offset = (p_data[1] << 16) |
(p_data[2] << 8) |
(p_data[3] );
- bool b_key = i_flags & 0x80;
bool b_length = i_flags & 0x40;
bool b_relative_ts = i_flags & 0x20;
bool b_duration = i_flags & 0x10;
else
{
/* Reset on broken stream */
- msg_Err( p_demux, "Broken packet detected (%d vs %d or %d + %d vs %d)",
+ msg_Err( p_demux, "Broken packet detected (%d vs %zu or %d + %d vs %d)",
i_offset, tk->p_asf_block->i_buffer, i_offset, i_payload, i_packet_size);
tk->p_asf_block->i_buffer = 0;
}
unsigned int i_truncated_bytes, struct timeval pts,
unsigned int duration )
{
+ VLC_UNUSED( 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;
if( qtState.sdAtomSize < 16 + 32 )
{
/* invalid */
- p_sys->event = 0xff;
+ p_sys->event_data = 0xff;
tk->waiting = 0;
return;
}
if( qtState.sdAtomSize < 4 )
{
/* invalid */
- p_sys->event = 0xff;
+ p_sys->event_data = 0xff;
tk->waiting = 0;
return;
}
if( tk->b_discard_trunc )
{
- p_sys->event = 0xff;
+ p_sys->event_data = 0xff;
tk->waiting = 0;
return;
}
}
/* Update our global npt value */
- if( tk->i_npt > 0 && tk->i_npt > p_sys->i_npt && tk->i_npt < p_sys->i_npt_length)
+ if( tk->i_npt > 0 && tk->i_npt > p_sys->i_npt &&
+ ( tk->i_npt < p_sys->i_npt_length || p_sys->i_npt_length <= 0 ) )
p_sys->i_npt = tk->i_npt;
if( p_block )
}
/* warn that's ok */
- p_sys->event = 0xff;
+ p_sys->event_data = 0xff;
/* we have read data */
tk->waiting = 0;
msg_Dbg( p_demux, "StreamClose" );
- p_sys->event = 0xff;
+ p_sys->event_rtsp = 0xff;
+ p_sys->event_data = 0xff;
p_sys->b_error = true;
}
/*****************************************************************************
*
*****************************************************************************/
-static void TaskInterrupt( void *p_private )
+static void TaskInterruptRTSP( void *p_private )
+{
+ demux_t *p_demux = (demux_t*)p_private;
+
+ /* Avoid lock */
+ p_demux->p_sys->event_rtsp = 0xff;
+}
+
+static void TaskInterruptData( void *p_private )
{
demux_t *p_demux = (demux_t*)p_private;
p_demux->p_sys->i_no_data_ti++;
/* Avoid lock */
- p_demux->p_sys->event = 0xff;
+ p_demux->p_sys->event_data = 0xff;
}
/*****************************************************************************
*
*****************************************************************************/
+VLC_NORETURN
static void* TimeoutPrevention( void *p_data )
{
timeout_thread_t *p_timeout = (timeout_thread_t *)p_data;
char *psz_bye = NULL;
int canc = vlc_savecancel ();
- p_timeout->p_sys->rtsp->getMediaSessionParameter( *p_timeout->p_sys->ms, NULL, psz_bye );
+ p_timeout->p_sys->rtsp->sendGetParameterCommand( *p_timeout->p_sys->ms, NULL, psz_bye );
vlc_restorecancel (canc);
}
p_timeout->p_sys->b_timeout_call = !p_timeout->b_handle_keep_alive;
projects / vlc / blobdiff