*
* 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.
*****************************************************************************/
/*****************************************************************************
#include <vlc/sout.h>
#include "vlc_httpd.h"
+#include "vlc_url.h"
#include "network.h"
+#include "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 PORT_VIDEO_LONGTEXT N_( \
"Allows you to specify the default video port used for the RTP streaming." )
-#define TTL_TEXT N_("Time To Live")
+#define TTL_TEXT N_("Time-To-Live (TTL)")
#define TTL_LONGTEXT N_( \
- "Allows you to specify the time to live for the output stream." )
+ "Allows you to specify the Time-To-Live for the output stream." )
+
+#define RFC3016_TEXT N_("RFC3016(LATM)")
+#define RFC3016_LONGTEXT N_( \
+ "Allows you to specify using RFC3016 for MPEG4 audio streaming." )
static int Open ( vlc_object_t * );
static void Close( vlc_object_t * );
add_string( SOUT_CFG_PREFIX "email", "", NULL, EMAIL_TEXT,
EMAIL_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "port-audio", 1234, NULL, PORT_AUDIO_TEXT,
- PORT_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "port-video", 1236, NULL, PORT_VIDEO_TEXT,
- PORT_LONGTEXT, VLC_TRUE );
- add_integer( SOUT_CFG_PREFIX "port", 1238, NULL, PORT_TEXT,
+ 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 "rfc3016", 0, NULL, RFC3016_TEXT,
+ RFC3016_LONGTEXT, VLC_TRUE );
+
set_callbacks( Open, Close );
vlc_module_end();
*****************************************************************************/
static const char *ppsz_sout_options[] = {
"dst", "name", "port", "port-audio", "port-video", "*sdp", "ttl", "mux",
- "description", "url","email", NULL
+ "description", "url","email", "rfc3016", NULL
};
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
int i_port_audio;
int i_port_video;
int i_ttl;
+ vlc_bool_t b_rfc3016;
/* when need to use a private one or when using muxer */
int i_payload_type;
{
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;
+ sout_cfg_t *p_cfg = NULL;
vlc_value_t val;
+ vlc_bool_t b_rtsp = VLC_FALSE;
sout_CfgParse( p_stream, SOUT_CFG_PREFIX, ppsz_sout_options, p_stream->p_cfg );
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 )
{
- sout_cfg_t *p_cfg;
- vlc_bool_t b_ok = VLC_FALSE;
-
- for( p_cfg = p_stream->p_cfg; p_cfg != NULL; p_cfg = p_cfg->p_next )
+ if( !strcmp( p_cfg->psz_name, "sdp" ) )
{
- if( !strcmp( p_cfg->psz_name, "sdp" ) )
+ if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) )
{
- if( p_cfg->psz_value && !strncasecmp( p_cfg->psz_value, "rtsp", 4 ) )
- {
- b_ok = VLC_TRUE;
- break;
- }
+ b_rtsp = VLC_TRUE;
+ break;
}
}
- if( !b_ok )
- {
- vlc_value_t val2;
- var_Get( p_stream, SOUT_CFG_PREFIX "sdp", &val2 );
- if( !strncasecmp( val2.psz_string, "rtsp", 4 ) )
- b_ok = VLC_TRUE;
- free( val2.psz_string );
- }
+ }
+ 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( !b_ok )
+ 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 );
}
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 "rfc3016", &val );
+ p_sys->b_rfc3016 = val.b_bool;
+
p_sys->i_payload_type = 96;
p_sys->i_es = 0;
p_sys->es = 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 psz_ttl[100];
- char url[p_sys->psz_destination ? strlen( p_sys->psz_destination ) + 1 + 12+1 : 14];
+ 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 =
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 */
- p_sys->psz_sdp =
- malloc( 10 + 30 + 10 + strlen( p_sys->psz_session_name ) +
- 10 + strlen( p_sys->psz_session_description ) + 10 + strlen( p_sys->psz_session_url ) +
- 10 + strlen( p_sys->psz_session_email ) + 10 + strlen( p_sys->psz_destination ) +
- 10 + 10 + strlen( PACKAGE_STRING ) +
- 20 + 10 + 20 + 10 + strlen( psz_rtpmap ) );
-
if( net_AddressIsMulticast( (vlc_object_t *)p_stream, p_sys->psz_destination ) )
{
- sprintf( psz_ttl, "/%d", p_sys->i_ttl );
+ snprintf( psz_ttl, sizeof( psz_ttl ), "/%d", p_sys->i_ttl );
+ psz_ttl[sizeof( psz_ttl ) - 1] = '\0';
}
else
{
psz_ttl[0] = '\0';
}
- sprintf( p_sys->psz_sdp,
- "v=0\r\n"
- "o=- "I64Fd" %d IN IP4 127.0.0.1\r\n"
- "s=%s\r\n"
- "i=%s\r\n"
- "u=%s\r\n"
- "e=%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"
- "c=IN IP4 %s%s\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,
- p_sys->psz_session_name,
- p_sys->psz_session_description,
- p_sys->psz_session_url,
- p_sys->psz_session_email,
- p_sys->psz_destination, psz_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 );
+ 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"
+ "t=0 0\r\n" /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
+ "a=tool:"PACKAGE_STRING"\r\n"
+ "c=IN IP%c %s%s\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;
{
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
- /* why? is this disabled? */
if( p_sys->psz_session_name )
{
free( p_sys->psz_session_name );
free( p_sys->psz_session_email );
p_sys->psz_session_email = NULL;
}
-#endif
if( p_sys->psz_sdp )
{
free( p_sys->psz_sdp );
+ p_sys->psz_sdp = NULL;
}
free( p_sys );
}
{
if( p_sys->p_httpd_file )
{
- msg_Err( p_stream, "You can used sdp=http:// only once" );
+ msg_Err( p_stream, "You can use sdp=http:// only once" );
return;
}
{
if( p_sys->p_rtsp_url )
{
- msg_Err( p_stream, "You can used sdp=rtsp:// only once" );
+ msg_Err( p_stream, "You can use sdp=rtsp:// only once" );
return;
}
{
if( p_sys->b_export_sdp_file )
{
- msg_Err( p_stream, "You can used sdp=file:// only once" );
+ msg_Err( p_stream, "You can use sdp=file:// only once" );
return;
}
p_sys->b_export_sdp_file = VLC_TRUE;
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( sout_stream_t *p_stream, char *psz_destination, vlc_bool_t b_rtsp )
+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;
+ sout_instance_t *p_sout = p_stream->p_sout;
int i_size;
- char *psz_sdp, *p;
+ char *psz_sdp, *p, ipv;
int i;
- i_size = strlen( "v=0\r\n" ) +
- strlen( "o=- * * IN IP4 127.0.0.1\r\n" ) + 10 + 10 +
- strlen( "s=*\r\n" ) + strlen( p_sys->psz_session_name ) +
- strlen( "i=*\r\n" ) + strlen( p_sys->psz_session_description ) +
- strlen( "u=*\r\n" ) + strlen( p_sys->psz_session_url ) +
- strlen( "e=*\r\n" ) + strlen( p_sys->psz_session_email ) +
- strlen( "t=0 0\r\n" ) + /* permanent stream */ /* when scheduled from vlm, we should set this info correctly */
- strlen( "a=tool:"PACKAGE_STRING"\r\n" ) +
- strlen( "c=IN IP4 */*\r\n" ) + 20 + 10 +
- strlen( psz_destination ? psz_destination : "0.0.0.0") ;
+ /* 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];
}
if( b_rtsp )
{
- i_size += strlen( "a=control:*/trackid=*\r\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\r\n" );
- p += sprintf( p, "o=- "I64Fd" %d IN IP4 127.0.0.1\r\n",
- p_sys->i_sdp_id, p_sys->i_sdp_version );
+ 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, "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 IP4 %s", psz_destination ? psz_destination : "0.0.0.0" );
+ p += sprintf( p, "c=IN IP%c %s", ipv, psz_destination );
- if( net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ? psz_destination : "0.0.0.0" ) )
+ if( net_AddressIsMulticast( (vlc_object_t *)p_stream, psz_destination ) )
{
/* Add the ttl if it is a multicast address */
- p += sprintf( p, "/%d\r\n", p_sys->i_ttl );
+ /* 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
{
}
if( b_rtsp )
{
- p += sprintf( p, "a=control:%s/trackid=%d\r\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_amr ( sout_stream_t *, sout_stream_id_t *, block_t * );
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, 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",
}
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_rfc3016)
+ {
+ 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_timestamp_start = rand()&0xffffffff;
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 );
+ 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 )
p_sys->i_sdp_version++;
- fprintf( stderr, "sdp=%s", p_sys->psz_sdp );
+ msg_Dbg( p_stream, "sdp=%s", p_sys->psz_sdp );
/* Update SDP (sap/file) */
if( p_sys->b_export_sap ) SapSetup( p_stream );
if( id->rtsp_access ) free( id->rtsp_access );
/* Update SDP (sap/file) */
- if( p_sys->b_export_sap ) SapSetup( p_stream );
+ 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 );
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;
- /* FIXME: use sout_AnnounceMethodCreate */
- announce_method_t *p_method = (announce_method_t *)
- malloc(sizeof(announce_method_t));
+ announce_method_t *p_method = sout_AnnounceMethodCreate( METHOD_TYPE_SAP );
/* 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 */
- 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->psz_destination,
p_method );
}
sout_stream_sys_t *p_sys = p_stream->p_sys;
FILE *f;
- if( ( f = fopen( p_sys->psz_sdp_file, "wt" ) ) == NULL )
+ 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) );
{
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,
{
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 )
{
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->psz_status = strdup( "OK" );
httpd_MsgAdd( answer, "Content-type", "%s", "application/sdp" );
- answer->p_body = psz_sdp;
+ 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" ) ) );
httpd_MsgAdd( answer, "Cache-Control", "%s", "no-cache" );
{
sout_stream_id_t *id = (sout_stream_id_t*)p_args;
sout_stream_t *p_stream = id->p_stream;
+ sout_instance_t *p_sout = p_stream->p_sout;
sout_stream_sys_t *p_sys = p_stream->p_sys;
char *psz_session = 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;
}
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;
- if( ip == NULL )
+ if( httpd_ClientIP( cl, ip ) == NULL )
{
- answer->i_status = 400;
+ 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 );
+ //fprintf( stderr, "HTTPD_MSG_SETUP: unicast ip=%s port=%d\n", ip, i_port );
psz_session = httpd_MsgGet( query, "Session" );
if( *psz_session == 0 )
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 );
-
+ strncpy( psz_access, "udp{raw}", sizeof( psz_access ) );
+ psz_access[sizeof( psz_access ) - 1] = '\0';
+
+ 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;
}
return VLC_SUCCESS;
}
+
static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id,
block_t *in )
{
return VLC_SUCCESS;
}
+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, *pheader;
+ 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;
+
+ pheader=out->p_buffer+12;
+ while( tmp > 0xfe )
+ {
+ *pheader = 0xff;
+ pheader++;
+ tmp -= 0xff;
+ }
+ *pheader = 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 )
{
projects / vlc / blobdiff