* Preamble
*****************************************************************************/
#include "config.h"
-#include <stdio.h>
-#include <stdlib.h>
#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif
#include <vlc_url.h>
#include <vlc_network.h>
#include <vlc_charset.h>
+#include <vlc_strings.h>
+
+#include "rtp.h"
/*****************************************************************************
* Module descriptor
static int Send( sout_stream_t *, sout_stream_id_t *,
block_t* );
-/* For unicast/interleaved streaming */
-typedef struct
-{
- char *psz_session;
- int64_t i_last; /* for timeout */
-
- /* is it in "play" state */
- vlc_bool_t b_playing;
-
- /* output (id-access) */
- int i_id;
- sout_stream_id_t **id;
- int i_access;
- sout_access_out_t **access;
-} rtsp_client_t;
-
-struct sout_stream_sys_t
-{
- /* sdp */
- int64_t i_sdp_id;
- int i_sdp_version;
- char *psz_sdp;
- vlc_mutex_t lock_sdp;
-
- char *psz_session_name;
- char *psz_session_description;
- char *psz_session_url;
- char *psz_session_email;
-
- /* */
- vlc_bool_t b_export_sdp_file;
- char *psz_sdp_file;
- /* sap */
- vlc_bool_t b_export_sap;
- session_descriptor_t *p_session;
-
- httpd_host_t *p_httpd_host;
- httpd_file_t *p_httpd_file;
-
- httpd_host_t *p_rtsp_host;
- httpd_url_t *p_rtsp_url;
- char *psz_rtsp_control;
- char *psz_rtsp_path;
-
- /* */
- char *psz_destination;
- int i_port;
- int i_port_audio;
- int i_port_video;
- int i_ttl;
- vlc_bool_t b_latm;
-
- /* when need to use a private one or when using muxer */
- int i_payload_type;
-
- /* in case we do TS/PS over rtp */
- sout_mux_t *p_mux;
- sout_access_out_t *p_access;
- int i_mtu;
- sout_access_out_t *p_grab;
- uint16_t i_sequence;
- uint32_t i_timestamp_start;
- uint8_t ssrc[4];
- block_t *packet;
-
- /* */
- vlc_mutex_t lock_es;
- int i_es;
- sout_stream_id_t **es;
-
- /* */
- int i_rtsp;
- rtsp_client_t **rtsp;
-};
-
-typedef int (*pf_rtp_packetizer_t)( sout_stream_t *, sout_stream_id_t *,
- block_t * );
-
-struct sout_stream_id_t
-{
- sout_stream_t *p_stream;
- /* rtp field */
- uint8_t i_payload_type;
- uint16_t i_sequence;
- uint32_t i_timestamp_start;
- uint8_t ssrc[4];
-
- /* for sdp */
- int i_clock_rate;
- char *psz_rtpmap;
- char *psz_fmtp;
- char *psz_destination;
- int i_port;
- int i_cat;
- int i_bitrate;
-
- /* Packetizer specific fields */
- pf_rtp_packetizer_t pf_packetize;
- int i_mtu;
-
- /* for sending the packets */
- sout_access_out_t *p_access;
-
- vlc_mutex_t lock_rtsp;
- int i_rtsp_access;
- sout_access_out_t **rtsp_access;
-
- /* */
- sout_input_t *p_input;
-
- /* RTSP url control */
- httpd_url_t *p_rtsp_url;
-};
-
static int AccessOutGrabberWrite( sout_access_out_t *, block_t * );
static void SDPHandleUrl( sout_stream_t *, char * );
static int SapSetup( sout_stream_t *p_stream );
static int FileSetup( sout_stream_t *p_stream );
static int HttpSetup( sout_stream_t *p_stream, vlc_url_t * );
-static int RtspSetup( sout_stream_t *p_stream, vlc_url_t * );
-
-static int RtspCallback( httpd_callback_sys_t *, httpd_client_t *,
- httpd_message_t *, httpd_message_t * );
-static int RtspCallbackId( httpd_callback_sys_t *, httpd_client_t *,
- httpd_message_t *, httpd_message_t * );
-
-
-static rtsp_client_t *RtspClientNew( sout_stream_t *, const char *psz_session );
-static rtsp_client_t *RtspClientGet( sout_stream_t *, const char *psz_session );
-static void RtspClientDel( sout_stream_t *, rtsp_client_t * );
/*****************************************************************************
* Open:
ppsz_sout_options, p_stream->p_cfg );
p_sys = malloc( sizeof( sout_stream_sys_t ) );
+ if( p_sys == NULL )
+ return VLC_ENOMEM;
- p_sys->psz_destination = var_GetString( p_stream, SOUT_CFG_PREFIX "dst" );
- if( *p_sys->psz_destination == '\0' )
- {
- free( p_sys->psz_destination );
- p_sys->psz_destination = NULL;
- }
-
+ p_sys->psz_destination = var_GetNonEmptyString( p_stream, SOUT_CFG_PREFIX "dst" );
p_sys->psz_session_name = var_GetString( p_stream, SOUT_CFG_PREFIX "name" );
p_sys->psz_session_description = var_GetString( p_stream, SOUT_CFG_PREFIX "description" );
p_sys->psz_session_url = var_GetString( p_stream, SOUT_CFG_PREFIX "url" );
free( val2.psz_string );
}
- if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' )
+ if( p_sys->psz_destination == NULL )
{
if( !b_rtsp )
{
free( p_sys );
return VLC_EGENERIC;
}
- p_sys->psz_destination = NULL;
}
else if( p_sys->i_port <= 0 )
{
return VLC_EGENERIC;
}
- var_Get( p_stream, SOUT_CFG_PREFIX "ttl", &val );
- if( val.i_int == 0 )
+ p_sys->i_ttl = var_GetInteger( p_stream, SOUT_CFG_PREFIX "ttl" );
+ if( p_sys->i_ttl == 0 )
{
/* Normally, we should let the default hop limit up to the core,
* but we have to know it to build our SDP properly, which is why
* we ask the core. FIXME: broken when neither sout-rtp-ttl nor
* ttl are set. */
- val.i_int = config_GetInt( p_stream, "ttl" );
+ p_sys->i_ttl = config_GetInt( p_stream, "ttl" );
}
- if( val.i_int > 255 ) val.i_int = 255;
+ if( p_sys->i_ttl > 255 )
+ p_sys->i_ttl = 255;
/* must not exceed 999 once formatted */
- if( val.i_int < 0 )
- msg_Warn( p_stream, "illegal TTL %d, the SDP advertised value will be faked", val.i_int );
- p_sys->i_ttl = val.i_int;
-
- var_Get( p_stream, SOUT_CFG_PREFIX "mp4a-latm", &val );
- p_sys->b_latm = val.b_bool;
+ p_sys->b_latm = var_GetBool( p_stream, SOUT_CFG_PREFIX "mp4a-latm" );
p_sys->i_payload_type = 96;
p_sys->i_es = 0;
{
sout_access_out_t *p_grab;
const char *psz_rtpmap;
- char url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv;
+ char url[NI_MAXHOST + 8], access[22], psz_ttl[5], ipv;
if( b_rtsp )
{
free( p_sys );
return VLC_EGENERIC;
}
- else if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' )
+ else if( p_sys->psz_destination == NULL )
{
- msg_Err( p_stream, "rtp needs a destination when muxing" );
+ msg_Err( p_stream, "RTP needs a destination when muxing" );
free( p_sys );
return VLC_EGENERIC;
}
/* Check muxer type */
- if( !strncasecmp( val.psz_string, "ps", 2 ) || !strncasecmp( val.psz_string, "mpeg1", 5 ) )
+ if( !strncasecmp( val.psz_string, "ps", 2 )
+ || !strncasecmp( val.psz_string, "mpeg1", 5 ) )
{
psz_rtpmap = "MP2P/90000";
}
/* create the access out */
if( p_sys->i_ttl > 0 )
{
- sprintf( access, "udp{raw,ttl=%d}", p_sys->i_ttl );
+ sprintf( access, "udp{raw,rtcp,ttl=%d}", p_sys->i_ttl );
}
else
{
- sprintf( access, "udp{raw}" );
+ strcat( access, "udp{raw,rtcp}" );
}
- /* IPv6 needs brackets if not already present */
- snprintf( url, sizeof( url ),
- ( ( p_sys->psz_destination[0] != '[' )
- && ( strchr( p_sys->psz_destination, ':' ) != NULL ) )
- ? "[%s]:%d" : "%s:%d", p_sys->psz_destination,
- p_sys->i_port );
- url[sizeof( url ) - 1] = '\0';
/* FIXME: we should check that url is a numerical address, otherwise
* the SDP will be quite broken (regardless of the IP protocol version)
* Also it might be IPv6 with no ':' if it is a DNS name.
*/
ipv = ( strchr( p_sys->psz_destination, ':' ) != NULL ) ? '6' : '4';
+ /* IPv6 needs brackets if not already present */
+ if ((ipv == '6') && (p_sys->psz_destination[0] != '['))
+ snprintf (url, sizeof (url), "[%s]:%d",p_sys->psz_destination,
+ p_sys->i_port);
+ else
+ snprintf (url, sizeof (url), "%s:%d",p_sys->psz_destination,
+ p_sys->i_port);
+
if( !( p_sys->p_access = sout_AccessOutNew( p_sout, access, url ) ) )
{
msg_Err( p_stream, "cannot create the access out for %s://%s",
o= - should be local username (no spaces allowed)
o= time should be hashed with some other value to garantee uniqueness
o= don't use the localhost address. use fully qualified domain name or IP4 address
- a= source-filter: we need our source address
+ a= source-filter: we need our source address
a= x-plgroup: (missing)
RTP packets need to get the correct src IP address */
- if( ipv == 4 && net_AddressIsMulticast( VLC_OBJECT(p_stream), p_sys->psz_destination ) )
+ if( ipv == '4'
+ && net_AddressIsMulticast( VLC_OBJECT(p_stream), p_sys->psz_destination ) )
{
snprintf( psz_ttl, sizeof( psz_ttl ), "/%d", p_sys->i_ttl );
psz_ttl[sizeof( psz_ttl ) - 1] = '\0';
if( p_cfg->psz_value == NULL || *p_cfg->psz_value == '\0' )
continue;
- if( !strcmp( p_cfg->psz_value, val.psz_string ) ) /* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */
+ /* needed both :sout-rtp-sdp= and rtp{sdp=} can be used */
+ if( !strcmp( p_cfg->psz_value, val.psz_string ) )
continue;
SDPHandleUrl( p_stream, p_cfg->psz_value );
block_Release( p_sys->packet );
}
if( p_sys->b_export_sap )
- {
+ {
p_sys->p_mux = NULL;
SapSetup( p_stream );
}
}
- while( p_sys->i_rtsp > 0 )
- {
- RtspClientDel( p_stream, p_sys->rtsp[0] );
- }
+ RtspUnsetup( p_stream );
vlc_mutex_destroy( &p_sys->lock_sdp );
if( p_sys->p_httpd_file )
- {
httpd_FileDelete( p_sys->p_httpd_file );
- }
+
if( p_sys->p_httpd_host )
- {
httpd_HostDelete( p_sys->p_httpd_host );
- }
- if( p_sys->p_rtsp_url )
- {
- httpd_UrlDelete( p_sys->p_rtsp_url );
- }
- if( p_sys->p_rtsp_host )
- {
- httpd_HostDelete( p_sys->p_rtsp_host );
- }
+
if( p_sys->psz_session_name )
- {
free( p_sys->psz_session_name );
- p_sys->psz_session_name = NULL;
- }
+
if( p_sys->psz_session_description )
- {
free( p_sys->psz_session_description );
- p_sys->psz_session_description = NULL;
- }
+
if( p_sys->psz_session_url )
- {
free( p_sys->psz_session_url );
- p_sys->psz_session_url = NULL;
- }
+
if( p_sys->psz_session_email )
- {
free( p_sys->psz_session_email );
- p_sys->psz_session_email = NULL;
- }
+
if( p_sys->psz_sdp )
- {
free( p_sys->psz_sdp );
- p_sys->psz_sdp = NULL;
- }
+
if( p_sys->b_export_sdp_file )
{
#ifdef HAVE_UNISTD_H
#endif
free( p_sys->psz_sdp_file );
}
+ free( p_sys->psz_destination );
free( p_sys );
}
a= charset: (normally charset should be UTF-8, this can be used to override s= and i=)
a= x-plgroup: (missing)
RTP packets need to get the correct src IP address */
-static char *SDPGenerate( const sout_stream_t *p_stream,
+/*static*/ char *SDPGenerate( const sout_stream_t *p_stream,
const char *psz_destination, vlc_bool_t b_rtsp )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sizeof( "u=*\r\n" ) + strlen( p_sys->psz_session_url ) +
sizeof( "e=*\r\n" ) + strlen( p_sys->psz_session_email ) +
sizeof( "t=0 0\r\n" ) + /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
+ sizeof( "b=RR:0\r\n" ) +
sizeof( "a=tool:"PACKAGE_STRING"\r\n" ) +
sizeof( "c=IN IP4 */*\r\n" ) + 20 + 10 +
strlen( psz_destination ) ;
sout_stream_id_t *id = p_sys->es[i];
i_size += strlen( "m=**d*o * RTP/AVP *\r\n" ) + 10 + 10;
+ if ( id->i_bitrate )
+ {
+ i_size += strlen( "b=AS: *\r\n") + 10;
+ }
if( id->psz_rtpmap )
{
i_size += strlen( "a=rtpmap:* *\r\n" ) + strlen( id->psz_rtpmap )+10;
{
i_size += strlen( "a=fmtp:* *\r\n" ) + strlen( id->psz_fmtp ) + 10;
}
- if ( id->i_bitrate)
- {
- i_size += strlen( "b=AS: *\r\n") + 10;
- }
if( b_rtsp )
{
i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10;
p += sprintf( p, "v=0\r\n" );
p += sprintf( p, "o=- "I64Fd" %d IN IP%c %s\r\n",
p_sys->i_sdp_id, p_sys->i_sdp_version,
- ipv, ipv == '6' ? "::" : "127.0.0.1" );
+ ipv, ipv == '6' ? "::1" : "127.0.0.1" );
if( *p_sys->psz_session_name )
p += sprintf( p, "s=%s\r\n", p_sys->psz_session_name );
if( *p_sys->psz_session_description )
p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination );
- if( net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) )
- {
- /* Add the ttl if it is a multicast address */
- /* FIXME: 1 is not a correct default value in the case of IPv6 */
- p += sprintf( p, "/%d\r\n", p_sys->i_ttl ? p_sys->i_ttl : 1 );
- }
- else
+ if( ( ipv == 4 )
+ && net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) )
{
- p += sprintf( p, "\r\n" );
+ /* Add the deprecated TTL field if it is an IPv4 multicast address */
+ p += sprintf( p, "/%d", p_sys->i_ttl ?: 1 );
}
+ p += sprintf( p, "\r\n" );
+ p += sprintf( p, "b=RR:0\r\n" );
for( i = 0; i < p_sys->i_es; i++ )
{
{
continue;
}
+ if ( id->i_bitrate )
+ {
+ p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate);
+ }
if( id->psz_rtpmap )
{
p += sprintf( p, "a=rtpmap:%d %s\r\n", id->i_payload_type,
p += sprintf( p, "a=fmtp:%d %s\r\n", id->i_payload_type,
id->psz_fmtp );
}
- if ( id->i_bitrate)
- {
- p += sprintf(p,"b=AS:%d\r\n",id->i_bitrate);
- }
if( b_rtsp )
{
p += sprintf( p, "a=control:/trackID=%d\r\n", i );
if( p_sys->psz_destination )
{
- char access[17];
+ char access[22];
char url[NI_MAXHOST + 8];
/* first try to create the access out */
- if( p_sys->i_ttl )
+ if( p_sys->i_ttl > 0 )
{
- snprintf( access, sizeof( access ), "udp{raw,ttl=%d}",
+ snprintf( access, sizeof( access ), "udp{raw,rtcp,ttl=%d}",
p_sys->i_ttl );
access[sizeof( access ) - 1] = '\0';
}
else
- strcpy( access, "udp{raw}" );
+ strcpy( access, "udp{raw,rtcp}" );
snprintf( url, sizeof( url ), (( p_sys->psz_destination[0] != '[' ) &&
strchr( p_sys->psz_destination, ':' )) ? "[%s]:%d" : "%s:%d",
id->p_input = NULL;
id->psz_rtpmap = NULL;
id->psz_fmtp = NULL;
- id->psz_destination = p_sys->psz_destination ? strdup( p_sys->psz_destination ) : NULL;
id->i_port = i_port;
id->p_rtsp_url = NULL;
- vlc_mutex_init( p_stream, &id->lock_rtsp );
- id->i_rtsp_access = 0;
- id->rtsp_access = NULL;
+
+ vlc_mutex_init( p_stream, &id->lock_sink );
+ id->i_sink = 0;
+ id->sink = NULL;
switch( p_fmt->i_codec )
{
i_size = i_buffer;
for( i_offset = 4; i_offset+3 < i_buffer ; i_offset++)
{
- if( p_buffer[i_offset] == 0 && p_buffer[i_offset+1] == 0 && p_buffer[i_offset+2] == 0 && p_buffer[i_offset+3] == 1 )
+ if( !memcmp (p_buffer + i_offset, "\x00\x00\x00\x01", 4 ) )
{
/* we found another startcode */
i_size = i_offset;
break;
- }
+ }
}
if( i_nal_type == 7 )
{
msg_Dbg( p_stream, "maximum RTP packet size: %d bytes", id->i_mtu );
if( p_sys->p_rtsp_url )
- {
- char psz_urlc[strlen( p_sys->psz_rtsp_control ) + 1 + 10];
-
- sprintf( psz_urlc, "%s/trackID=%d", p_sys->psz_rtsp_path, p_sys->i_es );
- msg_Dbg( p_stream, "rtsp: adding %s\n", psz_urlc );
- id->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, psz_urlc, NULL, NULL, NULL );
-
- if( id->p_rtsp_url )
- {
- httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_SETUP, RtspCallbackId, (void*)id );
- //httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PLAY, RtspCallback, (void*)p_stream );
- //httpd_UrlCatch( id->p_rtsp_url, HTTPD_MSG_PAUSE, RtspCallback, (void*)p_stream );
- }
- }
-
+ RtspAddId( p_stream, id );
/* Update p_sys context */
vlc_mutex_lock( &p_sys->lock_es );
{
free( id->psz_fmtp );
}
- if( id->psz_destination )
- free( id->psz_destination );
sout_AccessOutDelete( id->p_access );
}
else if( id->p_input )
sout_MuxDeleteStream( p_sys->p_mux, id->p_input );
}
if( id->p_rtsp_url )
- {
- httpd_UrlDelete( id->p_rtsp_url );
- }
- vlc_mutex_destroy( &id->lock_rtsp );
- if( id->rtsp_access ) free( id->rtsp_access );
+ RtspDelId( p_stream, id );
+
+ vlc_mutex_destroy( &id->lock_sink );
+ free( id->sink );
/* Update SDP (sap/file) */
if( p_sys->b_export_sap && !p_sys->p_mux ) SapSetup( p_stream );
return VLC_SUCCESS;
}
-/****************************************************************************
- * RTSP:
- ****************************************************************************/
-static rtsp_client_t *RtspClientNew( sout_stream_t *p_stream, const char *psz_session )
-{
- rtsp_client_t *rtsp = malloc( sizeof( rtsp_client_t ));
-
- rtsp->psz_session = strdup( psz_session );
- rtsp->i_last = 0;
- rtsp->b_playing = VLC_FALSE;
- rtsp->i_id = 0;
- rtsp->id = NULL;
- rtsp->i_access = 0;
- rtsp->access = NULL;
-
- TAB_APPEND( p_stream->p_sys->i_rtsp, p_stream->p_sys->rtsp, rtsp );
-
- return rtsp;
-}
-static rtsp_client_t *RtspClientGet( sout_stream_t *p_stream, const char *psz_session )
-{
- int i;
-
- if( !psz_session ) return NULL;
-
- for( i = 0; i < p_stream->p_sys->i_rtsp; i++ )
- {
- if( !strcmp( p_stream->p_sys->rtsp[i]->psz_session, psz_session ) )
- {
- return p_stream->p_sys->rtsp[i];
- }
- }
- return NULL;
-}
-
-static void RtspClientDel( sout_stream_t *p_stream, rtsp_client_t *rtsp )
-{
- int i;
- TAB_REMOVE( p_stream->p_sys->i_rtsp, p_stream->p_sys->rtsp, rtsp );
-
- for( i = 0; i < rtsp->i_access; i++ )
- {
- sout_AccessOutDelete( rtsp->access[i] );
- }
- if( rtsp->id ) free( rtsp->id );
- if( rtsp->access ) free( rtsp->access );
-
- free( rtsp->psz_session );
- free( rtsp );
-}
-
-static int RtspSetup( sout_stream_t *p_stream, vlc_url_t *url )
-{
- sout_stream_sys_t *p_sys = p_stream->p_sys;
-
- msg_Dbg( p_stream, "rtsp setup: %s : %d / %s\n", url->psz_host, url->i_port, url->psz_path );
-
- p_sys->p_rtsp_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host, url->i_port > 0 ? url->i_port : 554 );
- if( p_sys->p_rtsp_host == NULL )
- {
- return VLC_EGENERIC;
- }
-
- p_sys->psz_rtsp_path = strdup( url->psz_path ? url->psz_path : "/" );
- p_sys->psz_rtsp_control = malloc (strlen( url->psz_host ) + 20 + strlen( p_sys->psz_rtsp_path ) + 1 );
- sprintf( p_sys->psz_rtsp_control, "rtsp://%s:%d%s",
- url->psz_host, url->i_port > 0 ? url->i_port : 554, p_sys->psz_rtsp_path );
-
- p_sys->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, p_sys->psz_rtsp_path, NULL, NULL, NULL );
- if( p_sys->p_rtsp_url == 0 )
- {
- return VLC_EGENERIC;
- }
- httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_DESCRIBE, RtspCallback, (void*)p_stream );
- httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_PLAY, RtspCallback, (void*)p_stream );
- httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_PAUSE, RtspCallback, (void*)p_stream );
- httpd_UrlCatch( p_sys->p_rtsp_url, HTTPD_MSG_TEARDOWN, RtspCallback, (void*)p_stream );
-
- return VLC_SUCCESS;
-}
-
-static int RtspCallback( httpd_callback_sys_t *p_args,
- httpd_client_t *cl,
- httpd_message_t *answer, httpd_message_t *query )
-{
- sout_stream_t *p_stream = (sout_stream_t*)p_args;
- sout_stream_sys_t *p_sys = p_stream->p_sys;
- char *psz_destination = p_sys->psz_destination;
- const char *psz_session = NULL;
- const char *psz_cseq = NULL;
- int i_cseq = 0;
-
- if( answer == NULL || query == NULL )
- {
- return VLC_SUCCESS;
- }
- //fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type );
-
- answer->i_proto = HTTPD_PROTO_RTSP;
- answer->i_version= query->i_version;
- answer->i_type = HTTPD_MSG_ANSWER;
-
- switch( query->i_type )
- {
- case HTTPD_MSG_DESCRIBE:
- {
- char *psz_sdp = SDPGenerate( p_stream, psz_destination ? psz_destination : "0.0.0.0", VLC_TRUE );
-
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" );
- httpd_MsgAdd( answer, "Content-Base", "%s", p_sys->psz_rtsp_control );
- answer->p_body = (uint8_t *)psz_sdp;
- answer->i_body = strlen( psz_sdp );
- break;
- }
-
- case HTTPD_MSG_PLAY:
- {
- rtsp_client_t *rtsp;
- /* for now only multicast so easy */
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
-
- psz_session = httpd_MsgGet( query, "Session" );
- rtsp = RtspClientGet( p_stream, psz_session );
- if( rtsp && !rtsp->b_playing )
- {
- int i_id;
- /* FIXME */
- rtsp->b_playing = VLC_TRUE;
-
- vlc_mutex_lock( &p_sys->lock_es );
- for( i_id = 0; i_id < rtsp->i_id; i_id++ )
- {
- sout_stream_id_t *id = rtsp->id[i_id];
- int i;
-
- for( i = 0; i < p_sys->i_es; i++ )
- {
- if( id == p_sys->es[i] )
- break;
- }
- if( i >= p_sys->i_es ) continue;
-
- vlc_mutex_lock( &id->lock_rtsp );
- TAB_APPEND( id->i_rtsp_access, id->rtsp_access, rtsp->access[i_id] );
- vlc_mutex_unlock( &id->lock_rtsp );
- }
- vlc_mutex_unlock( &p_sys->lock_es );
- }
- break;
- }
- case HTTPD_MSG_PAUSE:
- /* FIXME */
- return VLC_EGENERIC;
- case HTTPD_MSG_TEARDOWN:
- {
- rtsp_client_t *rtsp;
-
- /* for now only multicast so easy again */
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
-
- psz_session = httpd_MsgGet( query, "Session" );
- rtsp = RtspClientGet( p_stream, psz_session );
- if( rtsp )
- {
- int i_id;
-
- vlc_mutex_lock( &p_sys->lock_es );
- for( i_id = 0; i_id < rtsp->i_id; i_id++ )
- {
- sout_stream_id_t *id = rtsp->id[i_id];
- int i;
-
- for( i = 0; i < p_sys->i_es; i++ )
- {
- if( id == p_sys->es[i] )
- break;
- }
- if( i >= p_sys->i_es ) continue;
-
- vlc_mutex_lock( &id->lock_rtsp );
- TAB_REMOVE( id->i_rtsp_access, id->rtsp_access, rtsp->access[i_id] );
- vlc_mutex_unlock( &id->lock_rtsp );
- }
- vlc_mutex_unlock( &p_sys->lock_es );
-
- RtspClientDel( p_stream, rtsp );
- }
- break;
- }
-
- default:
- return VLC_EGENERIC;
- }
- httpd_MsgAdd( answer, "Server", PACKAGE_STRING );
- httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
- psz_cseq = httpd_MsgGet( query, "Cseq" );
- if( psz_cseq )
- i_cseq = atoi( psz_cseq );
- else
- i_cseq = 0;
- httpd_MsgAdd( answer, "Cseq", "%d", i_cseq );
- httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
-
- if( psz_session )
- httpd_MsgAdd( answer, "Session", "%s;timeout=5", psz_session );
- return VLC_SUCCESS;
-}
-
-static int RtspCallbackId( httpd_callback_sys_t *p_args,
- httpd_client_t *cl,
- httpd_message_t *answer, httpd_message_t *query )
-{
- sout_stream_id_t *id = (sout_stream_id_t*)p_args;
- sout_stream_t *p_stream = id->p_stream;
- sout_stream_sys_t *p_sys = p_stream->p_sys;
- char psz_session_init[100];
- const char *psz_session = NULL;
- const char *psz_cseq = NULL;
- int i_cseq = 0;
-
-
- if( answer == NULL || query == NULL )
- return VLC_SUCCESS;
- //fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type );
-
- /* */
- snprintf( psz_session_init, sizeof(psz_session_init), "%d", rand() );
-
- /* */
- answer->i_proto = HTTPD_PROTO_RTSP;
- answer->i_version= query->i_version;
- answer->i_type = HTTPD_MSG_ANSWER;
-
- switch( query->i_type )
- {
- case HTTPD_MSG_SETUP:
- {
- const char *psz_transport = httpd_MsgGet( query, "Transport" );
-
- //fprintf( stderr, "HTTPD_MSG_SETUP: transport=%s\n", psz_transport );
-
- if( strstr( psz_transport, "multicast" ) && id->psz_destination )
- {
- //fprintf( stderr, "HTTPD_MSG_SETUP: multicast\n" );
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
-
- psz_session = httpd_MsgGet( query, "Session" );
- if( !psz_session )
- psz_session = psz_session_init;
-
- httpd_MsgAdd( answer, "Transport",
- "RTP/AVP/UDP;destination=%s;port=%d-%d;ttl=%d",
- id->psz_destination, id->i_port,id->i_port+1,
- p_sys->i_ttl > 0 ? p_sys->i_ttl : 1);
- }
- else if( strstr( psz_transport, "unicast" ) && strstr( psz_transport, "client_port=" ) )
- {
- int i_port = atoi( strstr( psz_transport, "client_port=" ) + strlen("client_port=") );
- char ip[NI_MAXNUMERICHOST], psz_access[17], psz_url[NI_MAXNUMERICHOST + 8];
-
- sout_access_out_t *p_access;
-
- rtsp_client_t *rtsp = NULL;
-
- if( httpd_ClientIP( cl, ip ) == NULL )
- {
- answer->i_status = 500;
- answer->psz_status = strdup( "Internal server error" );
- answer->i_body = 0;
- answer->p_body = NULL;
- break;
- }
-
- //fprintf( stderr, "HTTPD_MSG_SETUP: unicast ip=%s port=%d\n", ip, i_port );
-
- psz_session = httpd_MsgGet( query, "Session" );
- if( !psz_session )
- {
- psz_session = psz_session_init;
- rtsp = RtspClientNew( p_stream, psz_session_init );
- }
- else
- {
- rtsp = RtspClientGet( p_stream, psz_session );
- if( rtsp == NULL )
- {
- answer->i_status = 454;
- answer->psz_status = strdup( "Unknown session id" );
- answer->i_body = 0;
- answer->p_body = NULL;
- break;
- }
- }
-
- /* first try to create the access out */
- if( p_sys->i_ttl )
- snprintf( psz_access, sizeof( psz_access ),
- "udp{raw,ttl=%d}", p_sys->i_ttl );
- else
- strlcpy( psz_access, "udp{raw}", sizeof( psz_access ) );
-
- snprintf( psz_url, sizeof( psz_url ),
- ( strchr( ip, ':' ) != NULL ) ? "[%s]:%d" : "%s:%d",
- ip, i_port );
-
- if( ( p_access = sout_AccessOutNew( p_stream->p_sout, psz_access, psz_url ) ) == NULL )
- {
- msg_Err( p_stream, "cannot create the access out for %s://%s",
- psz_access, psz_url );
- answer->i_status = 500;
- answer->psz_status = strdup( "Internal server error" );
- answer->i_body = 0;
- answer->p_body = NULL;
- break;
- }
-
- TAB_APPEND( rtsp->i_id, rtsp->id, id );
- TAB_APPEND( rtsp->i_access, rtsp->access, p_access );
-
- answer->i_status = 200;
- answer->psz_status = strdup( "OK" );
- answer->i_body = 0;
- answer->p_body = NULL;
-
- httpd_MsgAdd( answer, "Transport",
- "RTP/AVP/UDP;client_port=%d-%d", i_port, i_port + 1 );
- }
- else /* TODO strstr( psz_transport, "interleaved" ) ) */
- {
- answer->i_status = 461;
- answer->psz_status = strdup( "Unsupported Transport" );
- answer->i_body = 0;
- answer->p_body = NULL;
- }
- break;
- }
-
- default:
- return VLC_EGENERIC;
- }
- httpd_MsgAdd( answer, "Server", "VLC Server" );
- httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
- psz_cseq = httpd_MsgGet( query, "Cseq" );
- if( psz_cseq )
- i_cseq = atoi( psz_cseq );
- else
- i_cseq = 0;
- httpd_MsgAdd( answer, "Cseq", "%d", i_cseq );
- httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
-
- if( psz_session )
- httpd_MsgAdd( answer, "Session", "%s"/*;timeout=5*/, psz_session );
- return VLC_SUCCESS;
-}
-
/****************************************************************************
* rtp_packetize_*:
****************************************************************************/
static void rtp_packetize_send( sout_stream_id_t *id, block_t *out )
{
int i;
- vlc_mutex_lock( &id->lock_rtsp );
- for( i = 0; i < id->i_rtsp_access; i++ )
+ vlc_mutex_lock( &id->lock_sink );
+ for( i = 0; i < id->i_sink; i++ )
{
- sout_AccessOutWrite( id->rtsp_access[i], block_Duplicate( out ) );
+ sout_AccessOutWrite( id->sink[i], block_Duplicate( out ) );
}
- vlc_mutex_unlock( &id->lock_rtsp );
+ vlc_mutex_unlock( &id->lock_sink );
if( id->p_access )
{
}
}
+int rtp_add_sink( sout_stream_id_t *id, sout_access_out_t *access )
+{
+ vlc_mutex_lock( &id->lock_sink );
+ TAB_APPEND( id->i_sink, id->sink, access );
+ vlc_mutex_unlock( &id->lock_sink );
+}
+
+void rtp_del_sink( sout_stream_id_t *id, sout_access_out_t *access )
+{
+ vlc_mutex_lock( &id->lock_sink );
+ TAB_REMOVE( id->i_sink, id->sink, access );
+ vlc_mutex_unlock( &id->lock_sink );
+}
+
static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id,
block_t *in )
{
projects / vlc / blobdiff