set_capability( "demux", 50 )
set_shortname( "RTP/RTSP")
set_callbacks( Open, Close )
- add_shortcut( "live" )
- add_shortcut( "livedotcom" )
+ add_shortcut( "live", "livedotcom" )
set_category( CAT_INPUT )
set_subcategory( SUBCAT_INPUT_DEMUX )
add_submodule ()
set_description( N_("RTSP/RTP access and demux") )
- add_shortcut( "rtsp" )
- add_shortcut( "sdp" )
- add_shortcut( "live" )
- add_shortcut( "livedotcom" )
+ add_shortcut( "rtsp", "pnm", "sdp", "live", "livedotcom" )
set_capability( "access_demux", 0 )
set_callbacks( Open, Close )
add_bool( "rtsp-tcp", false, NULL,
change_safe()
add_bool( "rtsp-kasenna", false, NULL, KASENNA_TEXT,
KASENNA_LONGTEXT, true )
+ change_safe()
add_bool( "rtsp-wmserver", false, NULL, WMSERVER_TEXT,
WMSERVER_LONGTEXT, true)
change_safe()
bool b_muxed;
bool b_quicktime;
bool b_asf;
+ block_t *p_asf_block;
bool b_discard_trunc;
stream_t *p_out_muxed; /* for muxed stream */
return VLC_EGENERIC;
}
}
- else
- {
- var_Create( p_demux, "rtsp-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
- }
+ var_Create( p_demux, "rtsp-caching", VLC_VAR_INTEGER|VLC_VAR_DOINHERIT );
p_demux->pf_demux = Demux;
p_demux->pf_control= Control;
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->psz_path = strdup( p_demux->psz_location );
p_sys->b_force_mcast = var_CreateGetBool( p_demux, "rtsp-mcast" );
p_sys->b_get_param = false;
p_sys->b_paused = false;
{
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 && 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();
+
+ for( int 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 );
- 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->ms ) Medium::close( p_sys->ms );
- if( p_sys->rtsp ) RTSPClient::close( p_sys->rtsp );
- if( p_sys->env ) p_sys->env->reclaim();
delete p_sys->scheduler;
free( p_sys->p_sdp );
free( p_sys->psz_path );
int i_http_port = 0;
int i_ret = VLC_SUCCESS;
- /* Create the url using the port number if available */
- if( p_sys->url.i_port == 0 )
- {
- p_sys->url.i_port = 554;
- if( asprintf( &psz_url, "rtsp://%s", p_sys->psz_path ) == -1 )
- return VLC_ENOMEM;
- }
- else
- {
- if( asprintf( &psz_url, "rtsp://%s:%d%s", p_sys->url.psz_host,
- p_sys->url.i_port, p_sys->url.psz_path ) == -1 )
- return VLC_ENOMEM;
- }
-
/* Get the user name and password */
if( p_sys->url.psz_username || p_sys->url.psz_password )
{
+ /* Create the URL by stripping away the username/password part */
+ if( p_sys->url.i_port == 0 )
+ p_sys->url.i_port = 554;
+ if( asprintf( &psz_url, "rtsp://%s:%d%s",
+ strempty( p_sys->url.psz_host ),
+ p_sys->url.i_port,
+ strempty( p_sys->url.psz_path ) ) == -1 )
+ return VLC_ENOMEM;
+
psz_user = strdup( strempty( p_sys->url.psz_username ) );
psz_pwd = strdup( strempty( p_sys->url.psz_password ) );
}
else
{
+ 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" );
}
if( ( p_sys->rtsp = RTSPClient::createNew( *p_sys->env,
var_CreateGetInteger( p_demux, "verbose" ) > 1,
- "VLC media player", i_http_port ) ) == NULL )
+ "LibVLC/"VERSION, i_http_port ) ) == NULL )
{
msg_Err( p_demux, "RTSPClient::createNew failed (%s)",
p_sys->env->getResultMsg() );
}
if( !strcmp( sub->codecName(), "X-ASF-PF" ) )
- bInit = sub->initiate( 4 ); /* Constant ? */
+ bInit = sub->initiate( 0 );
else
bInit = sub->initiate();
tk->p_es = NULL;
tk->b_quicktime = false;
tk->b_asf = false;
+ tk->p_asf_block = NULL;
tk->b_muxed = false;
tk->b_discard_trunc = false;
tk->p_out_muxed = NULL;
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" ) ||
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 ) ) )
+ p_sys->f_seek_request, -1.0f, p_sys->ms->scale() ) ) )
{
msg_Err( p_demux, "PLAY or PAUSE failed %s", p_sys->env->getResultMsg() );
return VLC_EGENERIC;
case DEMUX_GET_PTS_DELAY:
pi64 = (int64_t*)va_arg( args, int64_t * );
- *pi64 = (int64_t)var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
+ *pi64 = var_GetInteger( p_demux, "rtsp-caching" ) * 1000;
return VLC_SUCCESS;
default:
if( tk->b_muxed ) stream_Delete( tk->p_out_muxed );
if( tk->p_es ) es_out_Del( p_demux->out, tk->p_es );
+ if( tk->p_asf_block ) block_Release( tk->p_asf_block );
es_format_Clean( &tk->fmt );
free( tk->p_buffer );
free( tk );
p_sys->i_track = 0;
p_sys->b_no_data = true;
p_sys->i_no_data_ti = 0;
+ p_sys->p_out_asf = NULL;
/* Reopen rtsp client */
if( ( i_return = Connect( p_demux ) ) != VLC_SUCCESS )
}
+/*****************************************************************************
+ *
+ *****************************************************************************/
+static block_t *StreamParseAsf( demux_t *p_demux, live_track_t *tk,
+ bool b_marker,
+ const uint8_t *p_data, unsigned i_size )
+{
+ const unsigned i_packet_size = p_demux->p_sys->asfh.i_min_data_packet_size;
+ block_t *p_list = NULL;
+
+ while( i_size >= 4 )
+ {
+ unsigned i_flags = p_data[0];
+ 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;
+ bool b_location_id = i_flags & 0x08;
+
+ //msg_Dbg( p_demux, "ASF: marker=%d size=%d : %c=%d id=%d",
+ // b_marker, i_size, b_length ? 'L' : 'O', i_length_offset );
+ unsigned i_header_size = 4;
+ if( b_relative_ts )
+ i_header_size += 4;
+ if( b_duration )
+ i_header_size += 4;
+ if( b_location_id )
+ i_header_size += 4;
+
+ if( i_header_size > i_size )
+ {
+ msg_Warn( p_demux, "Invalid header size" );
+ break;
+ }
+
+ /* XXX
+ * When b_length is true, the streams I found do not seems to respect
+ * the documentation.
+ * From them, I have failed to find which choice between '__MIN()' or
+ * 'i_length_offset - i_header_size' is the right one.
+ */
+ unsigned i_payload;
+ if( b_length )
+ i_payload = __MIN( i_length_offset, i_size - i_header_size);
+ else
+ i_payload = i_size - i_header_size;
+
+ if( !tk->p_asf_block )
+ {
+ tk->p_asf_block = block_New( p_demux, i_packet_size );
+ if( !tk->p_asf_block )
+ break;
+ tk->p_asf_block->i_buffer = 0;
+ }
+ unsigned i_offset = b_length ? 0 : i_length_offset;
+ if( i_offset == tk->p_asf_block->i_buffer && i_offset + i_payload <= i_packet_size )
+ {
+ memcpy( &tk->p_asf_block->p_buffer[i_offset], &p_data[i_header_size], i_payload );
+ tk->p_asf_block->i_buffer += i_payload;
+ if( b_marker )
+ {
+ /* We have a complete packet */
+ tk->p_asf_block->i_buffer = i_packet_size;
+ block_ChainAppend( &p_list, tk->p_asf_block );
+ tk->p_asf_block = NULL;
+ }
+ }
+ else
+ {
+ /* Reset on broken stream */
+ 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;
+ }
+
+ /* */
+ p_data += i_header_size + i_payload;
+ i_size -= i_header_size + i_payload;
+ }
+ return p_list;
+}
+
/*****************************************************************************
*
*****************************************************************************/
}
else if( tk->b_asf )
{
- int i_copy = __MIN( p_sys->asfh.i_min_data_packet_size, (int)i_size );
- p_block = block_New( p_demux, p_sys->asfh.i_min_data_packet_size );
-
- memcpy( p_block->p_buffer, tk->p_buffer, i_copy );
+ p_block = StreamParseAsf( p_demux, tk,
+ tk->sub->rtpSource()->curPacketMarkerBit(),
+ tk->p_buffer, i_size );
}
else
{
p_sys->i_pcr = i_pts;
}
- if( (i_pts != tk->i_pts) && (!tk->b_muxed) )
- {
- p_block->i_pts = VLC_TS_0 + i_pts;
- }
-
/* 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)
p_sys->i_npt = tk->i_npt;
- if( !tk->b_muxed )
+ if( p_block )
{
- /*FIXME: for h264 you should check that packetization-mode=1 in sdp-file */
- p_block->i_dts = ( tk->fmt.i_codec == VLC_CODEC_MPGV ) ? VLC_TS_INVALID : (VLC_TS_0 + i_pts);
- }
+ if( !tk->b_muxed && !tk->b_asf )
+ {
+ if( i_pts != tk->i_pts )
+ p_block->i_pts = VLC_TS_0 + i_pts;
+ /*FIXME: for h264 you should check that packetization-mode=1 in sdp-file */
+ p_block->i_dts = ( tk->fmt.i_codec == VLC_CODEC_MPGV ) ? VLC_TS_INVALID : (VLC_TS_0 + i_pts);
+ }
- if( tk->b_muxed )
- {
- 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 );
+ if( tk->b_muxed )
+ 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 );
}
/* warn that's ok */