* rtp.c: rtp stream output module
*****************************************************************************
* Copyright (C) 2003-2004 VideoLAN
- * $Id: rtp.c,v 1.10 2004/01/30 16:45:40 fenrir Exp $
+ * $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
*
#include <vlc/input.h>
#include <vlc/sout.h>
-#include "httpd.h"
+#include "vlc_httpd.h"
#include "network.h"
/*****************************************************************************
static sout_stream_id_t *Add ( sout_stream_t *, es_format_t * );
static int Del ( sout_stream_t *, sout_stream_id_t * );
static int Send( sout_stream_t *, sout_stream_id_t *,
- sout_buffer_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
{
int64_t i_sdp_id;
int i_sdp_version;
char *psz_sdp;
-
vlc_mutex_t lock_sdp;
- httpd_t *p_httpd;
+ char *psz_session_name;
+
+ /* 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;
uint16_t i_sequence;
uint32_t i_timestamp_start;
uint8_t ssrc[4];
- sout_buffer_t *packet;
+ 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 *,
- sout_buffer_t * );
+ block_t * );
struct sout_stream_id_t
{
+ sout_stream_t *p_stream;
/* rtp field */
uint8_t i_payload_type;
uint16_t i_sequence;
/* 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 *, sout_buffer_t * );
-static int HttpCallback( httpd_file_callback_args_t *p_args,
- uint8_t *p_request, int i_request,
- uint8_t **pp_data, int *pi_data );
+static int AccessOutGrabberWrite( sout_access_out_t *, block_t * );
+
+static int SapSetup( 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 *, char *psz_session );
+static rtsp_client_t *RtspClientGet( sout_stream_t *, char *psz_session );
+static void RtspClientDel( sout_stream_t *, rtsp_client_t * );
/*****************************************************************************
* Open:
p_sys = malloc( sizeof( sout_stream_sys_t ) );
p_sys->psz_destination = sout_cfg_find_value( p_stream->p_cfg, "dst" );
+ p_sys->psz_session_name = sout_cfg_find_value( p_stream->p_cfg, "name" );
if( ( val = sout_cfg_find_value( p_stream->p_cfg, "port" ) ) )
{
p_sys->i_port = atoi( val );
}
- if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' ||
- p_sys->i_port <= 0 )
+ else
+ {
+ p_sys->i_port = 1234;
+ }
+
+ if( !p_sys->psz_session_name )
{
- msg_Err( p_stream, "invalid/missing dst or port" );
+ if( p_sys->psz_destination )
+ {
+ p_sys->psz_session_name = strdup( p_sys->psz_destination );
+ }
+ else
+ {
+ p_sys->psz_session_name = strdup( "NONE" );
+ }
+ }
+
+ if( !p_sys->psz_destination || *p_sys->psz_destination == '\0' )
+ {
+ val = sout_cfg_find_value( p_stream->p_cfg, "sdp" );
+ if( val == NULL || strncasecmp( val, "rtsp", 4 ) )
+ {
+ msg_Err( p_stream, "missing destination and not in rtsp mode" );
+ free( p_sys );
+ return VLC_EGENERIC;
+ }
+ p_sys->psz_destination = NULL;
+ }
+ else if( p_sys->i_port <= 0 )
+ {
+ msg_Err( p_stream, "invalid port" );
free( p_sys );
return VLC_EGENERIC;
}
+
if( ( val = sout_cfg_find_value( p_stream->p_cfg, "ttl" ) ) )
{
p_sys->i_ttl = atoi( val );
p_sys->i_payload_type = 96;
p_sys->i_es = 0;
p_sys->es = NULL;
+ p_sys->i_rtsp = 0;
+ p_sys->rtsp = NULL;
p_sys->psz_sdp = NULL;
p_sys->i_sdp_id = mdate();
p_sys->i_sdp_version = 1;
p_sys->psz_sdp = NULL;
- p_sys->p_httpd = NULL;
+
+ p_sys->b_export_sap = VLC_FALSE;
+ p_sys->p_session = NULL;
+
p_sys->p_httpd_host = NULL;
p_sys->p_httpd_file = NULL;
+ p_sys->p_rtsp_host = NULL;
+ p_sys->p_rtsp_url = NULL;
+ p_sys->psz_rtsp_control = NULL;
+ p_sys->psz_rtsp_path = NULL;
+
+ vlc_mutex_init( p_stream, &p_sys->lock_sdp );
+ vlc_mutex_init( p_stream, &p_sys->lock_es );
+
+ p_stream->pf_add = Add;
+ p_stream->pf_del = Del;
+ p_stream->pf_send = Send;
+
+ p_stream->p_sys = p_sys;
if( ( val = sout_cfg_find_value( p_stream->p_cfg, "mux" ) ) )
{
free( p_sys );
return VLC_EGENERIC;
}
- p_sout->i_preheader = __MAX( p_sout->i_preheader,
- p_sys->p_mux->i_preheader );
/* create the SDP only once */
p_sys->psz_sdp =
sprintf( p_sys->psz_sdp,
"v=0\n"
"o=- "I64Fd" %d IN IP4 127.0.0.1\n"
- "s=NONE\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 rtp context */
vlc_url_t url;
vlc_UrlParse( &url, val, 0 );
- if( url.psz_protocol && !strcmp( url.psz_protocol, "http" ) )
+ if( url.psz_protocol && !strcasecmp( url.psz_protocol, "http" ) )
{
- if( ( p_sys->p_httpd =
- httpd_Find( VLC_OBJECT(p_stream), VLC_TRUE ) ) )
+ if( HttpSetup( p_stream, &url ) )
{
- p_sys->p_httpd_host =
- p_sys->p_httpd->pf_register_host( p_sys->p_httpd,
- url.psz_host,
- url.i_port );
- if( p_sys->p_httpd_host )
- {
- p_sys->p_httpd_file =
- p_sys->p_httpd->pf_register_file( p_sys->p_httpd,
- url.psz_path ? url.psz_path : "/",
- "application/sdp", NULL, NULL,
- HttpCallback, HttpCallback, (void*)p_sys );
- }
+ msg_Err( p_stream, "cannot export sdp as http" );
}
- if( p_sys->p_httpd_file == NULL )
+ }
+ if( url.psz_protocol && !strcasecmp( url.psz_protocol, "rtsp" ) )
+ {
+ /* 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 http" );
+ msg_Err( p_stream, "cannot export sdp as rtsp" );
}
}
+ 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)",
vlc_UrlClean( &url );
}
- vlc_mutex_init( p_stream, &p_sys->lock_sdp );
-
- p_stream->pf_add = Add;
- p_stream->pf_del = Del;
- p_stream->pf_send = Send;
-
- p_stream->p_sys = p_sys;
+ /* update p_sout->i_out_pace_nocontrol */
+ p_stream->p_sout->i_out_pace_nocontrol++;
return VLC_SUCCESS;
}
sout_stream_t *p_stream = (sout_stream_t*)p_this;
sout_stream_sys_t *p_sys = p_stream->p_sys;
+ /* update p_sout->i_out_pace_nocontrol */
+ p_stream->p_sout->i_out_pace_nocontrol--;
+
if( p_sys->p_mux )
{
sout_MuxDelete( p_sys->p_mux );
sout_AccessOutDelete( p_sys->p_grab );
if( p_sys->packet )
{
- sout_BufferDelete( p_stream->p_sout, p_sys->packet );
+ block_Release( p_sys->packet );
}
}
+ while( p_sys->i_rtsp > 0 )
+ {
+ RtspClientDel( p_stream, p_sys->rtsp[0] );
+ }
+
vlc_mutex_destroy( &p_sys->lock_sdp );
if( p_sys->p_httpd_file )
{
- p_sys->p_httpd->pf_unregister_file( p_sys->p_httpd,
- p_sys->p_httpd_file );
+ httpd_FileDelete( p_sys->p_httpd_file );
}
if( p_sys->p_httpd_host )
{
- p_sys->p_httpd->pf_unregister_host( p_sys->p_httpd,
- p_sys->p_httpd_host );
+ httpd_HostDelete( p_sys->p_httpd_host );
}
- if( p_sys->p_httpd )
+ if( p_sys->p_rtsp_url )
{
- httpd_Release( p_sys->p_httpd );
+ httpd_UrlDelete( p_sys->p_rtsp_url );
}
-
+ if( p_sys->p_rtsp_host )
+ {
+ 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_sdp )
{
free( p_sys->psz_sdp );
/*****************************************************************************
* SDPGenerate
*****************************************************************************/
-static void SDPGenerate( sout_stream_t *p_stream )
+static char *SDPGenerate( sout_stream_t *p_stream, char *psz_destination, vlc_bool_t b_rtsp )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
int i_size;
i_size = strlen( "v=0\n" ) +
strlen( "o=- * * IN IP4 127.0.0.1\n" ) +
- strlen( "s=NONE\n" ) +
+ strlen( "s=\n" ) +
strlen( "c=IN IP4 */*\n" ) +
- strlen( p_sys->psz_destination ) +
+ strlen( psz_destination ? psz_destination : "0.0.0.0") +
+ strlen( p_sys->psz_session_name ) +
20 + 10 + 10 + 1;
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;
-
if( id->psz_rtpmap )
{
i_size += strlen( "a=rtpmap:* *\n" ) + strlen( id->psz_rtpmap )+10;
{
i_size += strlen( "a=fmtp:* *\n" ) + strlen( id->psz_fmtp ) + 10;
}
+ if( b_rtsp )
+ {
+ i_size += strlen( "a=control:*/trackid=*\n" ) + strlen( p_sys->psz_rtsp_control ) + 10;
+ }
}
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=NONE\n" );
- p += sprintf( p, "c=IN IP4 %s/%d\n", p_sys->psz_destination,
+ 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 );
for( i = 0; i < p_sys->i_es; i++ )
p += sprintf( p, "a=fmtp:%d %s\n", id->i_payload_type,
id->psz_fmtp );
}
+ if( b_rtsp )
+ {
+ p += sprintf( p, "a=control:%s/trackid=%d\n", p_sys->psz_rtsp_control, i );
+ }
}
- 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++;
-
- fprintf( stderr, "sdp=%s", p_sys->psz_sdp );
+ return psz_sdp;
}
/*****************************************************************************
*
*****************************************************************************/
-static int rtp_packetize_l16 ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * );
-static int rtp_packetize_l8 ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * );
-static int rtp_packetize_mpa ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * );
-static int rtp_packetize_mpv ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * );
-static int rtp_packetize_ac3 ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * );
-static int rtp_packetize_split( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * );
-static int rtp_packetize_mp4a ( sout_stream_t *, sout_stream_id_t *, sout_buffer_t * );
+static int rtp_packetize_l16 ( sout_stream_t *, sout_stream_id_t *, block_t * );
+static int rtp_packetize_l8 ( sout_stream_t *, sout_stream_id_t *, block_t * );
+static int rtp_packetize_mpa ( sout_stream_t *, sout_stream_id_t *, block_t * );
+static int rtp_packetize_mpv ( sout_stream_t *, sout_stream_id_t *, block_t * );
+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 void sprintf_hexa( char *s, uint8_t *p_data, int i_data )
{
- static const char hex[16] = "0123456789ABCDEF";
+ static const char hex[16] = "0123456789abcdef";
int i;
for( i = 0; i < i_data; i++ )
sout_stream_id_t *id;
sout_access_out_t *p_access = NULL;
- char access[100];
- char url[strlen( p_sys->psz_destination ) + 1 + 12 + 1];
-
if( p_sys->p_mux != NULL )
{
sout_input_t *p_input = NULL;
}
id = malloc( sizeof( sout_stream_id_t ) );
+ memset( id, 0, sizeof( sout_stream_id_t ) );
id->p_access = NULL;
id->p_input = p_input;
id->pf_packetize= NULL;
+ id->p_rtsp_url = NULL;
return id;
}
- /* first try to create the access out */
- if( p_sys->i_ttl > 0 )
+ if( p_sys->psz_destination )
{
- sprintf( access, "udp{raw,ttl=%d}", p_sys->i_ttl );
- }
- else
- {
- sprintf( access, "udp{raw}" );
- }
- sprintf( url, "%s:%d", p_sys->psz_destination, p_sys->i_port );
- if( ( p_access = sout_AccessOutNew( p_sout, access, url ) ) == NULL )
- {
- msg_Err( p_stream, "cannot create the access out for %s://%s",
- access, url );
- return NULL;
+ char access[100];
+ char url[strlen( p_sys->psz_destination ) + 1 + 12 + 1];
+
+ /* first try to create the access out */
+ if( p_sys->i_ttl > 0 )
+ {
+ sprintf( access, "udp{raw,ttl=%d}", p_sys->i_ttl );
+ }
+ else
+ {
+ sprintf( access, "udp{raw}" );
+ }
+ sprintf( url, "%s:%d", p_sys->psz_destination, p_sys->i_port );
+ if( ( p_access = sout_AccessOutNew( p_sout, access, url ) ) == NULL )
+ {
+ msg_Err( p_stream, "cannot create the access out for %s://%s",
+ access, url );
+ return NULL;
+ }
+ msg_Dbg( p_stream, "access out %s:%s", access, url );
}
/* not create the rtp specific stuff */
id = malloc( sizeof( sout_stream_id_t ) );
+ memset( id, 0, sizeof( sout_stream_id_t ) );
+ id->p_stream = p_stream;
id->p_access = p_access;
id->p_input = NULL;
id->psz_rtpmap = NULL;
id->psz_fmtp = NULL;
- id->psz_destination = strdup( p_sys->psz_destination );
+ id->psz_destination = p_sys->psz_destination ? strdup( p_sys->psz_destination ) : NULL;
id->i_port = p_sys->i_port;
+ id->p_rtsp_url = NULL;
+ vlc_mutex_init( p_stream, &id->lock_rtsp );
+ id->i_rtsp_access = 0;
+ id->rtsp_access = NULL;
switch( p_fmt->i_codec )
{
id->psz_fmtp = malloc( 100 + 2 * p_fmt->i_extra );
sprintf_hexa( hexa, p_fmt->p_extra, p_fmt->i_extra );
sprintf( id->psz_fmtp,
- "profile-level-id=3;config=%s", hexa );
+ "profile-level-id=3; config=%s;", hexa );
}
break;
}
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 );
+ "streamtype=5; profile-level-id=15; mode=AAC-hbr; "
+ "config=%s; SizeLength=13;IndexLength=3; "
+ "IndexDeltaLength=3; Profile=1;", hexa );
break;
}
/* better than nothing */
id->i_mtu = 1500;
}
+ msg_Dbg( p_stream, "using mtu=%d", 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 );
+
+ 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 );
+ }
+ }
- msg_Dbg( p_stream, "access out %s:%s mtu=%d", access, url, id->i_mtu );
/* 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;
- SDPGenerate( p_stream );
+ 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 );
+
+ p_sys->i_sdp_version++;
+
+ fprintf( stderr, "sdp=%s", p_sys->psz_sdp );
+
+ /* Update the SAP announce */
+ if( p_sys->b_export_sap )
+ {
+ SapSetup( p_stream );
+ }
}
return id;
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
+ vlc_mutex_lock( &p_sys->lock_es );
TAB_REMOVE( p_sys->i_es, p_sys->es, id );
+ vlc_mutex_unlock( &p_sys->lock_es );
if( id->p_access )
{
{
free( id->psz_fmtp );
}
- free( id->psz_destination );
+ 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 );
+
+ /* Update the SAP announce */
+ if( p_sys->b_export_sap )
+ {
+ SapSetup( p_stream );
+ }
+
free( id );
return VLC_SUCCESS;
}
static int Send( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *p_buffer )
+ block_t *p_buffer )
{
- sout_buffer_t *p_next;
+ block_t *p_next;
if( p_stream->p_sys->p_mux )
{
{
break;
}
- sout_BufferDelete( p_stream->p_sout, p_buffer );
+ block_Release( p_buffer );
p_buffer = p_next;
}
}
return VLC_SUCCESS;
}
-static int HttpCallback( httpd_file_callback_args_t *p_args,
- uint8_t *p_request, int i_request,
- uint8_t **pp_data, int *pi_data )
-{
- sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_args;
- vlc_mutex_lock( &p_sys->lock_sdp );
- if( p_sys->psz_sdp && *p_sys->psz_sdp )
- {
- *pi_data = strlen( p_sys->psz_sdp );
- *pp_data = malloc( *pi_data );
- memcpy( *pp_data, p_sys->psz_sdp, *pi_data );
- }
- else
- {
- *pp_data = NULL;
- *pi_data = 0;
- }
- vlc_mutex_unlock( &p_sys->lock_sdp );
-
- return VLC_SUCCESS;
-}
static int AccessOutGrabberWriteBuffer( sout_stream_t *p_stream,
- sout_buffer_t *p_buffer )
+ block_t *p_buffer )
{
sout_stream_sys_t *p_sys = p_stream->p_sys;
uint32_t i_timestamp = i_dts * 9 / 100;
uint8_t *p_data = p_buffer->p_buffer;
- unsigned int i_data = p_buffer->i_size;
+ unsigned int i_data = p_buffer->i_buffer;
unsigned int i_max = p_sys->i_mtu - 12;
- int i_packet = ( p_buffer->i_size + i_max - 1 ) / i_max;
+ int i_packet = ( p_buffer->i_buffer + i_max - 1 ) / i_max;
while( i_data > 0 )
{
/* output complete packet */
if( p_sys->packet &&
- p_sys->packet->i_size + i_data > i_max )
+ p_sys->packet->i_buffer + i_data > i_max )
{
sout_AccessOutWrite( p_sys->p_access, p_sys->packet );
p_sys->packet = NULL;
if( p_sys->packet == NULL )
{
/* allocate a new packet */
- p_sys->packet = sout_BufferNew( p_stream->p_sout, p_sys->i_mtu );
+ p_sys->packet = block_New( p_stream, p_sys->i_mtu );
p_sys->packet->p_buffer[ 0] = 0x80;
- p_sys->packet->p_buffer[ 1] = p_sys->i_payload_type;
+ p_sys->packet->p_buffer[ 1] = 0x80|p_sys->i_payload_type;
p_sys->packet->p_buffer[ 2] = ( p_sys->i_sequence >> 8)&0xff;
p_sys->packet->p_buffer[ 3] = ( p_sys->i_sequence )&0xff;
p_sys->packet->p_buffer[ 4] = ( i_timestamp >> 24 )&0xff;
p_sys->packet->p_buffer[ 9] = p_sys->ssrc[1];
p_sys->packet->p_buffer[10] = p_sys->ssrc[2];
p_sys->packet->p_buffer[11] = p_sys->ssrc[3];
- p_sys->packet->i_size = 12;
+ p_sys->packet->i_buffer = 12;
p_sys->packet->i_dts = i_dts;
p_sys->packet->i_length = p_buffer->i_length / i_packet;
p_sys->i_sequence++;
}
- i_size = __MIN( i_data, p_sys->i_mtu - p_sys->packet->i_size );
+ i_size = __MIN( i_data, p_sys->i_mtu - p_sys->packet->i_buffer );
- memcpy( &p_sys->packet->p_buffer[p_sys->packet->i_size],
- p_data,
- i_size );
+ memcpy( &p_sys->packet->p_buffer[p_sys->packet->i_buffer],
+ p_data, i_size );
- p_sys->packet->i_size += i_size;
+ p_sys->packet->i_buffer += i_size;
p_data += i_size;
i_data -= i_size;
}
}
static int AccessOutGrabberWrite( sout_access_out_t *p_access,
- sout_buffer_t *p_buffer )
+ block_t *p_buffer )
{
sout_stream_t *p_stream = (sout_stream_t*)p_access->p_sys;
- //fprintf( stderr, "received buffer size=%d\n", p_buffer->i_size );
+ //fprintf( stderr, "received buffer size=%d\n", p_buffer->i_buffer );
//
while( p_buffer )
{
- sout_buffer_t *p_next;
+ block_t *p_next;
AccessOutGrabberWriteBuffer( p_stream, p_buffer );
p_next = p_buffer->p_next;
- sout_BufferDelete( p_access->p_sout, p_buffer );
+ block_Release( p_buffer );
p_buffer = p_next;
}
return VLC_SUCCESS;
}
+/****************************************************************************
+ * SAP:
+ ****************************************************************************/
+static int SapSetup( sout_stream_t *p_stream )
+{
+ 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));
+
+ /* Remove the previous session */
+ if( p_sys->p_session != NULL)
+ {
+ sout_AnnounceUnRegister( p_sout, p_sys->p_session);
+ 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 )
+ {
+ p_sys->p_session = sout_AnnounceRegisterSDP( p_sout, p_sys->psz_sdp,
+ p_method );
+ }
+
+ free( p_method );
+ return VLC_SUCCESS;
+}
+
+/****************************************************************************
+ * HTTP:
+ ****************************************************************************/
+static int HttpCallback( httpd_file_sys_t *p_args,
+ httpd_file_t *, uint8_t *p_request,
+ uint8_t **pp_data, int *pi_data );
+
+static int HttpSetup( sout_stream_t *p_stream, vlc_url_t *url)
+{
+ 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 );
+ 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,
+ HttpCallback, (void*)p_sys );
+ }
+ if( p_sys->p_httpd_file == NULL )
+ {
+ return VLC_EGENERIC;
+ }
+ return VLC_SUCCESS;
+}
+
+static int HttpCallback( httpd_file_sys_t *p_args,
+ httpd_file_t *f, uint8_t *p_request,
+ uint8_t **pp_data, int *pi_data )
+{
+ sout_stream_sys_t *p_sys = (sout_stream_sys_t*)p_args;
-static void rtp_packetize_common( sout_stream_id_t *id, sout_buffer_t *out,
+ vlc_mutex_lock( &p_sys->lock_sdp );
+ if( p_sys->psz_sdp && *p_sys->psz_sdp )
+ {
+ *pi_data = strlen( p_sys->psz_sdp );
+ *pp_data = malloc( *pi_data );
+ memcpy( *pp_data, p_sys->psz_sdp, *pi_data );
+ }
+ else
+ {
+ *pp_data = NULL;
+ *pi_data = 0;
+ }
+ vlc_mutex_unlock( &p_sys->lock_sdp );
+
+ return VLC_SUCCESS;
+}
+
+/****************************************************************************
+ * RTSP:
+ ****************************************************************************/
+static rtsp_client_t *RtspClientNew( sout_stream_t *p_stream, char *psz_session )
+{
+ rtsp_client_t *rtsp = malloc( sizeof( rtsp_client_t ));
+
+ rtsp->psz_session = 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, char *psz_session )
+{
+ int i;
+ 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;
+
+ fprintf( stderr, "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 );
+ 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;
+ char *psz_session = NULL;
+
+ 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" );
+
+ answer->p_body = 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", "VLC Server" );
+ 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" );
+
+ 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 = NULL;
+
+ 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_SETUP:
+ {
+ 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 == 0 )
+ {
+ 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 );
+ }
+ 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];
+
+ 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 );
+
+ psz_session = httpd_MsgGet( query, "Session" );
+ if( *psz_session == 0 )
+ {
+ psz_session = malloc( 100 );
+ sprintf( psz_session, "%d", rand() );
+
+ rtsp = RtspClientNew( p_stream, psz_session );
+ }
+ else
+ {
+ rtsp = RtspClientGet( p_stream, psz_session );
+ if( rtsp == NULL )
+ {
+ /* FIXME right error code */
+ answer->i_status = 400;
+ 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 > 0 )
+ sprintf( psz_access, "udp{raw,ttl=%d}", p_sys->i_ttl );
+ else
+ sprintf( psz_access, "udp{raw}" );
+ sprintf( psz_url, "%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_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 = 400;
+ answer->psz_status = strdup( "Bad Request" );
+ 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 );
+ httpd_MsgAdd( answer, "Cseq", "%d", atoi( httpd_MsgGet( query, "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_common( sout_stream_id_t *id, block_t *out,
int b_marker, int64_t i_pts )
{
uint32_t i_timestamp = i_pts * (int64_t)id->i_clock_rate / I64C(1000000);
out->p_buffer[10] = id->ssrc[2];
out->p_buffer[11] = id->ssrc[3];
- out->i_size = 12;
+ out->i_buffer = 12;
id->i_sequence++;
}
+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++ )
+ {
+ sout_AccessOutWrite( id->rtsp_access[i], block_Duplicate( out ) );
+ }
+ vlc_mutex_unlock( &id->lock_rtsp );
+
+ if( id->p_access )
+ {
+ sout_AccessOutWrite( id->p_access, out );
+ }
+ else
+ {
+ block_Release( out );
+ }
+}
+
static int rtp_packetize_mpa( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *in )
+ block_t *in )
{
int i_max = id->i_mtu - 12 - 4; /* payload max in one packet */
- int i_count = ( in->i_size + i_max - 1 ) / i_max;
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
uint8_t *p_data = in->p_buffer;
- int i_data = in->i_size;
+ int i_data = in->i_buffer;
int i;
for( i = 0; i < i_count; i++ )
{
int i_payload = __MIN( i_max, i_data );
- sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 16 + i_payload );
+ block_t *out = block_New( p_stream, 16 + i_payload );
/* rtp common header */
rtp_packetize_common( id, out, (i == i_count - 1)?1:0, in->i_pts );
out->p_buffer[15] = ( (i*i_max) )&0xff;
memcpy( &out->p_buffer[16], p_data, i_payload );
- out->i_size = 16 + i_payload;
+ out->i_buffer = 16 + i_payload;
out->i_dts = in->i_dts + i * in->i_length / i_count;
out->i_length = in->i_length / i_count;
- sout_AccessOutWrite( id->p_access, out );
+ rtp_packetize_send( id, out );
p_data += i_payload;
i_data -= i_payload;
/* rfc2250 */
static int rtp_packetize_mpv( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *in )
+ block_t *in )
{
int i_max = id->i_mtu - 12 - 4; /* payload max in one packet */
- int i_count = ( in->i_size + i_max - 1 ) / i_max;
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
uint8_t *p_data = in->p_buffer;
- int i_data = in->i_size;
+ int i_data = in->i_buffer;
int i;
int b_sequence_start = 0;
int i_temporal_ref = 0;
int b_start_slice = 0;
/* preparse this packet to get some info */
- if( in->i_size > 4 )
+ if( in->i_buffer > 4 )
{
uint8_t *p = p_data;
- int i_rest = in->i_size;
+ int i_rest = in->i_buffer;
for( ;; )
{
i_temporal_ref = ( p[1] << 2) |((p[2]>>6)&0x03);
i_picture_coding_type = (p[2] >> 3)&0x07;
- if( i_rest > 4 && ( i_picture_coding_type == 2 ||
+ if( i_rest >= 4 && ( i_picture_coding_type == 2 ||
i_picture_coding_type == 3 ) )
{
- i_ffc = (p[3] >> 2)&0x01;
- i_bfc = ((p[3]&0x03) << 1)|((p[4]>>7)&0x01);
- if( i_picture_coding_type == 3 )
+ i_ffv = (p[3] >> 2)&0x01;
+ i_ffc = ((p[3]&0x03) << 1)|((p[4]>>7)&0x01);
+ if( i_rest > 4 && i_picture_coding_type == 3 )
{
i_fbv = (p[4]>>6)&0x01;
i_bfc = (p[4]>>3)&0x07;
for( i = 0; i < i_count; i++ )
{
int i_payload = __MIN( i_max, i_data );
- sout_buffer_t *out = sout_BufferNew( p_stream->p_sout,
+ block_t *out = block_New( p_stream,
16 + i_payload );
uint32_t h = ( i_temporal_ref << 16 )|
( b_sequence_start << 13 )|
( i_fbv << 7 )|( i_bfc << 4 )|( i_ffv << 3 )|i_ffc;
/* rtp common header */
- rtp_packetize_common( id, out, (i == i_count - 1)?1:0, in->i_pts );
+ rtp_packetize_common( id, out, (i == i_count - 1)?1:0,
+ in->i_pts > 0 ? in->i_pts : in->i_dts );
/* MBZ:5 T:1 TR:10 AN:1 N:1 S:1 B:1 E:1 P:3 FBV:1 BFC:3 FFV:1 FFC:3 */
out->p_buffer[12] = ( h >> 24 )&0xff;
memcpy( &out->p_buffer[16], p_data, i_payload );
- out->i_size = 16 + i_payload;
+ out->i_buffer = 16 + i_payload;
out->i_dts = in->i_dts + i * in->i_length / i_count;
out->i_length = in->i_length / i_count;
- sout_AccessOutWrite( id->p_access, out );
+ rtp_packetize_send( id, out );
p_data += i_payload;
i_data -= i_payload;
return VLC_SUCCESS;
}
static int rtp_packetize_ac3( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *in )
+ block_t *in )
{
int i_max = id->i_mtu - 12 - 2; /* payload max in one packet */
- int i_count = ( in->i_size + i_max - 1 ) / i_max;
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
uint8_t *p_data = in->p_buffer;
- int i_data = in->i_size;
+ int i_data = in->i_buffer;
int i;
for( i = 0; i < i_count; i++ )
{
int i_payload = __MIN( i_max, i_data );
- sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 14 + i_payload );
+ 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 );
/* data */
memcpy( &out->p_buffer[14], p_data, i_payload );
- out->i_size = 14 + i_payload;
+ out->i_buffer = 14 + i_payload;
out->i_dts = in->i_dts + i * in->i_length / i_count;
out->i_length = in->i_length / i_count;
- sout_AccessOutWrite( id->p_access, out );
+ rtp_packetize_send( id, out );
p_data += i_payload;
i_data -= i_payload;
}
static int rtp_packetize_split( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *in )
+ block_t *in )
{
int i_max = id->i_mtu - 12; /* payload max in one packet */
- int i_count = ( in->i_size + i_max - 1 ) / i_max;
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
uint8_t *p_data = in->p_buffer;
- int i_data = in->i_size;
+ int i_data = in->i_buffer;
int i;
for( i = 0; i < i_count; i++ )
{
int i_payload = __MIN( i_max, i_data );
- sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 12 + i_payload );
+ block_t *out = block_New( p_stream, 12 + 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) );
memcpy( &out->p_buffer[12], p_data, i_payload );
- out->i_size = 12 + i_payload;
+ out->i_buffer = 12 + i_payload;
out->i_dts = in->i_dts + i * in->i_length / i_count;
out->i_length = in->i_length / i_count;
- sout_AccessOutWrite( id->p_access, out );
+ rtp_packetize_send( id, out );
p_data += i_payload;
i_data -= i_payload;
}
static int rtp_packetize_l16( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *in )
+ block_t *in )
{
int i_max = id->i_mtu - 12; /* payload max in one packet */
- int i_count = ( in->i_size + i_max - 1 ) / i_max;
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
uint8_t *p_data = in->p_buffer;
- int i_data = in->i_size;
+ int i_data = in->i_buffer;
int i_packet = 0;
while( i_data > 0 )
{
int i_payload = (__MIN( i_max, i_data )/4)*4;
- sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 12 + i_payload );
+ block_t *out = block_New( p_stream, 12 + i_payload );
/* rtp common header */
rtp_packetize_common( id, out, 0,
(in->i_pts > 0 ? in->i_pts : in->i_dts) );
memcpy( &out->p_buffer[12], p_data, i_payload );
- out->i_size = 12 + i_payload;
+ out->i_buffer = 12 + i_payload;
out->i_dts = in->i_dts + i_packet * in->i_length / i_count;
out->i_length = in->i_length / i_count;
- sout_AccessOutWrite( id->p_access, out );
+ rtp_packetize_send( id, out );
p_data += i_payload;
i_data -= i_payload;
}
static int rtp_packetize_l8( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *in )
+ block_t *in )
{
int i_max = id->i_mtu - 12; /* payload max in one packet */
- int i_count = ( in->i_size + i_max - 1 ) / i_max;
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
uint8_t *p_data = in->p_buffer;
- int i_data = in->i_size;
+ int i_data = in->i_buffer;
int i_packet = 0;
while( i_data > 0 )
{
int i_payload = (__MIN( i_max, i_data )/2)*2;
- sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 12 + i_payload );
+ block_t *out = block_New( p_stream, 12 + i_payload );
/* rtp common header */
rtp_packetize_common( id, out, 0,
(in->i_pts > 0 ? in->i_pts : in->i_dts) );
memcpy( &out->p_buffer[12], p_data, i_payload );
- out->i_size = 12 + i_payload;
+ out->i_buffer = 12 + i_payload;
out->i_dts = in->i_dts + i_packet * in->i_length / i_count;
out->i_length = in->i_length / i_count;
- sout_AccessOutWrite( id->p_access, out );
+ rtp_packetize_send( id, out );
p_data += i_payload;
i_data -= i_payload;
return VLC_SUCCESS;
}
static int rtp_packetize_mp4a( sout_stream_t *p_stream, sout_stream_id_t *id,
- sout_buffer_t *in )
+ block_t *in )
{
int i_max = id->i_mtu - 16; /* payload max in one packet */
- int i_count = ( in->i_size + i_max - 1 ) / i_max;
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
uint8_t *p_data = in->p_buffer;
- int i_data = in->i_size;
+ int i_data = in->i_buffer;
int i;
for( i = 0; i < i_count; i++ )
{
int i_payload = __MIN( i_max, i_data );
- sout_buffer_t *out = sout_BufferNew( p_stream->p_sout, 16 + i_payload );
+ block_t *out = block_New( p_stream, 16 + i_payload );
/* rtp common header */
rtp_packetize_common( id, out, ((i == i_count - 1)?1:0),
out->p_buffer[12] = 0;
out->p_buffer[13] = 2*8;
/* for each AU length 13 bits + idx 3bits, */
- out->p_buffer[14] = ( in->i_size >> 5 )&0xff;
- out->p_buffer[15] = ( (in->i_size&0xff)<<3 )|0;
+ out->p_buffer[14] = ( in->i_buffer >> 5 )&0xff;
+ out->p_buffer[15] = ( (in->i_buffer&0xff)<<3 )|0;
memcpy( &out->p_buffer[16], p_data, i_payload );
- out->i_size = 16 + i_payload;
+ out->i_buffer = 16 + i_payload;
out->i_dts = in->i_dts + i * in->i_length / i_count;
out->i_length = in->i_length / i_count;
- sout_AccessOutWrite( id->p_access, out );
+ rtp_packetize_send( id, out );
p_data += i_payload;
i_data -= i_payload;
projects / vlc / blobdiff