#include "GroupsockHelper.hh"
#include "liveMedia.hh"
+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;
/*****************************************************************************
"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 server speak an old and unstandard dialect of RTSP " \
+ "When you set this parameter, VLC will try this dialect for communication. In " \
+ "this mode you cannot talk to normal RTSP servers." )
+
vlc_module_begin();
set_description( _("live.com (RTSP/RTP/SDP) demuxer" ) );
set_capability( "demux2", 50 );
N_("Use RTP over RTSP (TCP)"), VLC_TRUE );
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 );
vlc_module_end();
/* TODO:
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;
FramedSource *readSource;
vlc_bool_t b_rtcp_sync;
- uint8_t buffer[65536];
+ uint8_t *p_buffer;
+ unsigned int i_buffer;
char waiting;
UsageEnvironment *env ;
RTSPClient *rtsp;
+ /* */
int i_track;
live_track_t **track; /* XXX mallocated */
mtime_t i_pcr;
mtime_t i_pcr_start;
+ /* Asf */
+ asf_header_t asfh;
+ stream_t *p_out_asf;
+
+ /* */
mtime_t i_length;
mtime_t i_start;
static int Demux ( demux_t * );
static int Control( demux_t *, int, va_list );
+static int ParseASF( demux_t * );
+
+static void StreamRead( void *p_private, unsigned int i_size, unsigned int i_truncated_bytes, struct timeval pts, unsigned int i_duration );
+static void StreamClose( void *p_private );
+static void TaskInterrupt( void *p_private );
+
+
/*****************************************************************************
* DemuxOpen:
*****************************************************************************/
p_sys->i_pcr_start = 0;
p_sys->i_length = 0;
p_sys->i_start = 0;
+ p_sys->p_out_asf = NULL;
if( ( p_sys->scheduler = BasicTaskScheduler::createNew() ) == NULL )
psz_url = (char*)malloc( strlen( p_demux->psz_path ) + 8 );
sprintf( psz_url, "rtsp://%s", p_demux->psz_path );
+ /* Add kasenna option */
+ if( var_CreateGetBool( p_demux, "rtsp-kasenna" )) msg_Dbg(p_demux, "add kasenna option");
psz_options = p_sys->rtsp->sendOptionsCmd( psz_url );
if( psz_options )
delete [] psz_options;
}
p_sys->p_sdp = (char*)p_sdp;
- fprintf( stderr, "sdp=%s\n", p_sys->p_sdp );
+ msg_Dbg( p_demux, "sdp=%s\n", p_sys->p_sdp );
}
if( ( p_sys->ms = MediaSession::createNew(*p_sys->env, p_sys->p_sdp ) ) == NULL )
{
while( ( sub = iter->next() ) != NULL )
{
unsigned int i_buffer = 0;
+ Boolean bInit;
/* Value taken from mplayer */
if( !strcmp( sub->mediumName(), "audio" ) )
- {
i_buffer = 100000;
- }
else if( !strcmp( sub->mediumName(), "video" ) )
- {
i_buffer = 2000000;
- }
else
- {
continue;
- }
- if( !sub->initiate() )
+ 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() );
}
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" ) )
delete[] p_extra;
}
}
+ 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" ) )
{
!strcmp( sub->codecName(), "H263-1998" ) ||
!strcmp( sub->codecName(), "H263-2000" ) )
{
- tk->fmt.i_codec = VLC_FOURCC( 'h', '2', '6', '3' );
+ 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' );
+ tk->fmt.i_codec = VLC_FOURCC( 'H', '2', '6', '1' );
}
else if( !strcmp( sub->codecName(), "JPEG" ) )
{
tk->fmt.i_codec = VLC_FOURCC( 'M', 'J', 'P', 'G' );
}
+ else if( !strcmp( sub->codecName(), "X-SV3V-ES" ) )
+ {
+ tk->fmt.i_codec = VLC_FOURCC( 'S', 'V', 'Q', '3' );
+ }
else if( !strcmp( sub->codecName(), "MP4V-ES" ) )
{
unsigned int i_extra;
tk->b_muxed = VLC_TRUE;
tk->p_out_muxed = stream_DemuxNew( p_demux, "ps", p_demux->out );
}
+ else if( !strcmp( sub->codecName(), "X-ASF-PF" ) )
+ {
+ tk->b_asf = VLC_TRUE;
+ if( p_sys->p_out_asf == NULL )
+ p_sys->p_out_asf = stream_DemuxNew( p_demux, "asf", p_demux->out );;
+ }
}
if( tk->fmt.i_codec != VLC_FOURCC( 'u', 'n', 'd', 'f' ) )
tk->p_es = es_out_Add( p_demux->out, &tk->fmt );
}
- if( tk->p_es || tk->b_quicktime || tk->b_muxed )
+ 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();
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 )
{
return VLC_SUCCESS;
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->env )
{
- delete p_sys->env;
+ RECLAIM_ENV(p_sys->env);
}
if( p_sys->scheduler )
{
{
stream_DemuxDelete( tk->p_out_muxed );
}
-
+ free( tk->p_buffer );
free( tk );
}
if( p_sys->i_track )
{
free( p_sys->track );
}
+ if( p_sys->p_out_asf )
+ {
+ stream_DemuxDelete( p_sys->p_out_asf );
+ }
if( p_sys->rtsp && p_sys->ms )
{
if( p_sys->env )
{
- delete p_sys->env;
+ RECLAIM_ENV(p_sys->env);
}
if( p_sys->scheduler )
{
free( p_sys );
}
-
-static void StreamRead( void *p_private, unsigned int i_size, struct timeval pts );
-static void StreamClose( void *p_private );
-static void TaskInterrupt( void *p_private );
-
/*****************************************************************************
* 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;
int i;
{
live_track_t *tk = p_sys->track[i];
+ if( tk->b_asf || tk->b_muxed )
+ b_send_pcr = VLC_FALSE;
+
if( i_pcr == 0 )
{
i_pcr = tk->i_pts;
{
p_sys->i_pcr = i_pcr;
- es_out_Control( p_demux->out, ES_OUT_SET_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 ) )
{
if( tk->waiting == 0 )
{
tk->waiting = 1;
- tk->readSource->getNextFrame( tk->buffer, 65536,
+ tk->readSource->getNextFrame( tk->p_buffer, tk->i_buffer,
StreamRead, tk,
StreamClose, tk );
}
demux_sys_t *p_sys = p_demux->p_sys;
int64_t *pi64;
double *pf, f;
- vlc_bool_t *pb;
+ vlc_bool_t *pb, b_bool;
+ int i;
switch( i_query )
{
p_sys->i_start = (mtime_t)(f * (double)p_sys->i_length);
p_sys->i_pcr_start = 0;
p_sys->i_pcr = 0;
+
for( i = 0; i < p_sys->i_track; i++ )
{
p_sys->track[i]->i_pts = 0;
}
return VLC_SUCCESS;
}
- return VLC_EGENERIC;
+ return VLC_SUCCESS;
}
/* 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 )
+ *pb = VLC_TRUE; /* Not always true, but will be handled in SET_PAUSE_STATE */
+ else
+ *pb = VLC_FALSE;
+ return VLC_SUCCESS;
+
case DEMUX_CAN_CONTROL_PACE:
- /* TODO */
pb = (vlc_bool_t*)va_arg( args, vlc_bool_t * );
*pb = VLC_FALSE;
return VLC_SUCCESS;
case DEMUX_SET_PAUSE_STATE:
+ double d_npt;
+ MediaSubsessionIterator *iter;
+ MediaSubsession *sub;
+
+ d_npt = ( (double)( p_sys->i_pcr - p_sys->i_pcr_start + p_sys->i_start ) ) / 1000000.00;
+
+ b_bool = (vlc_bool_t)va_arg( args, vlc_bool_t );
+ if( p_sys->rtsp == NULL )
+ return VLC_EGENERIC;
+
+ iter = new MediaSubsessionIterator( *p_sys->ms );
+ while( ( sub = iter->next() ) != NULL )
+ {
+ if( ( b_bool && !p_sys->rtsp->pauseMediaSubsession( *sub ) ) ||
+ ( !b_bool && !p_sys->rtsp->playMediaSubsession( *sub, d_npt > 0 ? d_npt : -1 ) ) )
+ {
+ delete iter;
+ return VLC_EGENERIC;
+ }
+ }
+ delete iter;
+#if 0
+ /* reset PCR and PCR start, mmh won't work well for multi-stream I fear */
+ for( i = 0; i < p_sys->i_track; i++ )
+ {
+ p_sys->track[i]->i_pts = 0;
+ }
+ p_sys->i_pcr_start = 0; /* FIXME Wrong */
+ p_sys->i_pcr = 0;
+#endif
+ return VLC_SUCCESS;
+
case DEMUX_GET_TITLE_INFO:
case DEMUX_SET_TITLE:
case DEMUX_SET_SEEKPOINT:
/*****************************************************************************
*
*****************************************************************************/
-static void StreamRead( void *p_private, unsigned int i_size, struct timeval pts )
+static void StreamRead( void *p_private, unsigned int i_size, unsigned int i_truncated_bytes, struct timeval pts, unsigned int duration )
{
live_track_t *tk = (live_track_t*)p_private;
demux_t *p_demux = tk->p_demux;
i_size,
pts.tv_sec * 1000000LL + pts.tv_usec );
#endif
- if( tk->fmt.i_codec == VLC_FOURCC('h','2','6','1') )
+
+ /* grow buffer if it looks like buffer is too small, but don't eat
+ * up all the memory on strange streams */
+ if( i_truncated_bytes > 0 && tk->i_buffer < 2000000 )
{
- i_size += 4;
+ void *p_tmp;
+ msg_Dbg( p_demux, "lost %d bytes", i_truncated_bytes );
+ 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)
+ {
+ msg_Warn( p_demux, "realloc failed" );
+ }
+ else
+ {
+ tk->p_buffer = (uint8_t*)p_tmp;
+ }
}
-
- if( i_size > 65536 )
+ if( i_size > tk->i_buffer )
{
msg_Warn( p_demux, "buffer overflow" );
}
/* FIXME could i_size be > buffer size ? */
- p_block = block_New( p_demux, i_size );
if( tk->fmt.i_codec == VLC_FOURCC('h','2','6','1') )
{
#if LIVEMEDIA_LIBRARY_VERSION_INT >= 1081468800
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->buffer, i_size );
+ memcpy( p_block->p_buffer + 4, tk->p_buffer, i_size );
+ }
+ else if( tk->b_asf )
+ {
+ int i_copy = __MIN( p_sys->asfh.i_min_data_packet_size, i_size );
+ p_block = block_New( p_demux, p_sys->asfh.i_min_data_packet_size );
+
+ memcpy( p_block->p_buffer, tk->p_buffer, i_copy );
}
else
{
- memcpy( p_block->p_buffer, tk->buffer, i_size );
+ p_block = block_New( p_demux, i_size );
+ memcpy( p_block->p_buffer, tk->p_buffer, i_size );
}
if( tk->fmt.i_codec == VLC_FOURCC('h','2','6','1') &&
tk->rtpSource->curPacketMarkerBit() )
{
stream_DemuxSend( tk->p_out_muxed, p_block );
}
+ else if( tk->b_asf )
+ {
+ stream_DemuxSend( p_sys->p_out_asf, p_block );
+ }
else
{
es_out_Send( p_demux->out, tk->p_es, p_block );
p_demux->p_sys->event = 0xff;
}
+/*****************************************************************************
+ *
+ *****************************************************************************/
+static int b64_decode( char *dest, char *src );
+
+static int ParseASF( demux_t *p_demux )
+{
+ demux_sys_t *p_sys = p_demux->p_sys;
+
+ const char *psz_marker = "a=pgmpu:data:application/vnd.ms.wms-hdr.asfv1;base64,";
+ char *psz_asf = strcasestr( p_sys->p_sdp, psz_marker );
+ char *psz_end;
+ block_t *p_header;
+
+ /* Parse the asf header */
+ if( psz_asf == NULL )
+ return VLC_EGENERIC;
+
+ psz_asf += strlen( psz_marker );
+ psz_asf = strdup( psz_asf ); /* Duplicate it */
+ psz_end = strchr( psz_asf, '\n' );
+
+ while( psz_end > psz_asf && ( *psz_end == '\n' || *psz_end == '\r' ) )
+ *psz_end-- = '\0';
+
+ if( psz_asf >= psz_end )
+ {
+ free( psz_asf );
+ return VLC_EGENERIC;
+ }
+
+ /* Always smaller */
+ p_header = block_New( p_demux, psz_end - psz_asf );
+ p_header->i_buffer = b64_decode( (char*)p_header->p_buffer, psz_asf );
+ fprintf( stderr, "Size=%d Hdrb64=%s\n", p_header->i_buffer, psz_asf );
+ if( p_header->i_buffer <= 0 )
+ {
+ free( psz_asf );
+ return VLC_EGENERIC;
+ }
+
+ /* Parse it to get packet size */
+ E_(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 );
+
+ free( psz_asf );
+ return VLC_SUCCESS;
+}
+/*char b64[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";*/
+static int b64_decode( char *dest, char *src )
+{
+ const char *dest_start = dest;
+ int i_level;
+ int last = 0;
+ int b64[256] = {
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 00-0F */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 10-1F */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,62,-1,-1,-1,63, /* 20-2F */
+ 52,53,54,55,56,57,58,59,60,61,-1,-1,-1,-1,-1,-1, /* 30-3F */
+ -1, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9,10,11,12,13,14, /* 40-4F */
+ 15,16,17,18,19,20,21,22,23,24,25,-1,-1,-1,-1,-1, /* 50-5F */
+ -1,26,27,28,29,30,31,32,33,34,35,36,37,38,39,40, /* 60-6F */
+ 41,42,43,44,45,46,47,48,49,50,51,-1,-1,-1,-1,-1, /* 70-7F */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 80-8F */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* 90-9F */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* A0-AF */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* B0-BF */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* C0-CF */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* D0-DF */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1, /* E0-EF */
+ -1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1,-1 /* F0-FF */
+ };
+
+ for( i_level = 0; *src != '\0'; src++ )
+ {
+ int c;
+
+ c = b64[(unsigned int)*src];
+ if( c == -1 )
+ {
+ continue;
+ }
+
+ switch( i_level )
+ {
+ case 0:
+ i_level++;
+ break;
+ case 1:
+ *dest++ = ( last << 2 ) | ( ( c >> 4)&0x03 );
+ i_level++;
+ break;
+ case 2:
+ *dest++ = ( ( last << 4 )&0xf0 ) | ( ( c >> 2 )&0x0f );
+ i_level++;
+ break;
+ case 3:
+ *dest++ = ( ( last &0x03 ) << 6 ) | c;
+ i_level = 0;
+ }
+ last = c;
+ }
+
+ *dest = '\0';
+
+ return dest - dest_start;
+}
+
projects / vlc / blobdiff