#include <BasicUsageEnvironment.hh>
#include <GroupsockHelper.hh>
#include <liveMedia.hh>
+#include <liveMedia_version.hh>
extern "C" {
#include "../access/mms/asf.h" /* Who said ugly ? */
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? */
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 * );
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;
delete []result_string;
p_sys->i_live555_ret = result_code;
p_sys->b_error = p_sys->i_live555_ret != 0;
- p_sys->event = 1;
+ p_sys->event_rtsp = 1;
}
/* return true if the RTSP command succeeded */
{
TaskToken task;
demux_sys_t * p_sys = p_demux->p_sys;
- p_sys->event = 0;
+ 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, TaskInterrupt,
+ task = p_sys->scheduler->scheduleDelayedTask( i_timeout*1000,
+ TaskInterruptRTSP,
p_demux );
}
- p_sys->event = 0;
+ p_sys->event_rtsp = 0;
p_sys->b_error = true;
p_sys->i_live555_ret = 0;
- p_sys->scheduler->doEventLoop( &p_sys->event );
+ 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 )
{
else
p_sys->b_error = true;
delete[] result_string;
- p_sys->event = 1;
+ p_sys->event_rtsp = 1;
}
static void continueAfterOPTIONS( RTSPClient* client, int result_code,
if ( result_code != 0 )
{
p_sys->b_error = true;
- p_sys->event = 1;
+ p_sys->event_rtsp = 1;
}
else
{
- p_sys->b_get_param = (bool)strstr( result_string, "GET_PARAMETER" );
+ p_sys->b_get_param = result_string != NULL && strstr( result_string, "GET_PARAMETER" ) != NULL;
client->sendDescribeCommand( continueAfterDESCRIBE );
}
delete[] result_string;
unsigned int i_buffer = 0;
unsigned const thresh = 200000; /* RTP reorder threshold .2 second (default .1) */
- b_rtsp_tcp = var_InheritBool( p_demux, "rtsp-tcp" ) ||
+ b_rtsp_tcp = var_CreateGetBool( p_demux, "rtsp-tcp" ) ||
var_InheritBool( p_demux, "rtsp-http" );
i_client_port = var_InheritInteger( p_demux, "rtp-client-port" );
* use and try again */
if( p_sys->i_live555_ret == 461 )
p_sys->rtsp->sendSetupCommand( *sub, default_live555_callback, False,
- toBool( b_rtsp_tcp ), 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",
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_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;
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,
}
/* 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 );
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->sendTeardownCommand( *p_sys->ms, NULL );
- Medium::close( p_sys->ms );
- RTSPClient::close( p_sys->rtsp );
-
p_sys->ms = NULL;
p_sys->rtsp = NULL;
p_sys->track = NULL;
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;
}
/*****************************************************************************
projects / vlc / blobdiff