/*****************************************************************************
* rtp.c: rtp stream output module
*****************************************************************************
- * Copyright (C) 2003-2004 VideoLAN
+ * Copyright (C) 2003-2004 the VideoLAN team
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
* Preamble
*****************************************************************************/
+#include "config.h"
+#include <stdio.h>
#include <stdlib.h>
+#ifdef HAVE_UNISTD_H
+# include <unistd.h>
+#endif
+
+#include <errno.h>
#include <vlc/vlc.h>
-#include <vlc/input.h>
-#include <vlc/sout.h>
+#include <vlc_sout.h>
+#include <vlc_block.h>
-#include "vlc_httpd.h"
-#include "network.h"
+#include <vlc_httpd.h>
+#include <vlc_url.h>
+#include <vlc_network.h>
+#include <vlc_charset.h>
/*****************************************************************************
* Module descriptor
*****************************************************************************/
+
+#define MTU_REDUCE 50
+
#define DST_TEXT N_("Destination")
#define DST_LONGTEXT N_( \
- "Allows you to specify the output URL used for the streaming output." )
-#define NAME_TEXT N_("Session name")
-#define NAME_LONGTEXT N_( \
- "Allows you to specify the session name used for the streaming output." )
+ "This is the output URL that will be used." )
#define SDP_TEXT N_("SDP")
#define SDP_LONGTEXT N_( \
- "Allows you to specify the SDP used for the streaming output. " \
- "You must use an url: http://location to access the SDP via HTTP, " \
- "rtsp://location for RTSP access, and sap:// for the SDP to be " \
- "announced via SAP." )
+ "This allows you to specify how the SDP (Session Descriptor) for this RTP "\
+ "session will be made available. You must use an url: http://location to " \
+ "access the SDP via HTTP, rtsp://location for RTSP access, and sap:// " \
+ "for the SDP to be announced via SAP." )
#define MUX_TEXT N_("Muxer")
#define MUX_LONGTEXT N_( \
- "Allows you to specify the muxer used for the streaming output." )
+ "This allows you to specify the muxer used for the streaming output. " \
+ "Default is to use no muxer (standard RTP stream)." )
+
+#define NAME_TEXT N_("Session name")
+#define NAME_LONGTEXT N_( \
+ "This is the name of the session that will be announced in the SDP " \
+ "(Session Descriptor)." )
+#define DESC_TEXT N_("Session description")
+#define DESC_LONGTEXT N_( \
+ "This allows you to give a broader description of the stream, that will " \
+ "be announced in the SDP (Session Descriptor)." )
+#define URL_TEXT N_("Session URL")
+#define URL_LONGTEXT N_( \
+ "This allows you to give an URL with more details about the stream " \
+ "(often the website of the streaming organization), that will " \
+ "be announced in the SDP (Session Descriptor)." )
+#define EMAIL_TEXT N_("Session email")
+#define EMAIL_LONGTEXT N_( \
+ "This allows you to give a contact mail address for the stream, that will " \
+ "be announced in the SDP (Session Descriptor)." )
#define PORT_TEXT N_("Port")
#define PORT_LONGTEXT N_( \
- "Allows you to specify the base port used for the RTP streaming." )
-#define TTL_TEXT N_("Time to live")
+ "This allows you to specify the base port for the RTP streaming." )
+#define PORT_AUDIO_TEXT N_("Audio port")
+#define PORT_AUDIO_LONGTEXT N_( \
+ "This allows you to specify the default audio port for the RTP streaming." )
+#define PORT_VIDEO_TEXT N_("Video port")
+#define PORT_VIDEO_LONGTEXT N_( \
+ "This allows you to specify the default video port for the RTP streaming." )
+
+#define TTL_TEXT N_("Hop limit (TTL)")
#define TTL_LONGTEXT N_( \
- "Allows you to specify the time to live for the output stream." )
+ "This is the hop limit (also known as \"Time-To-Live\" or TTL) of " \
+ "the multicast packets sent by the stream output (0 = use operating " \
+ "system built-in default).")
+
+#define RFC3016_TEXT N_("MP4A LATM")
+#define RFC3016_LONGTEXT N_( \
+ "This allows you to stream MPEG4 LATM audio streams (see RFC3016)." )
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
#define SOUT_CFG_PREFIX "sout-rtp-"
vlc_module_begin();
+ set_shortname( _("RTP"));
set_description( _("RTP stream output") );
set_capability( "sout stream", 0 );
add_shortcut( "rtp" );
+ set_category( CAT_SOUT );
+ set_subcategory( SUBCAT_SOUT_STREAM );
add_string( SOUT_CFG_PREFIX "dst", "", NULL, DST_TEXT,
DST_LONGTEXT, VLC_TRUE );
- add_string( SOUT_CFG_PREFIX "name", "", NULL, NAME_TEXT,
- NAME_LONGTEXT, VLC_TRUE );
add_string( SOUT_CFG_PREFIX "sdp", "", NULL, SDP_TEXT,
SDP_LONGTEXT, VLC_TRUE );
add_string( SOUT_CFG_PREFIX "mux", "", NULL, MUX_TEXT,
MUX_LONGTEXT, VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "name", "NONE", NULL, NAME_TEXT,
+ NAME_LONGTEXT, VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "description", "", NULL, DESC_TEXT,
+ DESC_LONGTEXT, VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "url", "", NULL, URL_TEXT,
+ URL_LONGTEXT, VLC_TRUE );
+ add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT,
+ EMAIL_LONGTEXT, VLC_TRUE );
+
add_integer( SOUT_CFG_PREFIX "port", 1234, NULL, PORT_TEXT,
PORT_LONGTEXT, VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "port-audio", 1230, NULL, PORT_AUDIO_TEXT,
+ PORT_AUDIO_LONGTEXT, VLC_TRUE );
+ add_integer( SOUT_CFG_PREFIX "port-video", 1232, NULL, PORT_VIDEO_TEXT,
+ PORT_VIDEO_LONGTEXT, VLC_TRUE );
+
add_integer( SOUT_CFG_PREFIX "ttl", 0, NULL, TTL_TEXT,
TTL_LONGTEXT, VLC_TRUE );
+ add_bool( SOUT_CFG_PREFIX "mp4a-latm", 0, NULL, RFC3016_TEXT,
+ RFC3016_LONGTEXT, VLC_FALSE );
+
set_callbacks( Open, Close );
vlc_module_end();
* Exported prototypes
*****************************************************************************/
static const char *ppsz_sout_options[] = {
- "dst", "name", "port", "sdp", "ttl", "mux", NULL
+ "dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux",
+ "description", "url","email", "mp4a-latm", NULL
};
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
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;
/* */
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;
uint16_t i_sequence;
uint32_t i_timestamp_start;
uint8_t ssrc[4];
- block_t *packet;
+ block_t *packet;
/* */
vlc_mutex_t lock_es;
char *psz_destination;
int i_port;
int i_cat;
+ int i_bitrate;
/* Packetizer specific fields */
pf_rtp_packetizer_t pf_packetize;
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 * );
{
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_instance_t *p_sout = p_stream->p_sout;
- sout_stream_sys_t *p_sys;
+ sout_stream_sys_t *p_sys = NULL;
+ config_chain_t *p_cfg = NULL;
vlc_value_t val;
+ vlc_bool_t b_rtsp = VLC_FALSE;
- sout_ParseCfg( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg );
+ config_ChainParse( p_stream, SOUT_CFG_PREFIX,
+ ppsz_sout_options, p_stream->p_cfg );
p_sys = malloc( sizeof( sout_stream_sys_t ) );
- var_Get( p_stream, SOUT_CFG_PREFIX "dst", &val );
- p_sys->psz_destination = *val.psz_string ? val.psz_string : NULL;
+ 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_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" );
+ p_sys->psz_session_email = var_GetString( p_stream, SOUT_CFG_PREFIX "email" );
- var_Get( p_stream, SOUT_CFG_PREFIX "name", &val );
- p_sys->psz_session_name = *val.psz_string ? val.psz_string : NULL;
+ p_sys->i_port = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port" );
+ p_sys->i_port_audio = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port-audio" );
+ p_sys->i_port_video = var_GetInteger( p_stream, SOUT_CFG_PREFIX "port-video" );
- var_Get( p_stream, SOUT_CFG_PREFIX "port", &val );
- p_sys->i_port = val.i_int;
+ p_sys->psz_sdp_file = NULL;
+ if( p_sys->i_port_audio == p_sys->i_port_video )
+ {
+ msg_Err( p_stream, "audio and video port cannot be the same" );
+ p_sys->i_port_audio = 0;
+ p_sys->i_port_video = 0;
+ }
if( !p_sys->psz_session_name )
{
p_sys->psz_session_name = strdup( "NONE" );
}
- if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' )
+ for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
{
- var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val );
+ if( !strcmp( p_cfg->psz_name, "sdp" ) )
+ {
+ if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) )
+ {
+ b_rtsp = VLC_TRUE;
+ break;
+ }
+ }
+ }
+ if( !b_rtsp )
+ {
+ vlc_value_t val2;
+ var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val2 );
+ if( !strncasecmp( val2.psz_string, "rtsp", 4 ) )
+ b_rtsp = VLC_TRUE;
+ free( val2.psz_string );
+ }
- if( strncasecmp( val.psz_string, "rtsp", 4 ) )
+ if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' )
+ {
+ if( !b_rtsp )
{
msg_Err( p_stream, "missing destination and not in rtsp mode" );
free( p_sys );
return VLC_EGENERIC;
}
p_sys->psz_destination = NULL;
- free( val.psz_string );
}
else if( p_sys->i_port <= 0 )
{
}
var_Get( p_stream, SOUT_CFG_PREFIX "ttl", &val );
+ if( val.i_int == 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" );
+ }
+ if( val.i_int > 255 ) val.i_int = 255;
+ /* must not exceed 999 once formatted */
+
+ if( val.i_int < 0 )
+ {
+ msg_Err( p_stream, "illegal TTL %d", val.i_int );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
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->i_payload_type = 96;
p_sys->i_es = 0;
p_sys->es = NULL;
p_sys->psz_sdp = NULL;
p_sys->b_export_sap = VLC_FALSE;
+ p_sys->b_export_sdp_file = VLC_FALSE;
p_sys->p_session = NULL;
p_sys->p_httpd_host = NULL;
if( *val.psz_string )
{
sout_access_out_t *p_grab;
+ char *psz_rtpmap, url[NI_MAXHOST + 8], access[17], psz_ttl[5], ipv;
- char *psz_rtpmap;
- char access[100];
- char url[strlen( p_sys->psz_destination ) + 1 + 12 + 1];
+ if( b_rtsp )
+ {
+ msg_Err( p_stream, "muxing is not supported in RTSP mode" );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+ else if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' )
+ {
+ 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 ) )
else
{
msg_Err( p_stream, "unsupported muxer type with rtp (only ts/ps)" );
+ free( p_sys );
return VLC_EGENERIC;
}
{
sprintf( access, "udp{raw}" );
}
- sprintf( url, "%s:%d", p_sys->psz_destination, p_sys->i_port );
+
+ /* 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';
+
if( !( p_sys->p_access = sout_AccessOutNew( p_sout, access, url ) ) )
{
msg_Err( p_stream, "cannot create the access out for %s://%s",
return VLC_EGENERIC;
}
p_sys->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beurk */
- if( p_sys->i_mtu <= 16 )
+ if( p_sys->i_mtu <= 16 + MTU_REDUCE )
{
/* better than nothing */
p_sys->i_mtu = 1500;
}
+ p_sys->i_mtu -= MTU_REDUCE;
/* the access out grabber TODO export it as sout_AccessOutGrabberNew */
p_grab = p_sys->p_grab =
p_grab->p_sout = p_sout;
p_grab->psz_access = strdup( "grab" );
p_grab->p_cfg = NULL;
- p_grab->psz_name = strdup( "" );
+ p_grab->psz_path = strdup( "" );
p_grab->p_sys = (sout_access_out_sys_t*)p_stream;
p_grab->pf_seek = NULL;
p_grab->pf_write = AccessOutGrabberWrite;
return VLC_EGENERIC;
}
- /* create the SDP only once */
- p_sys->psz_sdp =
- malloc( 200 + 20 + 10 + strlen( p_sys->psz_destination ) +
- 10 + 10 + 10 + 10 + strlen( psz_rtpmap ) );
- sprintf( p_sys->psz_sdp,
- "v=0\n"
- "o=- "I64Fd" %d IN IP4 127.0.0.1\n"
- "s=%s\n"
- "c=IN IP4 %s/%d\n"
- "m=video %d RTP/AVP %d\n"
- "a=rtpmap:%d %s\n",
- p_sys->i_sdp_id, p_sys->i_sdp_version,
- p_sys->psz_session_name,
- p_sys->psz_destination, p_sys->i_ttl,
- p_sys->i_port, p_sys->i_payload_type,
- p_sys->i_payload_type, psz_rtpmap );
- fprintf( stderr, "sdp=%s", p_sys->psz_sdp );
+ /* create the SDP for a muxed stream (only once) */
+ /* FIXME http://www.faqs.org/rfcs/rfc4566.html
+ 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= x-plgroup: (missing)
+ RTP packets need to get the correct src IP address */
+ if( net_AddressIsMulticast( (vlc_object_t *)p_stream, p_sys->psz_destination ) )
+ {
+ snprintf( psz_ttl, sizeof( psz_ttl ), "/%d", p_sys->i_ttl );
+ psz_ttl[sizeof( psz_ttl ) - 1] = '\0';
+ }
+ else
+ {
+ psz_ttl[0] = '\0';
+ }
+
+ asprintf( &p_sys->psz_sdp,
+ "v=0\r\n"
+ /* FIXME: source address not known :( */
+ "o=- "I64Fd" %d IN IP%c %s\r\n"
+ "s=%s\r\n"
+ "i=%s\r\n"
+ "u=%s\r\n"
+ "e=%s\r\n"
+ "c=IN IP%c %s%s\r\n"
+ "t=0 0\r\n" /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
+ "a=tool:"PACKAGE_STRING"\r\n"
+ "a=recvonly\r\n"
+ "a=type:broadcast\r\n"
+ "m=video %d RTP/AVP %d\r\n"
+ "a=rtpmap:%d %s\r\n",
+ p_sys->i_sdp_id, p_sys->i_sdp_version,
+ ipv, ipv == '6' ? "::1" : "127.0.0.1" /* FIXME */,
+ p_sys->psz_session_name,
+ p_sys->psz_session_description,
+ p_sys->psz_session_url,
+ p_sys->psz_session_email,
+ ipv, p_sys->psz_destination, psz_ttl,
+ p_sys->i_port, p_sys->i_payload_type,
+ p_sys->i_payload_type, psz_rtpmap );
+ msg_Dbg( p_stream, "sdp=%s", p_sys->psz_sdp );
/* create the rtp context */
p_sys->ssrc[0] = rand()&0xff;
var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val );
if( *val.psz_string )
{
- vlc_url_t url;
+ config_chain_t *p_cfg;
- vlc_UrlParse( &url, val.psz_string, 0 );
- if( url.psz_protocol && !strcasecmp( url.psz_protocol, "http" ) )
- {
- if( HttpSetup( p_stream, &url ) )
- {
- msg_Err( p_stream, "cannot export sdp as http" );
- }
- }
- if( url.psz_protocol && !strcasecmp( url.psz_protocol, "rtsp" ) )
+ SDPHandleUrl( p_stream, val.psz_string );
+
+ for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
{
- /* FIXME test if destination is multicast or no destination at all FIXME */
- if( RtspSetup( p_stream, &url ) )
+ if( !strcmp( p_cfg->psz_name, "sdp" ) )
{
- msg_Err( p_stream, "cannot export sdp as rtsp" );
+ 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 */
+ continue;
+
+ SDPHandleUrl( p_stream, p_cfg->psz_value );
}
}
- else if( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) )
- {
- p_sys->b_export_sap = VLC_TRUE;
- SapSetup( p_stream );
- }
- else
- {
- msg_Warn( p_stream, "unknow protocol for SDP (%s)",
- url.psz_protocol );
- }
- vlc_UrlClean( &url );
}
free( val.psz_string );
{
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 )
{
httpd_HostDelete( p_sys->p_rtsp_host );
}
-#if 0
if( p_sys->psz_session_name )
{
free( p_sys->psz_session_name );
p_sys->psz_session_name = NULL;
}
-#endif
+ 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
+ unlink( p_sys->psz_sdp_file );
+#endif
+ free( p_sys->psz_sdp_file );
}
free( p_sys );
}
+/*****************************************************************************
+ * SDPHandleUrl:
+ *****************************************************************************/
+static void SDPHandleUrl( sout_stream_t *p_stream, char *psz_url )
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ vlc_url_t url;
+
+ vlc_UrlParse( &url, psz_url, 0 );
+ if( url.psz_protocol && !strcasecmp( url.psz_protocol, "http" ) )
+ {
+ if( p_sys->p_httpd_file )
+ {
+ msg_Err( p_stream, "you can use sdp=http:// only once" );
+ return;
+ }
+
+ if( HttpSetup( p_stream, &url ) )
+ {
+ msg_Err( p_stream, "cannot export sdp as http" );
+ }
+ }
+ else if( url.psz_protocol && !strcasecmp( url.psz_protocol, "rtsp" ) )
+ {
+ if( p_sys->p_rtsp_url )
+ {
+ msg_Err( p_stream, "you can use sdp=rtsp:// only once" );
+ return;
+ }
+
+ /* FIXME test if destination is multicast or no destination at all FIXME */
+ if( RtspSetup( p_stream, &url ) )
+ {
+ msg_Err( p_stream, "cannot export sdp as rtsp" );
+ }
+ }
+ else if( ( url.psz_protocol && !strcasecmp( url.psz_protocol, "sap" ) ) ||
+ ( url.psz_host && !strcasecmp( url.psz_host, "sap" ) ) )
+ {
+ p_sys->b_export_sap = VLC_TRUE;
+ SapSetup( p_stream );
+ }
+ else if( url.psz_protocol && !strcasecmp( url.psz_protocol, "file" ) )
+ {
+ if( p_sys->b_export_sdp_file )
+ {
+ msg_Err( p_stream, "you can use sdp=file:// only once" );
+ return;
+ }
+ p_sys->b_export_sdp_file = VLC_TRUE;
+ psz_url = &psz_url[5];
+ if( psz_url[0] == '/' && psz_url[1] == '/' )
+ psz_url += 2;
+ p_sys->psz_sdp_file = strdup( psz_url );
+ }
+ else
+ {
+ msg_Warn( p_stream, "unknown protocol for SDP (%s)",
+ url.psz_protocol );
+ }
+ vlc_UrlClean( &url );
+}
+
/*****************************************************************************
* SDPGenerate
*****************************************************************************/
-static char *SDPGenerate( sout_stream_t *p_stream, char *psz_destination, vlc_bool_t b_rtsp )
+ /* FIXME http://www.faqs.org/rfcs/rfc2327.html
+ All text fields should be UTF-8 encoded. Use global a:charset to announce this.
+ o= - should be local username (no spaces allowed)
+ o= time should be hashed with some other value to garantue uniqueness
+ o= we need IP6 support?
+ o= don't use the localhost address. use fully qualified domain name or IP4 address
+ p= international phone number (pass via vars?)
+ c= IP6 support
+ a= recvonly (missing)
+ a= type:broadcast (missing)
+ 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,
+ const char *psz_destination, vlc_bool_t b_rtsp )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
int i_size;
- char *psz_sdp, *p;
+ char *psz_sdp, *p, ipv;
int i;
- i_size = strlen( "v=0\n" ) +
- strlen( "o=- * * IN IP4 127.0.0.1\n" ) +
- strlen( "s=\n" ) +
- strlen( "c=IN IP4 */*\n" ) +
- strlen( psz_destination ? psz_destination : "0.0.0.0") +
- strlen( p_sys->psz_session_name ) +
- 20 + 10 + 10 + 1;
+ /* FIXME: breaks IP version check on unknown destination */
+ if( psz_destination == NULL )
+ psz_destination = "0.0.0.0";
+
+ i_size = sizeof( "v=0\r\n" ) +
+ sizeof( "o=- * * IN IP4 127.0.0.1\r\n" ) + 10 + 10 +
+ sizeof( "s=*\r\n" ) + strlen( p_sys->psz_session_name ) +
+ sizeof( "i=*\r\n" ) + strlen( p_sys->psz_session_description ) +
+ 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( "a=tool:"PACKAGE_STRING"\r\n" ) +
+ sizeof( "c=IN IP4 */*\r\n" ) + 20 + 10 +
+ strlen( psz_destination ) ;
for( i = 0; i < p_sys->i_es; i++ )
{
sout_stream_id_t *id = p_sys->es[i];
- i_size += strlen( "m=**d*o * RTP/AVP *\n" ) + 10 + 10;
+ i_size += strlen( "m=**d*o * RTP/AVP *\r\n" ) + 10 + 10;
if( id->psz_rtpmap )
{
- i_size += strlen( "a=rtpmap:* *\n" ) + strlen( id->psz_rtpmap )+10;
+ i_size += strlen( "a=rtpmap:* *\r\n" ) + strlen( id->psz_rtpmap )+10;
}
if( id->psz_fmtp )
{
- i_size += strlen( "a=fmtp:* *\n" ) + strlen( id->psz_fmtp ) + 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=*\n" ) + strlen( p_sys->psz_rtsp_control ) + 10;
+ i_size += strlen( "a=control:*/trackID=*\r\n" ) + strlen( p_sys->psz_rtsp_control ) + 10;
}
}
+ if( p_sys->p_mux )
+ {
+ i_size += strlen( "m=video %d RTP/AVP %d\r\n" ) +10 +10;
+ }
+
+ ipv = ( strchr( psz_destination, ':' ) != NULL ) ? '6' : '4';
p = psz_sdp = malloc( i_size );
- p += sprintf( p, "v=0\n" );
- p += sprintf( p, "o=- "I64Fd" %d IN IP4 127.0.0.1\n",
- p_sys->i_sdp_id, p_sys->i_sdp_version );
- p += sprintf( p, "s=%s\n", p_sys->psz_session_name );
- p += sprintf( p, "c=IN IP4 %s/%d\n", psz_destination ? psz_destination : "0.0.0.0",
- p_sys->i_ttl );
+ 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" );
+ 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, "i=%s\r\n", p_sys->psz_session_description );
+ if( *p_sys->psz_session_url )
+ p += sprintf( p, "u=%s\r\n", p_sys->psz_session_url );
+ if( *p_sys->psz_session_email )
+ p += sprintf( p, "e=%s\r\n", p_sys->psz_session_email );
+
+ p += sprintf( p, "t=0 0\r\n" ); /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
+ p += sprintf( p, "a=tool:"PACKAGE_STRING"\r\n" );
+
+ 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 ?: 1 );
+ }
+ else
+ {
+ p += sprintf( p, "\r\n" );
+ }
for( i = 0; i < p_sys->i_es; i++ )
{
if( id->i_cat == AUDIO_ES )
{
- p += sprintf( p, "m=audio %d RTP/AVP %d\n",
+ p += sprintf( p, "m=audio %d RTP/AVP %d\r\n",
id->i_port, id->i_payload_type );
}
else if( id->i_cat == VIDEO_ES )
{
- p += sprintf( p, "m=video %d RTP/AVP %d\n",
+ p += sprintf( p, "m=video %d RTP/AVP %d\r\n",
id->i_port, id->i_payload_type );
}
else
}
if( id->psz_rtpmap )
{
- p += sprintf( p, "a=rtpmap:%d %s\n", id->i_payload_type,
+ p += sprintf( p, "a=rtpmap:%d %s\r\n", id->i_payload_type,
id->psz_rtpmap );
}
if( id->psz_fmtp )
{
- p += sprintf( p, "a=fmtp:%d %s\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:%s/trackid=%d\n", p_sys->psz_rtsp_control, i );
+ p += sprintf( p, "a=control:trackID=%d\r\n", i );
}
}
+ if( p_sys->p_mux )
+ {
+ p += sprintf( p, "m=video %d RTP/AVP %d\r\n",
+ p_sys->i_port, p_sys->i_payload_type );
+ }
return psz_sdp;
}
static int rtp_packetize_ac3 ( sout_stream_t *, sout_stream_id_t *, block_t * );
static int rtp_packetize_split( sout_stream_t *, sout_stream_id_t *, block_t * );
static int rtp_packetize_mp4a ( sout_stream_t *, sout_stream_id_t *, block_t * );
+static int rtp_packetize_mp4a_latm ( sout_stream_t *, sout_stream_id_t *, block_t * );
static int rtp_packetize_h263 ( sout_stream_t *, sout_stream_id_t *, block_t * );
+static int rtp_packetize_h264 ( sout_stream_t *, sout_stream_id_t *, block_t * );
+static int rtp_packetize_amr ( sout_stream_t *, sout_stream_id_t *, block_t * );
static void sprintf_hexa( char *s, uint8_t *p_data, int i_data )
{
s[2*i_data] = '\0';
}
+static const char basis_64[] =
+ "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+int ap_base64encode_len(int len)
+{
+ return ((len + 2) / 3 * 4) + 1;
+}
+
+int ap_base64encode_binary(char *encoded,
+ const unsigned char *string, int len)
+{
+ int i;
+ char *p;
+
+ p = encoded;
+ for (i = 0; i < len - 2; i += 3) {
+ *p++ = basis_64[(string[i] >> 2) & 0x3F];
+ *p++ = basis_64[((string[i] & 0x3) << 4) |
+ ((int) (string[i + 1] & 0xF0) >> 4)];
+ *p++ = basis_64[((string[i + 1] & 0xF) << 2) |
+ ((int) (string[i + 2] & 0xC0) >> 6)];
+ *p++ = basis_64[string[i + 2] & 0x3F];
+ }
+ if (i < len) {
+ *p++ = basis_64[(string[i] >> 2) & 0x3F];
+ if (i == (len - 1)) {
+ *p++ = basis_64[((string[i] & 0x3) << 4)];
+ *p++ = '=';
+ }
+ else {
+ *p++ = basis_64[((string[i] & 0x3) << 4) |
+ ((int) (string[i + 1] & 0xF0) >> 4)];
+ *p++ = basis_64[((string[i + 1] & 0xF) << 2)];
+ }
+ *p++ = '=';
+ }
+
+ *p++ = '\0';
+ return p - encoded;
+}
+
+int ap_base64encode(char *encoded, const char *string, int len)
+{
+ return ap_base64encode_binary(encoded, (const unsigned char *) string, len);
+}
+
+char *b64_encode(char *buf, int len)
+{
+ int elen;
+ char *out;
+
+ if(len == 0)
+ len = strlen(buf);
+
+ elen = ap_base64encode_len(len);
+ out = (char *) malloc(sizeof(char) * (elen + 1));
+
+ ap_base64encode(out, buf, len);
+
+ return out;
+}
+
static sout_stream_id_t *Add( sout_stream_t *p_stream, es_format_t *p_fmt )
{
sout_instance_t *p_sout = p_stream->p_sout;
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_stream_id_t *id;
sout_access_out_t *p_access = NULL;
+ int i_port;
+ char *psz_sdp;
if( p_sys->p_mux != NULL )
{
id->p_input = p_input;
id->pf_packetize= NULL;
id->p_rtsp_url = NULL;
-
+ id->i_port = 0;
return id;
}
+
+ /* Choose the port */
+ i_port = 0;
+ if( p_fmt->i_cat == AUDIO_ES && p_sys->i_port_audio > 0 )
+ {
+ i_port = p_sys->i_port_audio;
+ p_sys->i_port_audio = 0;
+ }
+ else if( p_fmt->i_cat == VIDEO_ES && p_sys->i_port_video > 0 )
+ {
+ i_port = p_sys->i_port_video;
+ p_sys->i_port_video = 0;
+ }
+ while( i_port == 0 )
+ {
+ if( p_sys->i_port != p_sys->i_port_audio && p_sys->i_port != p_sys->i_port_video )
+ {
+ i_port = p_sys->i_port;
+ p_sys->i_port += 2;
+ break;
+ }
+ p_sys->i_port += 2;
+ }
+
if( p_sys->psz_destination )
{
- char access[100];
- char url[strlen( p_sys->psz_destination ) + 1 + 12 + 1];
+ char access[17];
+ char url[NI_MAXHOST + 8];
/* first try to create the access out */
- if( p_sys->i_ttl > 0 )
+ if( p_sys->i_ttl )
{
- sprintf( access, "udp{raw,ttl=%d}", p_sys->i_ttl );
+ snprintf( access, sizeof( access ), "udp{raw,ttl=%d}",
+ p_sys->i_ttl );
+ access[sizeof( access ) - 1] = '\0';
}
else
- {
- sprintf( access, "udp{raw}" );
- }
- sprintf( url, "%s:%d", p_sys->psz_destination, p_sys->i_port );
+ strcpy( access, "udp{raw}" );
+
+ snprintf( url, sizeof( url ), (( p_sys->psz_destination[0] != '[' ) &&
+ strchr( p_sys->psz_destination, ':' )) ? "[%s]:%d" : "%s:%d",
+ p_sys->psz_destination, i_port );
+ url[sizeof( url ) - 1] = '\0';
+
if( ( p_access = sout_AccessOutNew( p_sout, access, url ) ) == NULL )
{
msg_Err( p_stream, "cannot create the access out for %s://%s",
id->psz_rtpmap = NULL;
id->psz_fmtp = NULL;
id->psz_destination = p_sys->psz_destination ? strdup( p_sys->psz_destination ) : NULL;
- id->i_port = p_sys->i_port;
+ id->i_port = i_port;
id->p_rtsp_url = NULL;
vlc_mutex_init( p_stream, &id->lock_rtsp );
id->i_rtsp_access = 0;
id->psz_rtpmap = strdup( "H263-1998/90000" );
id->pf_packetize = rtp_packetize_h263;
break;
+ case VLC_FOURCC( 'h', '2', '6', '4' ):
+ id->i_payload_type = p_sys->i_payload_type++;
+ id->i_clock_rate = 90000;
+ id->psz_rtpmap = strdup( "H264/90000" );
+ id->pf_packetize = rtp_packetize_h264;
+ if( p_fmt->i_extra > 0 )
+ {
+ uint8_t *p_buffer = p_fmt->p_extra;
+ int i_buffer = p_fmt->i_extra;
+ char *p_64_sps = NULL;
+ char *p_64_pps = NULL;
+ char hexa[6];
+
+ while( i_buffer > 4 &&
+ p_buffer[0] == 0 && p_buffer[1] == 0 &&
+ p_buffer[2] == 0 && p_buffer[3] == 1 )
+ {
+ const int i_nal_type = p_buffer[4]&0x1f;
+ int i_offset = 1;
+ int i_size = 0;
+ int i_startcode = 0;
+ int i_encoded = 0;
+
+ msg_Dbg( p_stream, "we found a startcode for NAL with TYPE:%d", i_nal_type );
+
+ for( i_offset = 1; 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 )
+ {
+ /* we found another startcode */
+ i_startcode = i_offset;
+ break;
+ }
+ }
+ i_size = i_startcode ? i_startcode : i_buffer;
+ if( i_nal_type == 7 )
+ {
+ p_64_sps = (char *)malloc( ap_base64encode_len( i_size - 4) );
+ i_encoded = ap_base64encode_binary( p_64_sps, &p_buffer[4], i_size - 4 );
+ p_64_sps[i_encoded] = '\0';
+ sprintf_hexa( hexa, &p_buffer[5], 3 );
+ hexa[6] = '\0';
+ }
+ if( i_nal_type == 8 )
+ {
+ p_64_pps = (char *)malloc( ap_base64encode_len( i_size - 4) );
+ i_encoded = ap_base64encode_binary( p_64_pps, &p_buffer[4], i_size - 4 );
+ p_64_pps[i_encoded] = '\0';
+ }
+ i_buffer -= i_size;
+ p_buffer += i_size;
+ }
+ /* FIXME: All this is a bit unsafe */
+ asprintf( &id->psz_fmtp, "packetization-mode=1;profile-level-id=%s;sprop-parameter-sets=%s,%s;", hexa, p_64_sps, p_64_pps );
+ free( p_64_sps );
+ free( p_64_pps );
+ }
+ else
+ id->psz_fmtp = strdup( "packetization-mode=1" );
+if( p_fmt->i_extra > 0 )
+msg_Dbg( p_stream, "WE HAVE %d bytes extra data", p_fmt->i_extra );
+ break;
case VLC_FOURCC( 'm', 'p', '4', 'v' ):
{
}
case VLC_FOURCC( 'm', 'p', '4', 'a' ):
{
- char hexa[2*p_fmt->i_extra +1];
-
id->i_payload_type = p_sys->i_payload_type++;
id->i_clock_rate = p_fmt->audio.i_rate;
- id->psz_rtpmap = malloc( strlen( "mpeg4-generic/" ) + 12 );
- sprintf( id->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate );
- id->pf_packetize = rtp_packetize_mp4a;
- id->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra );
- sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
- sprintf( id->psz_fmtp,
- "streamtype=5; profile-level-id=15; mode=AAC-hbr; "
- "config=%s; SizeLength=13;IndexLength=3; "
- "IndexDeltaLength=3; Profile=1;", hexa );
+
+ if(!p_sys->b_latm)
+ {
+ char hexa[2*p_fmt->i_extra +1];
+
+ id->psz_rtpmap = malloc( strlen( "mpeg4-generic/" ) + 12 );
+ sprintf( id->psz_rtpmap, "mpeg4-generic/%d", p_fmt->audio.i_rate );
+ id->pf_packetize = rtp_packetize_mp4a;
+ id->psz_fmtp = malloc( 200 + 2 * p_fmt->i_extra );
+ sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
+ sprintf( id->psz_fmtp,
+ "streamtype=5; profile-level-id=15; mode=AAC-hbr; "
+ "config=%s; SizeLength=13;IndexLength=3; "
+ "IndexDeltaLength=3; Profile=1;", hexa );
+ }
+ else
+ {
+ char hexa[13];
+ int i;
+ unsigned char config[6];
+ unsigned int aacsrates[15] = {
+ 96000, 88200, 64000, 48000, 44100, 32000, 24000, 22050,
+ 16000, 12000, 11025, 8000, 7350, 0, 0 };
+
+ for( i = 0; i < 15; i++ )
+ if( p_fmt->audio.i_rate == aacsrates[i] )
+ break;
+
+ config[0]=0x40;
+ config[1]=0;
+ config[2]=0x20|i;
+ config[3]=p_fmt->audio.i_channels<<4;
+ config[4]=0x3f;
+ config[5]=0xc0;
+
+ asprintf( &id->psz_rtpmap, "MP4A-LATM/%d/%d",
+ p_fmt->audio.i_rate, p_fmt->audio.i_channels );
+ id->pf_packetize = rtp_packetize_mp4a_latm;
+ sprintf_hexa( hexa, config, 6 );
+ asprintf( &id->psz_fmtp, "profile-level-id=15; "
+ "object=2; cpresent=0; config=%s", hexa );
+ }
break;
}
+ case VLC_FOURCC( 's', 'a', 'm', 'r' ):
+ id->i_payload_type = p_sys->i_payload_type++;
+ id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
+ "AMR/8000/2" : "AMR/8000" );
+ id->psz_fmtp = strdup( "octet-align=1" );
+ id->i_clock_rate = p_fmt->audio.i_rate;
+ id->pf_packetize = rtp_packetize_amr;
+ break;
+ case VLC_FOURCC( 's', 'a', 'w', 'b' ):
+ id->i_payload_type = p_sys->i_payload_type++;
+ id->psz_rtpmap = strdup( p_fmt->audio.i_channels == 2 ?
+ "AMR-WB/16000/2" : "AMR-WB/16000" );
+ id->psz_fmtp = strdup( "octet-align=1" );
+ id->i_clock_rate = p_fmt->audio.i_rate;
+ id->pf_packetize = rtp_packetize_amr;
+ break;
default:
msg_Err( p_stream, "cannot add this stream (unsupported "
"codec:%4.4s)", (char*)&p_fmt->i_codec );
+ if( p_access )
+ {
+ sout_AccessOutDelete( p_access );
+ }
free( id );
return NULL;
}
id->ssrc[3] = rand()&0xff;
id->i_sequence = rand()&0xffff;
id->i_timestamp_start = rand()&0xffffffff;
+ id->i_bitrate = p_fmt->i_bitrate/1000; /* Stream bitrate in kbps */
id->i_mtu = config_GetInt( p_stream, "mtu" ); /* XXX beuk */
- if( id->i_mtu <= 16 )
+ if( id->i_mtu <= 16 + MTU_REDUCE )
{
/* better than nothing */
id->i_mtu = 1500;
}
- msg_Dbg( p_stream, "using mtu=%d", id->i_mtu );
+ id->i_mtu -= MTU_REDUCE;
+ 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 );
- fprintf( stderr, "rtsp: adding %s\n", psz_urlc );
- id->p_rtsp_url = httpd_UrlNewUnique( p_sys->p_rtsp_host, psz_urlc, NULL, NULL );
+ 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 )
{
/* Update p_sys context */
- /* update port used (2 -> 1 rtp, 1 rtcp )*/
vlc_mutex_lock( &p_sys->lock_es );
TAB_APPEND( p_sys->i_es, p_sys->es, id );
vlc_mutex_unlock( &p_sys->lock_es );
- if( p_sys->p_mux == NULL )
- {
- char *psz_sdp;
- p_sys->i_port += 2;
- psz_sdp = SDPGenerate( p_stream, p_sys->psz_destination, VLC_FALSE );
+ psz_sdp = SDPGenerate( p_stream, p_sys->psz_destination, VLC_FALSE );
- vlc_mutex_lock( &p_sys->lock_sdp );
- free( p_sys->psz_sdp );
- p_sys->psz_sdp = psz_sdp;
- vlc_mutex_unlock( &p_sys->lock_sdp );
+ vlc_mutex_lock( &p_sys->lock_sdp );
+ free( p_sys->psz_sdp );
+ p_sys->psz_sdp = psz_sdp;
+ vlc_mutex_unlock( &p_sys->lock_sdp );
- p_sys->i_sdp_version++;
+ p_sys->i_sdp_version++;
- fprintf( stderr, "sdp=%s", p_sys->psz_sdp );
+ msg_Dbg( p_stream, "sdp=%s", p_sys->psz_sdp );
- /* Update the SAP announce */
- if( p_sys->b_export_sap )
- {
- SapSetup( p_stream );
- }
- }
+ /* Update SDP (sap/file) */
+ if( p_sys->b_export_sap ) SapSetup( p_stream );
+ if( p_sys->b_export_sdp_file ) FileSetup( p_stream );
return id;
}
TAB_REMOVE( p_sys->i_es, p_sys->es, id );
vlc_mutex_unlock( &p_sys->lock_es );
+ /* Release port */
+ if( id->i_port > 0 )
+ {
+ if( id->i_cat == AUDIO_ES && p_sys->i_port_audio == 0 )
+ p_sys->i_port_audio = id->i_port;
+ else if( id->i_cat == VIDEO_ES && p_sys->i_port_video == 0 )
+ p_sys->i_port_video = id->i_port;
+ }
+
if( id->p_access )
{
if( id->psz_rtpmap )
vlc_mutex_destroy( &id->lock_rtsp );
if( id->rtsp_access ) free( id->rtsp_access );
- /* Update the SAP announce */
- if( p_sys->b_export_sap )
- {
- SapSetup( p_stream );
- }
+ /* Update SDP (sap/file) */
+ if( p_sys->b_export_sap && !p_sys->p_mux ) SapSetup( p_stream );
+ if( p_sys->b_export_sdp_file ) FileSetup( p_stream );
free( id );
return VLC_SUCCESS;
unsigned int i_data = p_buffer->i_buffer;
unsigned int i_max = p_sys->i_mtu - 12;
- int i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max;
+ unsigned i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max;
while( i_data > 0 )
{
p_sys->i_sequence++;
}
- i_size = __MIN( i_data, p_sys->i_mtu - p_sys->packet->i_buffer );
+ i_size = __MIN( i_data,
+ (unsigned)(p_sys->i_mtu - p_sys->packet->i_buffer) );
memcpy( &p_sys->packet->p_buffer[p_sys->packet->i_buffer],
p_data, i_size );
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
sout_instance_t *p_sout = p_stream->p_sout;
- announce_method_t *p_method = (announce_method_t *)
- malloc(sizeof(announce_method_t));
+ announce_method_t *p_method = sout_SAPMethod();
/* Remove the previous session */
if( p_sys->p_session != NULL)
sout_AnnounceSessionDestroy( p_sys->p_session );
p_sys->p_session = NULL;
}
- p_method->i_type = METHOD_TYPE_SAP;
- p_method->psz_address = NULL; /* FIXME */
- p_method->i_ip_version = 4; /* FIXME ! */
- if( p_sys->i_es > 0 && p_sys->psz_sdp && *p_sys->psz_sdp )
+ if( ( p_sys->i_es > 0 || p_sys->p_mux ) && p_sys->psz_sdp && *p_sys->psz_sdp )
{
- p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, p_sys->psz_sdp,
+ p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, SOUT_CFG_PREFIX,
+ p_sys->psz_sdp,
+ p_sys->psz_destination,
p_method );
}
- free( p_method );
+ sout_MethodRelease( p_method );
+ return VLC_SUCCESS;
+}
+
+/****************************************************************************
+* File:
+****************************************************************************/
+static int FileSetup( sout_stream_t *p_stream )
+{
+ sout_stream_sys_t *p_sys = p_stream->p_sys;
+ FILE *f;
+
+ if( ( f = utf8_fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL )
+ {
+ msg_Err( p_stream, "cannot open file '%s' (%s)",
+ p_sys->psz_sdp_file, strerror(errno) );
+ return VLC_EGENERIC;
+ }
+
+ fprintf( f, "%s", p_sys->psz_sdp );
+ fclose( f );
+
return VLC_SUCCESS;
}
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host, url->i_port );
+ p_sys->p_httpd_host = httpd_HostNew( VLC_OBJECT(p_stream), url->psz_host, url->i_port > 0 ? url->i_port : 80 );
if( p_sys->p_httpd_host )
{
p_sys->p_httpd_file = httpd_FileNew( p_sys->p_httpd_host,
url->psz_path ? url->psz_path : "/",
"application/sdp",
- NULL, NULL,
+ NULL, NULL, NULL,
HttpCallback, (void*)p_sys );
}
if( p_sys->p_httpd_file == NULL )
static rtsp_client_t *RtspClientGet( sout_stream_t *p_stream, 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 ) )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
- fprintf( stderr, "rtsp setup: %s : %d / %s\n", url->psz_host, url->i_port, url->psz_path );
+ 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 )
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 );
+ 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;
{
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;
- char *psz_session = NULL;
+ char *psz_destination = p_sys->psz_destination;
+ char *psz_session = NULL;
+ 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 );
+ //fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type );
answer->i_proto = HTTPD_PROTO_RTSP;
answer->i_version= query->i_version;
answer->i_status = 200;
answer->psz_status = strdup( "OK" );
httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" );
-
- answer->p_body = psz_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;
}
default:
return VLC_EGENERIC;
}
- httpd_MsgAdd( answer, "Server", "VLC Server" );
+ httpd_MsgAdd( answer, "Server", PACKAGE_STRING );
httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
- httpd_MsgAdd( answer, "Cseq", "%d", atoi( httpd_MsgGet( query, "Cseq" ) ) );
+ 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 )
return VLC_SUCCESS;
}
-static int RtspCallbackId( httpd_callback_sys_t *p_args,
+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 = NULL;
+ char *psz_session = NULL;
+ 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 );
+ //fprintf( stderr, "RtspCallback query: type=%d\n", query->i_type );
answer->i_proto = HTTPD_PROTO_RTSP;
answer->i_version= query->i_version;
{
char *psz_transport = httpd_MsgGet( query, "Transport" );
- fprintf( stderr, "HTTPD_MSG_SETUP: transport=%s\n", psz_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" );
+ //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 == 0 )
+ if( !psz_session )
{
psz_session = malloc( 100 );
sprintf( psz_session, "%d", rand() );
}
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 );
+ id->psz_destination, id->i_port,id->i_port+1,
+ p_sys->i_ttl );
}
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 = httpd_ClientIP( cl );
-
- char psz_access[100];
- char psz_url[100];
+ char ip[NI_MAXNUMERICHOST], psz_access[17], psz_url[NI_MAXNUMERICHOST + 8];
sout_access_out_t *p_access;
rtsp_client_t *rtsp = NULL;
- fprintf( stderr, "HTTPD_MSG_SETUP: unicast ip=%s port=%d\n",
- ip, i_port );
+ 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 == 0 )
+ if( !psz_session )
{
psz_session = malloc( 100 );
sprintf( psz_session, "%d", rand() );
rtsp = RtspClientGet( p_stream, psz_session );
if( rtsp == NULL )
{
- /* FIXME right error code */
- answer->i_status = 400;
+ answer->i_status = 454;
answer->psz_status = strdup( "Unknown session id" );
answer->i_body = 0;
answer->p_body = NULL;
- free( ip );
break;
}
}
/* first try to create the access out */
- if( p_sys->i_ttl > 0 )
- sprintf( psz_access, "udp{raw,ttl=%d}", p_sys->i_ttl );
+ if( p_sys->i_ttl )
+ snprintf( psz_access, sizeof( psz_access ),
+ "udp{raw,ttl=%d}", p_sys->i_ttl );
else
- sprintf( psz_access, "udp{raw}" );
- sprintf( psz_url, "%s:%d", ip, i_port );
- free( ip );
-
+ 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 = 400;
- answer->psz_status = strdup( "Server internal error" );
+ answer->i_status = 500;
+ answer->psz_status = strdup( "Internal server error" );
answer->i_body = 0;
answer->p_body = NULL;
break;
}
else /* TODO strstr( psz_transport, "interleaved" ) ) */
{
- answer->i_status = 400;
- answer->psz_status = strdup( "Bad Request" );
+ answer->i_status = 461;
+ answer->psz_status = strdup( "Unsupported Transport" );
answer->i_body = 0;
answer->p_body = NULL;
}
}
httpd_MsgAdd( answer, "Server", "VLC Server" );
httpd_MsgAdd( answer, "Content-Length", "%d", answer->i_body );
- httpd_MsgAdd( answer, "Cseq", "%d", atoi( httpd_MsgGet( query, "Cseq" ) ) );
+ 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 )
return VLC_SUCCESS;
}
+
static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id,
block_t *in )
{
return VLC_SUCCESS;
}
+/* rfc3016 */
+static int rtp_packetize_mp4a_latm( sout_stream_t *p_stream, sout_stream_id_t *id,
+ block_t *in )
+{
+ int i_max = id->i_mtu - 14; /* payload max in one packet */
+ int latmhdrsize = in->i_buffer / 0xff + 1;
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
+
+ uint8_t *p_data = in->p_buffer, *p_header = NULL;
+ int i_data = in->i_buffer;
+ int i;
+
+ for( i = 0; i < i_count; i++ )
+ {
+ int i_payload = __MIN( i_max, i_data );
+ block_t *out;
+
+ if( i != 0 )
+ latmhdrsize = 0;
+ out = block_New( p_stream, 12 + latmhdrsize + i_payload );
+
+ /* rtp common header */
+ rtp_packetize_common( id, out, ((i == i_count - 1) ? 1 : 0),
+ (in->i_pts > 0 ? in->i_pts : in->i_dts) );
+
+ if( i == 0 )
+ {
+ int tmp = in->i_buffer;
+
+ p_header=out->p_buffer+12;
+ while( tmp > 0xfe )
+ {
+ *p_header = 0xff;
+ p_header++;
+ tmp -= 0xff;
+ }
+ *p_header = tmp;
+ }
+
+ memcpy( &out->p_buffer[12+latmhdrsize], p_data, i_payload );
+
+ out->i_buffer = 12 + latmhdrsize + i_payload;
+ out->i_dts = in->i_dts + i * in->i_length / i_count;
+ out->i_length = in->i_length / i_count;
+
+ rtp_packetize_send( id, out );
+
+ p_data += i_payload;
+ i_data -= i_payload;
+ }
+
+ return VLC_SUCCESS;
+}
+
static int rtp_packetize_l16( sout_stream_t *p_stream, sout_stream_id_t *id,
block_t *in )
{
return VLC_SUCCESS;
}
+/* rfc3984 */
+static int rtp_packetize_h264( sout_stream_t *p_stream, sout_stream_id_t *id,
+ block_t *in )
+{
+ int i_max = id->i_mtu - 12; /* payload max in one packet */
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
+ uint8_t *p_data = in->p_buffer;
+ int i_data = in->i_buffer;
+ block_t *out;
+ int i_nal_type;
+ int i_payload;
+
+ while( i_data > 5 &&
+ ( p_data[0] != 0x00 || p_data[1] != 0x00 || p_data[2] != 0x01 || /* startcode */
+ (p_data[3]&0x1f) < 1 || (p_data[3]&0x1f) > 23 ) ) /* naltype should be between 1 and 23 */
+ {
+ p_data++;
+ i_data--;
+ }
+
+ if( i_data < 5 )
+ return VLC_SUCCESS;
+
+ p_data+=3;
+ i_data-=3;
+ i_nal_type = p_data[0]&0x1f;
+
+ /* Skip global headers */
+ if( i_nal_type == 7 || i_nal_type == 8 )
+ return VLC_SUCCESS;
+
+ if( i_data <= i_max ) /* The whole pack will fit in one rtp payload */
+ {
+ /* single NAL */
+ i_payload = __MIN( i_max, i_data );
+ out = block_New( p_stream, 12 + i_payload );
+
+ /* rtp common header */
+ rtp_packetize_common( id, out, 1,
+ in->i_pts > 0 ? in->i_pts : in->i_dts );
+
+ memcpy( &out->p_buffer[12], p_data, i_payload );
+
+ out->i_buffer = 12 + i_payload;
+ out->i_dts = in->i_dts;
+ out->i_length = in->i_length;
+
+ rtp_packetize_send( id, out );
+
+ /*msg_Dbg( p_stream, "nal-out plain %d %02x", i_payload, out->p_buffer[16] );*/
+ }
+ else
+ {
+ /* FU-A */
+ uint8_t nalh; /* The nalheader byte */
+ int i=0, start=1, end=0, first=0;
+
+ nalh = *p_data;
+ p_data++;
+ i_data--;
+
+ i_max = id->i_mtu - 14;
+ i_count = ( i_data + i_max - 1 ) / i_max;
+
+ /*msg_Dbg( p_stream, "nal-out fragmented %02x %d", nalh, i_rest);*/
+
+ while( end == 0 )
+ {
+ i_payload = __MIN( i_max, i_data );
+ out = block_New( p_stream, 14 + i_payload );
+
+ if( i_data == i_payload )
+ end = 1;
+
+ /* rtp common header */
+ rtp_packetize_common( id, out, (end)?1:0,
+ in->i_pts > 0 ? in->i_pts : in->i_dts );
+
+ /* FU indicator */
+ out->p_buffer[12] = (nalh&0x60)|28;
+ /* FU header */
+ out->p_buffer[13] = (start<<7)|(end<<6)|(nalh&0x1f);
+
+ memcpy( &out->p_buffer[14], p_data+first, i_payload );
+
+ out->i_buffer = 14 + i_payload;
+
+ // not sure what of these should be used and what it does :)
+ out->i_pts = in->i_pts;
+ out->i_dts = in->i_dts;
+ //out->i_dts = in->i_dts + i * in->i_length / i_count;
+ //out->i_length = in->i_length / i_count;
+
+ rtp_packetize_send( id, out );
+
+ /*msg_Dbg( p_stream, "nal-out fragmented: frag %d %d %02x %02x %d", start,end,
+ out->p_buffer[12], out->p_buffer[13], i_payload );*/
+
+ i_data -= i_payload;
+ first += i_payload;
+ i++;
+ start=0;
+ }
+ }
+ return VLC_SUCCESS;
+}
+
+static int rtp_packetize_amr( sout_stream_t *p_stream, sout_stream_id_t *id,
+ block_t *in )
+{
+ int i_max = id->i_mtu - 14; /* payload max in one packet */
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
+
+ uint8_t *p_data = in->p_buffer;
+ int i_data = in->i_buffer;
+ int i;
+
+ /* Only supports octet-aligned mode */
+ for( i = 0; i < i_count; i++ )
+ {
+ int i_payload = __MIN( i_max, i_data );
+ block_t *out = block_New( p_stream, 14 + i_payload );
+
+ /* rtp common header */
+ rtp_packetize_common( id, out, ((i == i_count - 1)?1:0),
+ (in->i_pts > 0 ? in->i_pts : in->i_dts) );
+ /* Payload header */
+ out->p_buffer[12] = 0xF0; /* CMR */
+ out->p_buffer[13] = p_data[0]&0x7C; /* ToC */ /* FIXME: frame type */
+
+ /* FIXME: are we fed multiple frames ? */
+ memcpy( &out->p_buffer[14], p_data+1, i_payload-1 );
+
+ out->i_buffer = 14 + i_payload-1;
+ out->i_dts = in->i_dts + i * in->i_length / i_count;
+ out->i_length = in->i_length / i_count;
+
+ rtp_packetize_send( id, out );
+
+ p_data += i_payload;
+ i_data -= i_payload;
+ }
+
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff