/*****************************************************************************
* rtpfmt.c: RTP payload formats
*****************************************************************************
- * Copyright (C) 2003-2004 the VideoLAN team
+ * Copyright (C) 2003-2004 VLC authors and VideoLAN
* Copyright © 2007 Rémi Denis-Courmont
* $Id$
*
* Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ * RFC 4175 support based on gstrtpvrawpay.c (LGPL 2) by:
+ * Wim Taymans <wim.taymans@gmail.com>
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation; either version 2.1 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Lesser General Public License for more details.
*
- * 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., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
#ifdef HAVE_CONFIG_H
#include <assert.h>
-static int rtp_packetize_mpa (sout_stream_id_t *, block_t *);
-static int rtp_packetize_mpv (sout_stream_id_t *, block_t *);
-static int rtp_packetize_ac3 (sout_stream_id_t *, block_t *);
-static int rtp_packetize_split(sout_stream_id_t *, block_t *);
-static int rtp_packetize_swab (sout_stream_id_t *, block_t *);
-static int rtp_packetize_mp4a (sout_stream_id_t *, block_t *);
-static int rtp_packetize_mp4a_latm (sout_stream_id_t *, block_t *);
-static int rtp_packetize_h263 (sout_stream_id_t *, block_t *);
-static int rtp_packetize_h264 (sout_stream_id_t *, block_t *);
-static int rtp_packetize_amr (sout_stream_id_t *, block_t *);
-static int rtp_packetize_spx (sout_stream_id_t *, block_t *);
-static int rtp_packetize_t140 (sout_stream_id_t *, block_t *);
-static int rtp_packetize_g726_16 (sout_stream_id_t *, block_t *);
-static int rtp_packetize_g726_24 (sout_stream_id_t *, block_t *);
-static int rtp_packetize_g726_32 (sout_stream_id_t *, block_t *);
-static int rtp_packetize_g726_40 (sout_stream_id_t *, block_t *);
-static int rtp_packetize_vorbis (sout_stream_id_t *, block_t *);
-
-#define VORBIS_IDENT (0)
-
-static int rtp_vorbis_pack_headers(size_t room, void *p_extra, size_t i_extra,
- uint8_t **p_buffer, size_t *i_buffer)
+static int rtp_packetize_mpa (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_mpv (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_ac3 (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_simple(sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_split(sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_pcm(sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_swab (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_mp4a (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_mp4a_latm (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_h263 (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_h264 (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_amr (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_spx (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_t140 (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_g726_16 (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_g726_24 (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_g726_32 (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_g726_40 (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_xiph (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_vp8 (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_jpeg (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_r420 (sout_stream_id_sys_t *, block_t *);
+static int rtp_packetize_rgb24 (sout_stream_id_sys_t *, block_t *);
+
+#define XIPH_IDENT (0)
+
+/* Helpers common to xiph codecs (vorbis and theora) */
+
+static int rtp_xiph_pack_headers(size_t room, void *p_extra, size_t i_extra,
+ uint8_t **p_buffer, size_t *i_buffer,
+ uint8_t *theora_pixel_fmt)
{
unsigned packet_size[XIPH_MAX_HEADER_COUNT];
void *packet[XIPH_MAX_HEADER_COUNT];
unsigned packet_count;
- int val = xiph_SplitHeaders(packet_size, packet, &packet_count,
- i_extra, p_extra);
- if (val != VLC_SUCCESS)
- return val;
+ if (xiph_SplitHeaders(packet_size, packet, &packet_count,
+ i_extra, p_extra))
+ return VLC_EGENERIC;;
if (packet_count < 3)
- return VLC_EGENERIC;
+ return VLC_EGENERIC;;
+
+ if (theora_pixel_fmt != NULL)
+ {
+ if (packet_size[0] < 42)
+ return VLC_EGENERIC;
+ *theora_pixel_fmt = (((uint8_t *)packet[0])[41] >> 3) & 0x03;
+ }
unsigned length_size[2] = { 0, 0 };
for (int i = 0; i < 2; i++)
for (int i = 0; i < 3; i++)
{
memcpy(p, packet[i], packet_size[i]);
- free(packet[i]);
p += packet_size[i];
}
return VLC_SUCCESS;
}
+static char *rtp_xiph_b64_oob_config(void *p_extra, size_t i_extra,
+ uint8_t *theora_pixel_fmt)
+{
+ uint8_t *p_buffer;
+ size_t i_buffer;
+ if (rtp_xiph_pack_headers(9, p_extra, i_extra, &p_buffer, &i_buffer,
+ theora_pixel_fmt) != VLC_SUCCESS)
+ return NULL;
+
+ /* Number of packed headers */
+ SetDWBE(p_buffer, 1);
+ /* Ident */
+ uint32_t ident = XIPH_IDENT;
+ SetWBE(p_buffer + 4, ident >> 8);
+ p_buffer[6] = ident & 0xff;
+ /* Length field */
+ SetWBE(p_buffer + 7, i_buffer);
+
+ char *config = vlc_b64_encode_binary(p_buffer, i_buffer);
+ free(p_buffer);
+ return config;
+}
+
static void sprintf_hexa( char *s, uint8_t *p_data, int i_data )
{
static const char hex[16] = "0123456789abcdef";
if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 8000 )
rtp_fmt->payload_type = 0;
rtp_fmt->ptname = "PCMU";
- rtp_fmt->pf_packetize = rtp_packetize_split;
+ rtp_fmt->pf_packetize = rtp_packetize_pcm;
break;
case VLC_CODEC_ALAW:
if( p_fmt->audio.i_channels == 1 && p_fmt->audio.i_rate == 8000 )
rtp_fmt->payload_type = 8;
rtp_fmt->ptname = "PCMA";
- rtp_fmt->pf_packetize = rtp_packetize_split;
+ rtp_fmt->pf_packetize = rtp_packetize_pcm;
break;
case VLC_CODEC_S16B:
case VLC_CODEC_S16L:
}
rtp_fmt->ptname = "L16";
if( p_fmt->i_codec == VLC_CODEC_S16B )
- rtp_fmt->pf_packetize = rtp_packetize_split;
+ rtp_fmt->pf_packetize = rtp_packetize_pcm;
else
rtp_fmt->pf_packetize = rtp_packetize_swab;
break;
case VLC_CODEC_U8:
rtp_fmt->ptname = "L8";
- rtp_fmt->pf_packetize = rtp_packetize_split;
+ rtp_fmt->pf_packetize = rtp_packetize_pcm;
+ break;
+ case VLC_CODEC_S24B:
+ rtp_fmt->ptname = "L24";
+ rtp_fmt->pf_packetize = rtp_packetize_pcm;
break;
case VLC_CODEC_MPGA:
rtp_fmt->payload_type = 14;
break;
case VLC_CODEC_VORBIS:
rtp_fmt->ptname = "vorbis";
- rtp_fmt->pf_packetize = rtp_packetize_vorbis;
+ rtp_fmt->pf_packetize = rtp_packetize_xiph;
if( p_fmt->i_extra > 0 )
{
rtp_fmt->fmtp = NULL;
- uint8_t *p_buffer;
- size_t i_buffer;
- if (rtp_vorbis_pack_headers(9, p_fmt->p_extra, p_fmt->i_extra,
- &p_buffer, &i_buffer) != VLC_SUCCESS)
- break;
-
- /* Number of packed headers */
- SetDWBE(p_buffer, 1);
- /* Ident */
- uint32_t ident = VORBIS_IDENT;
- SetWBE(p_buffer + 4, ident >> 8);
- p_buffer[6] = ident & 0xff;
- /* Length field */
- SetWBE(p_buffer + 7, i_buffer);
-
- char *config = vlc_b64_encode_binary(p_buffer, i_buffer);
- free(p_buffer);
+ char *config = rtp_xiph_b64_oob_config(p_fmt->p_extra,
+ p_fmt->i_extra, NULL);
if (config == NULL)
break;
if( asprintf( &rtp_fmt->fmtp,
free(config);
}
break;
+ case VLC_CODEC_THEORA:
+ rtp_fmt->ptname = "theora";
+ rtp_fmt->pf_packetize = rtp_packetize_xiph;
+ if( p_fmt->i_extra > 0 )
+ {
+ rtp_fmt->fmtp = NULL;
+ uint8_t pixel_fmt, c1, c2;
+ char *config = rtp_xiph_b64_oob_config(p_fmt->p_extra,
+ p_fmt->i_extra,
+ &pixel_fmt);
+ if (config == NULL)
+ break;
+
+ if (pixel_fmt == 1)
+ {
+ /* reserved */
+ free(config);
+ break;
+ }
+ switch (pixel_fmt)
+ {
+ case 0:
+ c1 = 2;
+ c2 = 0;
+ break;
+ case 2:
+ c1 = c2 = 2;
+ break;
+ case 3:
+ c1 = c2 = 4;
+ break;
+ default:
+ assert(0);
+ }
+
+ if( asprintf( &rtp_fmt->fmtp,
+ "sampling=YCbCr-4:%d:%d; width=%d; height=%d; "
+ "delivery-method=inline; configuration=%s; "
+ "delivery-method=in_band;", c1, c2,
+ p_fmt->video.i_width, p_fmt->video.i_height,
+ config ) == -1 )
+ rtp_fmt->fmtp = NULL;
+ free(config);
+ }
+ break;
case VLC_CODEC_ITU_T140:
rtp_fmt->ptname = "t140" ;
rtp_fmt->clock_rate = 1000;
rtp_fmt->pf_packetize = rtp_packetize_t140;
break;
+ case VLC_CODEC_GSM:
+ rtp_fmt->payload_type = 3;
+ rtp_fmt->ptname = "GSM";
+ rtp_fmt->pf_packetize = rtp_packetize_split;
+ break;
+ case VLC_CODEC_OPUS:
+ if (p_fmt->audio.i_channels > 2)
+ {
+ msg_Err( obj, "Multistream opus not supported in RTP"
+ " (having %d channels input)",
+ p_fmt->audio.i_channels );
+ return VLC_EGENERIC;
+ }
+ rtp_fmt->ptname = "opus";
+ rtp_fmt->pf_packetize = rtp_packetize_simple;
+ rtp_fmt->clock_rate = 48000;
+ rtp_fmt->channels = 2;
+ if (p_fmt->audio.i_channels == 2)
+ rtp_fmt->fmtp = strdup( "sprop-stereo=1" );
+ break;
+ case VLC_CODEC_VP8:
+ rtp_fmt->ptname = "VP8";
+ rtp_fmt->pf_packetize = rtp_packetize_vp8;
+ break;
+ case VLC_CODEC_R420:
+ rtp_fmt->ptname = "RAW";
+ rtp_fmt->pf_packetize = rtp_packetize_r420;
+ if( asprintf( &rtp_fmt->fmtp,
+ "sampling=YCbCr-4:2:0; width=%d; height=%d; "
+ "depth=8; colorimetry=BT%s",
+ p_fmt->video.i_visible_width, p_fmt->video.i_visible_height,
+ p_fmt->video.i_visible_height > 576 ? "709-2" : "601-5") == -1 )
+ {
+ rtp_fmt->fmtp = NULL;
+ return VLC_ENOMEM;
+ }
+ break;
+ case VLC_CODEC_RGB24:
+ rtp_fmt->ptname = "RAW";
+ rtp_fmt->pf_packetize = rtp_packetize_rgb24;
+ if( asprintf( &rtp_fmt->fmtp,
+ "sampling=RGB; width=%d; height=%d; "
+ "depth=8; colorimetry=SMPTE240M",
+ p_fmt->video.i_visible_width,
+ p_fmt->video.i_visible_height ) == -1 )
+ {
+ rtp_fmt->fmtp = NULL;
+ return VLC_ENOMEM;
+ }
+ break;
+ case VLC_CODEC_MJPG:
+ case VLC_CODEC_JPEG:
+ rtp_fmt->ptname = "JPEG";
+ rtp_fmt->payload_type = 26;
+ rtp_fmt->pf_packetize = rtp_packetize_jpeg;
+ break;
default:
msg_Err( obj, "cannot add this stream (unsupported "
static int
-rtp_packetize_h264_nal( sout_stream_id_t *id,
+rtp_packetize_h264_nal( sout_stream_id_sys_t *id,
const uint8_t *p_data, int i_data, int64_t i_pts,
int64_t i_dts, bool b_last, int64_t i_length );
+int rtp_packetize_xiph_config( sout_stream_id_sys_t *id, const char *fmtp,
+ int64_t i_pts )
+{
+ if (fmtp == NULL)
+ return VLC_EGENERIC;
+
+ /* extract base64 configuration from fmtp */
+ char *start = strstr(fmtp, "configuration=");
+ assert(start != NULL);
+ start += sizeof("configuration=") - 1;
+ char *end = strchr(start, ';');
+ assert(end != NULL);
+ size_t len = end - start;
+
+ char *b64 = malloc(len + 1);
+ if(!b64)
+ return VLC_EGENERIC;
+
+ memcpy(b64, start, len);
+ b64[len] = '\0';
+
+ int i_max = rtp_mtu (id) - 6; /* payload max in one packet */
+
+ uint8_t *p_orig, *p_data;
+ int i_data;
+
+ i_data = vlc_b64_decode_binary(&p_orig, b64);
+ free(b64);
+ if (i_data <= 9)
+ {
+ free(p_orig);
+ return VLC_EGENERIC;
+ }
+ p_data = p_orig + 9;
+ i_data -= 9;
+
+ int i_count = ( i_data + i_max - 1 ) / i_max;
+
+ for( int i = 0; i < i_count; i++ )
+ {
+ int i_payload = __MIN( i_max, i_data );
+ block_t *out = block_Alloc( 18 + i_payload );
+
+ unsigned fragtype, numpkts;
+ if (i_count == 1)
+ {
+ fragtype = 0;
+ numpkts = 1;
+ }
+ else
+ {
+ numpkts = 0;
+ if (i == 0)
+ fragtype = 1;
+ else if (i == i_count - 1)
+ fragtype = 3;
+ else
+ fragtype = 2;
+ }
+ /* Ident:24, Fragment type:2, Vorbis/Theora Data Type:2, # of pkts:4 */
+ uint32_t header = ((XIPH_IDENT & 0xffffff) << 8) |
+ (fragtype << 6) | (1 << 4) | numpkts;
+
+ /* rtp common header */
+ rtp_packetize_common( id, out, 0, i_pts );
+
+ SetDWBE( out->p_buffer + 12, header);
+ SetWBE( out->p_buffer + 16, i_payload);
+ memcpy( &out->p_buffer[18], p_data, i_payload );
+
+ out->i_dts = i_pts;
+
+ rtp_packetize_send( id, out );
+
+ p_data += i_payload;
+ i_data -= i_payload;
+ }
+
+ free(p_orig);
+
+ return VLC_SUCCESS;
+}
+
/* rfc5215 */
-static int rtp_packetize_vorbis( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_xiph( sout_stream_id_sys_t *id, block_t *in )
{
int i_max = rtp_mtu (id) - 6; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
else
fragtype = 2;
}
- /* Ident:24, Fragment type:2, Vorbis Data Type:2, # of packets:4 */
- uint32_t header = ((VORBIS_IDENT & 0xffffff) << 8) |
+ /* Ident:24, Fragment type:2, Vorbis/Theora Data Type:2, # of pkts:4 */
+ uint32_t header = ((XIPH_IDENT & 0xffffff) << 8) |
(fragtype << 6) | (0 << 4) | numpkts;
/* rtp common header */
SetWBE( out->p_buffer + 16, i_payload);
memcpy( &out->p_buffer[18], p_data, i_payload );
- out->i_buffer = 18 + i_payload;
out->i_dts = in->i_dts + i * in->i_length / i_count;
out->i_length = in->i_length / i_count;
i_data -= i_payload;
}
+ block_Release(in);
return VLC_SUCCESS;
}
-static int rtp_packetize_mpa( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_mpa( sout_stream_id_sys_t *id, block_t *in )
{
int i_max = rtp_mtu (id) - 4; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
SetWBE( out->p_buffer + 14, i * i_max );
memcpy( &out->p_buffer[16], p_data, 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;
i_data -= i_payload;
}
+ block_Release(in);
return VLC_SUCCESS;
}
/* rfc2250 */
-static int rtp_packetize_mpv( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_mpv( sout_stream_id_sys_t *id, block_t *in )
{
int i_max = rtp_mtu (id) - 4; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
memcpy( &out->p_buffer[16], p_data, 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;
i_data -= i_payload;
}
+ block_Release(in);
return VLC_SUCCESS;
}
-static int rtp_packetize_ac3( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_ac3( sout_stream_id_sys_t *id, block_t *in )
{
int i_max = rtp_mtu (id) - 2; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
/* data */
memcpy( &out->p_buffer[14], p_data, 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;
i_data -= i_payload;
}
+ block_Release(in);
return VLC_SUCCESS;
}
-static int rtp_packetize_split( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_simple(sout_stream_id_sys_t *id, block_t *block)
+{
+ bool marker = (block->i_flags & BLOCK_FLAG_DISCONTINUITY) != 0;
+
+ block = block_Realloc(block, 12, block->i_buffer);
+ if (unlikely(block == NULL))
+ return VLC_ENOMEM;
+
+ rtp_packetize_common(id, block, marker, block->i_pts);
+ rtp_packetize_send(id, block);
+ return VLC_SUCCESS;
+}
+
+static int rtp_packetize_split( sout_stream_id_sys_t *id, block_t *in )
{
int i_max = rtp_mtu (id); /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
(in->i_pts > VLC_TS_INVALID ? 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 + i * in->i_length / i_count;
out->i_length = in->i_length / i_count;
i_data -= i_payload;
}
+ block_Release(in);
return VLC_SUCCESS;
}
-/* split and convert from little endian to network byte order */
-static int rtp_packetize_swab( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_pcm(sout_stream_id_sys_t *id, block_t *in)
{
- int i_max = rtp_mtu (id); /* payload max in one packet */
- int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
+ unsigned max = rtp_mtu(id);
- uint8_t *p_data = in->p_buffer;
- int i_data = in->i_buffer;
- int i;
-
- for( i = 0; i < i_count; i++ )
+ while (in->i_buffer > max)
{
- int i_payload = __MIN( i_max, i_data );
- block_t *out = block_Alloc( 12 + i_payload );
+ unsigned duration = (in->i_length * max) / in->i_buffer;
+ bool marker = (in->i_flags & BLOCK_FLAG_DISCONTINUITY) != 0;
- /* rtp common header */
- rtp_packetize_common( id, out, (i == i_count - 1),
- (in->i_pts > VLC_TS_INVALID ? in->i_pts : in->i_dts) );
- swab( p_data, out->p_buffer + 12, i_payload );
+ block_t *out = block_Alloc(12 + max);
+ if (unlikely(out == NULL))
+ {
+ block_Release(in);
+ return VLC_ENOMEM;
+ }
- 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;
+ rtp_packetize_common(id, out, marker, in->i_pts);
+ memcpy(out->p_buffer + 12, in->p_buffer, max);
+ rtp_packetize_send(id, out);
- rtp_packetize_send( id, out );
+ in->p_buffer += max;
+ in->i_buffer -= max;
+ in->i_pts += duration;
+ in->i_length -= duration;
+ in->i_flags &= ~BLOCK_FLAG_DISCONTINUITY;
+ }
- p_data += i_payload;
- i_data -= i_payload;
+ return rtp_packetize_simple(id, in); /* zero copy for the last frame */
+}
+
+/* split and convert from little endian to network byte order */
+static int rtp_packetize_swab(sout_stream_id_sys_t *id, block_t *in)
+{
+ unsigned max = rtp_mtu(id);
+
+ while (in->i_buffer > 0)
+ {
+ unsigned payload = (max < in->i_buffer) ? max : in->i_buffer;
+ unsigned duration = (in->i_length * payload) / in->i_buffer;
+ bool marker = (in->i_flags & BLOCK_FLAG_DISCONTINUITY) != 0;
+
+ block_t *out = block_Alloc(12 + payload);
+ if (unlikely(out == NULL))
+ {
+ block_Release(in);
+ return VLC_ENOMEM;
+ }
+
+ rtp_packetize_common(id, out, marker, in->i_pts);
+ swab(in->p_buffer, out->p_buffer + 12, payload);
+ rtp_packetize_send(id, out);
+
+ in->p_buffer += payload;
+ in->i_buffer -= payload;
+ in->i_pts += duration;
+ in->i_length -= duration;
+ in->i_flags &= ~BLOCK_FLAG_DISCONTINUITY;
}
+ block_Release(in);
return VLC_SUCCESS;
}
/* rfc3016 */
-static int rtp_packetize_mp4a_latm( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_mp4a_latm( sout_stream_id_sys_t *id, block_t *in )
{
int i_max = rtp_mtu (id) - 2; /* payload max in one packet */
int latmhdrsize = in->i_buffer / 0xff + 1;
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;
i_data -= i_payload;
}
+ block_Release(in);
return VLC_SUCCESS;
}
-static int rtp_packetize_mp4a( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_mp4a( sout_stream_id_sys_t *id, block_t *in )
{
int i_max = rtp_mtu (id) - 4; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
memcpy( &out->p_buffer[16], p_data, 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;
i_data -= i_payload;
}
+ block_Release(in);
return VLC_SUCCESS;
}
/* rfc2429 */
#define RTP_H263_HEADER_SIZE (2) // plen = 0
#define RTP_H263_PAYLOAD_START (14) // plen = 0
-static int rtp_packetize_h263( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_h263( sout_stream_id_sys_t *id, block_t *in )
{
uint8_t *p_data = in->p_buffer;
int i_data = in->i_buffer;
if( i_data < 2 )
{
+ block_Release(in);
return VLC_EGENERIC;
}
if( p_data[0] || p_data[1] )
{
+ block_Release(in);
return VLC_EGENERIC;
}
/* remove 2 leading 0 bytes */
SetWBE( out->p_buffer + 12, h );
memcpy( &out->p_buffer[RTP_H263_PAYLOAD_START], p_data, i_payload );
- out->i_buffer = RTP_H263_PAYLOAD_START + i_payload;
out->i_dts = in->i_dts + i * in->i_length / i_count;
out->i_length = in->i_length / i_count;
i_data -= i_payload;
}
+ block_Release(in);
return VLC_SUCCESS;
}
/* rfc3984 */
static int
-rtp_packetize_h264_nal( sout_stream_id_t *id,
+rtp_packetize_h264_nal( sout_stream_id_sys_t *id,
const uint8_t *p_data, int i_data, int64_t i_pts,
int64_t i_dts, bool b_last, int64_t i_length )
{
/* */
rtp_packetize_common( id, out, b_last, i_pts );
- out->i_buffer = 12 + i_data;
memcpy( &out->p_buffer[12], p_data, i_data );
/* */
rtp_packetize_common( id, out, (b_last && i_payload == i_data),
i_pts );
- out->i_buffer = 14 + i_payload;
-
/* FU indicator */
out->p_buffer[12] = 0x00 | (i_nal_hdr & 0x60) | 28;
/* FU header */
return VLC_SUCCESS;
}
-static int rtp_packetize_h264( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_h264( sout_stream_id_sys_t *id, block_t *in )
{
const uint8_t *p_buffer = in->p_buffer;
int i_buffer = in->i_buffer;
i_buffer -= i_skip;
p_buffer += i_skip;
}
+
+ block_Release(in);
return VLC_SUCCESS;
}
-static int rtp_packetize_amr( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_amr( sout_stream_id_sys_t *id, block_t *in )
{
int i_max = rtp_mtu (id) - 2; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
/* 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_buffer--; /* FIXME? */
out->i_dts = in->i_dts + i * in->i_length / i_count;
out->i_length = in->i_length / i_count;
i_data -= i_payload;
}
+ block_Release(in);
return VLC_SUCCESS;
}
-static int rtp_packetize_t140( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_t140( sout_stream_id_sys_t *id, block_t *in )
{
const size_t i_max = rtp_mtu (id);
const uint8_t *p_data = in->p_buffer;
while( ( p_data[i_payload] & 0xC0 ) == 0x80 )
{
if( i_payload == 0 )
+ {
+ block_Release(in);
return VLC_SUCCESS; /* fishy input! */
-
+ }
i_payload--;
}
}
block_t *out = block_Alloc( 12 + i_payload );
if( out == NULL )
+ {
+ block_Release(in);
return VLC_SUCCESS;
+ }
rtp_packetize_common( id, out, 0, in->i_pts + i_packet );
memcpy( out->p_buffer + 12, p_data, i_payload );
- out->i_buffer = 12 + i_payload;
- out->i_dts = out->i_pts;
+ out->i_dts = in->i_pts;
out->i_length = 0;
rtp_packetize_send( id, out );
i_data -= i_payload;
}
+ block_Release(in);
return VLC_SUCCESS;
}
-static int rtp_packetize_spx( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_spx( sout_stream_id_sys_t *id, block_t *in )
{
uint8_t *p_buffer = in->p_buffer;
int i_data_size, i_payload_size, i_payload_padding;
block_t *p_out;
if ( in->i_buffer > rtp_mtu (id) )
+ {
+ block_Release(in);
return VLC_SUCCESS;
+ }
/*
- RFC for Speex in RTP says that each packet must end on an octet
+ RFC for Speex in RTP says that each packet must end on an octet
boundary. So, we check to see if the number of bytes % 4 is zero.
- If not, we have to add some padding.
+ If not, we have to add some padding.
- This MAY be overkill since packetization is handled elsewhere and
+ This MAY be overkill since packetization is handled elsewhere and
appears to ensure the octet boundary. However, better safe than
sorry.
*/
}
/*
- Allocate a new RTP p_output block of the appropriate size.
- Allow for 12 extra bytes of RTP header.
+ Allocate a new RTP p_output block of the appropriate size.
+ Allow for 12 extra bytes of RTP header.
*/
p_out = block_Alloc( 12 + i_payload_size );
of the expected RTP header added during
rtp_packetize_common.
*/
- p_out->p_buffer[12 + i_data_size] = c_first_pad;
+ p_out->p_buffer[12 + i_data_size] = c_first_pad;
switch (i_payload_padding)
{
case 2:
- p_out->p_buffer[12 + i_data_size + 1] = c_remaining_pad;
+ p_out->p_buffer[12 + i_data_size + 1] = c_remaining_pad;
break;
case 3:
- p_out->p_buffer[12 + i_data_size + 1] = c_remaining_pad;
- p_out->p_buffer[12 + i_data_size + 2] = c_remaining_pad;
+ p_out->p_buffer[12 + i_data_size + 1] = c_remaining_pad;
+ p_out->p_buffer[12 + i_data_size + 2] = c_remaining_pad;
break;
}
}
/* Copy the Speex payload to the p_output buffer */
memcpy( &p_out->p_buffer[12], p_buffer, i_data_size );
- p_out->i_buffer = 12 + i_payload_size;
p_out->i_dts = in->i_dts;
p_out->i_length = in->i_length;
+ block_Release(in);
/* Queue the buffer for actual transmission. */
rtp_packetize_send( id, p_out );
return VLC_SUCCESS;
}
-static int rtp_packetize_g726( sout_stream_id_t *id, block_t *in, int i_pad )
+static int rtp_packetize_g726( sout_stream_id_sys_t *id, block_t *in, int i_pad )
{
int i_max = (rtp_mtu( id )- 12 + i_pad - 1) & ~i_pad;
int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
while( i_data > 0 )
{
int i_payload = __MIN( i_max, i_data );
- block_t *out = block_New( p_stream, 12 + i_payload );
+ block_t *out = block_Alloc( 12 + i_payload );
/* rtp common header */
rtp_packetize_common( id, out, 0,
memcpy( &out->p_buffer[12], p_data, 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;
p_data += i_payload;
i_data -= i_payload;
}
+
+ block_Release(in);
return VLC_SUCCESS;
}
-static int rtp_packetize_g726_16( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_g726_16( sout_stream_id_sys_t *id, block_t *in )
{
return rtp_packetize_g726( id, in, 4 );
}
-static int rtp_packetize_g726_24( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_g726_24( sout_stream_id_sys_t *id, block_t *in )
{
return rtp_packetize_g726( id, in, 8 );
}
-static int rtp_packetize_g726_32( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_g726_32( sout_stream_id_sys_t *id, block_t *in )
{
return rtp_packetize_g726( id, in, 2 );
}
-static int rtp_packetize_g726_40( sout_stream_id_t *id, block_t *in )
+static int rtp_packetize_g726_40( sout_stream_id_sys_t *id, block_t *in )
{
return rtp_packetize_g726( id, in, 8 );
}
+
+#define RTP_VP8_HEADER_SIZE 1
+#define RTP_VP8_PAYLOAD_START (12 + RTP_VP8_HEADER_SIZE)
+
+static int rtp_packetize_vp8( sout_stream_id_sys_t *id, block_t *in )
+{
+ int i_max = rtp_mtu (id) - RTP_VP8_HEADER_SIZE;
+ int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
+
+ uint8_t *p_data = in->p_buffer;
+ int i_data = in->i_buffer;
+
+ if ( i_max <= 0 )
+ {
+ block_Release(in);
+ return VLC_EGENERIC;
+ }
+
+ for( int i = 0; i < i_count; i++ )
+ {
+ int i_payload = __MIN( i_max, i_data );
+ block_t *out = block_Alloc( RTP_VP8_PAYLOAD_START + i_payload );
+ if ( out == NULL )
+ {
+ block_Release(in);
+ return VLC_ENOMEM;
+ }
+
+ /* VP8 payload header */
+ /* All frames are marked as reference ones */
+ if (i == 0)
+ out->p_buffer[12] = 0x10; // partition start
+ else
+ out->p_buffer[12] = 0;
+
+ /* rtp common header */
+ rtp_packetize_common( id, out, (i == i_count - 1),
+ (in->i_pts > VLC_TS_INVALID ? in->i_pts : in->i_dts) );
+ memcpy( &out->p_buffer[RTP_VP8_PAYLOAD_START], p_data, 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;
+ }
+
+ block_Release(in);
+ return VLC_SUCCESS;
+}
+
+/* See RFC 4175 */
+static int rtp_packetize_rawvideo( sout_stream_id_sys_t *id, block_t *in, vlc_fourcc_t i_format )
+{
+ int i_width, i_height;
+ rtp_get_video_geometry( id, &i_width, &i_height );
+ int i_pgroup; /* Size of a group of pixels */
+ int i_xdec, i_ydec; /* sub-sampling factor in x and y */
+ switch( i_format )
+ {
+ case VLC_CODEC_RGB24:
+ i_pgroup = 3;
+ i_xdec = i_ydec = 1;
+ break;
+ case VLC_CODEC_R420:
+ i_pgroup = 6;
+ i_xdec = i_ydec = 2;
+ break;
+ default:
+ assert(0);
+ }
+
+ static const int RTP_HEADER_LEN = 12;
+ /* each partial or complete line needs a 6 byte header */
+ const int i_line_header_size = 6;
+ const int i_min_line_size = i_line_header_size + i_pgroup;
+ uint8_t *p_data = in->p_buffer;
+
+ for( uint16_t i_line_number = 0, i_column = 0; i_line_number < i_height; )
+ {
+ /* Allocate a packet */
+ int i_payload = (int)(rtp_mtu (id) - RTP_HEADER_LEN);
+ if( i_payload <= 0 )
+ {
+ block_Release( in );
+ return VLC_EGENERIC;
+ }
+
+ block_t *out = block_Alloc( RTP_HEADER_LEN + i_payload );
+ if( unlikely( out == NULL ) )
+ {
+ block_Release( in );
+ return VLC_ENOMEM;
+ }
+
+ /* Do headers first... */
+
+ /* Write extended seqnum */
+ uint8_t *p_outdata = out->p_buffer + RTP_HEADER_LEN;
+ SetWBE( p_outdata, rtp_get_extended_sequence( id ) );
+ p_outdata += 2;
+ i_payload -= 2;
+
+ uint8_t *p_headers = p_outdata;
+
+ for( uint8_t i_cont = 0x80; i_cont && i_payload > i_min_line_size; )
+ {
+ i_payload -= i_line_header_size;
+
+ int i_pixels = i_width - i_column;
+ int i_length = (i_pixels * i_pgroup) / i_xdec;
+
+ const bool b_next_line = i_payload >= i_length;
+ if( !b_next_line )
+ {
+ i_pixels = (i_payload / i_pgroup) * i_xdec;
+ i_length = (i_pixels * i_pgroup) / i_xdec;
+ }
+
+ i_payload -= i_length;
+
+ /* write length */
+ SetWBE( p_outdata, i_length );
+ p_outdata += 2;
+
+ /* write line number */
+ /* TODO: support interlaced */
+ const uint8_t i_field = 0;
+ SetWBE( p_outdata, i_line_number );
+ *p_outdata |= i_field << 7;
+ p_outdata += 2;
+
+ /* continue if there's still room in the packet and we have more lines */
+ i_cont = (i_payload > i_min_line_size && i_line_number < (i_height - i_ydec)) ? 0x80 : 0x00;
+
+ /* write offset and continuation marker */
+ SetWBE( p_outdata, i_column );
+ *p_outdata |= i_cont;
+ p_outdata += 2;
+
+ if( b_next_line )
+ {
+ i_column = 0;
+ i_line_number += i_ydec;
+ }
+ else
+ {
+ i_column += i_pixels;
+ }
+ }
+
+ /* write the actual video data here */
+ for( uint8_t i_cont = 0x80; i_cont; p_headers += i_line_header_size )
+ {
+ const uint16_t i_length = GetWBE( p_headers );
+ const uint16_t i_lin = GetWBE( p_headers + 2 ) & 0x7fff;
+ uint16_t i_offs = GetWBE( p_headers + 4 ) & 0x7fff;
+ i_cont = p_headers[4] & 0x80;
+
+ if( i_format == VLC_CODEC_RGB24 )
+ {
+ const int i_ystride = i_width * i_pgroup;
+ i_offs /= i_xdec;
+ memcpy( p_outdata, p_data + (i_lin * i_ystride) + (i_offs * i_pgroup), i_length );
+ p_outdata += i_length;
+ }
+ else if( i_format == VLC_CODEC_R420 )
+ {
+ memcpy( p_outdata, p_data, i_length );
+ p_outdata += i_length;
+ p_data += i_length;
+ }
+ else assert(0);
+ }
+
+ /* rtp common header */
+ rtp_packetize_common( id, out, i_line_number >= i_height,
+ (in->i_pts > VLC_TS_INVALID ? in->i_pts : in->i_dts) );
+
+ out->i_dts = in->i_dts;
+ out->i_length = in->i_length;
+
+ rtp_packetize_send( id, out );
+ }
+
+ block_Release( in );
+ return VLC_SUCCESS;
+}
+
+static int rtp_packetize_r420( sout_stream_id_sys_t *id, block_t *in )
+{
+ return rtp_packetize_rawvideo( id, in, VLC_CODEC_R420 );
+}
+
+static int rtp_packetize_rgb24( sout_stream_id_sys_t *id, block_t *in )
+{
+ return rtp_packetize_rawvideo( id, in, VLC_CODEC_RGB24 );
+}
+
+static int rtp_packetize_jpeg( sout_stream_id_sys_t *id, block_t *in )
+{
+ uint8_t *p_data = in->p_buffer;
+ int i_data = in->i_buffer;
+ uint8_t *bufend = p_data + i_data;
+
+ const uint8_t *qtables = NULL;
+ int nb_qtables = 0;
+ int off = 0; // fragment offset in frame
+ int y_sampling_factor;
+ // type is set by pixel format (determined by y_sampling_factor):
+ // 0 for yuvj422p
+ // 1 for yuvj420p
+ // += 64 if DRI present
+ int type;
+ int w = 0; // Width in multiples of 8
+ int h = 0; // Height in multiples of 8
+ int restart_interval;
+ int dri_found = 0;
+
+ // Skip SOI
+ if (GetWBE(p_data) != 0xffd8)
+ goto error;
+ p_data += 2;
+ i_data -= 2;
+
+ /* parse the header to get necessary info */
+ int header_finished = 0;
+ while (!header_finished && p_data + 4 <= bufend) {
+ uint16_t marker = GetWBE(p_data);
+ uint8_t *section = p_data + 2;
+ int section_size = GetWBE(section);
+ uint8_t *section_body = p_data + 4;
+ if (section + section_size > bufend)
+ goto error;
+
+ assert((marker & 0xff00) == 0xff00);
+ switch (marker)
+ {
+ case 0xffdb /*DQT*/:
+ if (section_body[0])
+ goto error; // Only 8-bit precision is supported
+
+ /* a quantization table is 64 bytes long */
+ nb_qtables = section_size / 65;
+ qtables = section_body;
+ break;
+ case 0xffc0 /*SOF0*/:
+ {
+ int height = GetWBE(§ion_body[1]);
+ int width = GetWBE(§ion_body[3]);
+ if (width > 2040 || height > 2040)
+ {
+ // larger than limit supported by RFC 2435
+ goto error;
+ }
+ // Round up by 8, divide by 8
+ w = ((width+7)&~7) >> 3;
+ h = ((height+7)&~7) >> 3;
+
+ // Get components sampling to determine type
+ // Y has component ID 1
+ // Possible configurations of sampling factors:
+ // Y - 0x22, Cb - 0x11, Cr - 0x11 => yuvj420p
+ // Y - 0x21, Cb - 0x11, Cr - 0x11 => yuvj422p
+
+ // Only 3 components are supported by RFC 2435
+ if (section_body[5] != 3) // Number of components
+ goto error;
+ for (int j = 0; j < 3; j++)
+ {
+ if (section_body[6 + j * 3] == 1 /* Y */)
+ {
+ y_sampling_factor = section_body[6 + j * 3 + 1];
+ }
+ else if (section_body[6 + j * 3 + 1] != 0x11)
+ {
+ // Sampling factor is unsupported by RFC 2435
+ goto error;
+ }
+ }
+ break;
+ }
+ case 0xffdd /*DRI*/:
+ restart_interval = GetWBE(section_body);
+ dri_found = 1;
+ break;
+ case 0xffda /*SOS*/:
+ /* SOS is last marker in the header */
+ header_finished = 1;
+ break;
+ }
+ // Step over marker, 16bit length and section body
+ p_data += 2 + section_size;
+ i_data -= 2 + section_size;
+ }
+ if (!header_finished)
+ goto error;
+ if (!w || !h)
+ goto error;
+
+ switch (y_sampling_factor)
+ {
+ case 0x22: // yuvj420p
+ type = 1;
+ break;
+ case 0x21: // yuvj422p
+ type = 0;
+ break;
+ default:
+ goto error; // Sampling format unsupported by RFC 2435
+ }
+
+ if (dri_found)
+ type += 64;
+
+ while ( i_data )
+ {
+ int hdr_size = 8 + dri_found * 4;
+ if (off == 0 && nb_qtables)
+ hdr_size += 4 + 64 * nb_qtables;
+
+ int i_payload = __MIN( i_data, (int)(rtp_mtu (id) - hdr_size) );
+ if ( i_payload <= 0 )
+ goto error;
+
+ block_t *out = block_Alloc( 12 + hdr_size + i_payload );
+ if( out == NULL )
+ {
+ block_Release( in );
+ return VLC_ENOMEM;
+ }
+
+ uint8_t *p = out->p_buffer + 12;
+ /* set main header */
+ /* set type-specific=0, set offset in following 24 bits: */
+ SetDWBE(p, off & 0x00ffffff);
+ p += 4;
+ *p++ = type;
+ *p++ = 255; // Quant value
+ *p++ = w;
+ *p++ = h;
+
+ // Write restart_marker_hdr if needed
+ if (dri_found)
+ {
+ SetWBE(p, restart_interval);
+ p += 2;
+ // restart_count. Hardcoded same value as in gstreamer implementation
+ SetWBE(p, 0xffff);
+ p += 2;
+ }
+
+ if (off == 0 && nb_qtables)
+ {
+ /* set quantization tables header */
+ *p++ = 0;
+ *p++ = 0;
+ SetWBE (p, 64 * nb_qtables);
+ p += 2;
+ for (int i = 0; i < nb_qtables; i++)
+ {
+ memcpy (p, &qtables[65 * i + 1], 64);
+ p += 64;
+ }
+ }
+
+ /* rtp common header */
+ rtp_packetize_common( id, out, (i_payload == i_data),
+ (in->i_pts > VLC_TS_INVALID ? in->i_pts : in->i_dts) );
+ memcpy( p, p_data, i_payload );
+
+ out->i_dts = in->i_dts;
+ out->i_length = in->i_length;
+
+ rtp_packetize_send( id, out );
+
+ p_data += i_payload;
+ i_data -= i_payload;
+ off += i_payload;
+ }
+
+ block_Release(in);
+ return VLC_SUCCESS;
+error:
+ block_Release(in);
+ return VLC_EGENERIC;
+}
projects / vlc / blobdiff