#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_xiph (sout_stream_id_t *, block_t *);
+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_split(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 *);
#define XIPH_IDENT (0)
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_split;
+ 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_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_t *id, const char *fmtp,
+int rtp_packetize_xiph_config( sout_stream_id_sys_t *id, const char *fmtp,
int64_t i_pts )
{
if (fmtp == NULL)
}
/* rfc5215 */
-static int rtp_packetize_xiph( 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;
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;
}
/* 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;
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;
return VLC_SUCCESS;
}
-static int rtp_packetize_split( sout_stream_id_t *id, block_t *in )
+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;
}
/* 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_swab( 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;
}
/* 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;
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;
/* 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;
/* 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 )
{
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;
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;
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;
}
-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;
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;
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 )
+ 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 )
+ 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_buffer = RTP_VP8_PAYLOAD_START + 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_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)
+ return VLC_EGENERIC;
+ 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)
+ return VLC_EGENERIC;
+
+ assert((marker & 0xff00) == 0xff00);
+ switch (marker)
+ {
+ case 0xffdb /*DQT*/:
+ if (section_body[0])
+ {
+ // Only 8-bit precision is supported
+ return VLC_EGENERIC;
+ }
+
+ /* 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
+ return VLC_EGENERIC;
+ }
+ // 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
+ return VLC_EGENERIC;
+ 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
+ return VLC_EGENERIC;
+ }
+ }
+ 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)
+ return VLC_EGENERIC;
+ if (!w || !h)
+ return VLC_EGENERIC;
+
+ switch (y_sampling_factor)
+ {
+ case 0x22: // yuvj420p
+ type = 1;
+ break;
+ case 0x21: // yuvj422p
+ type = 0;
+ break;
+ default:
+ // Sampling format unsupported by RFC 2435
+ return VLC_EGENERIC;
+ }
+
+ 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 )
+ return VLC_EGENERIC;
+
+ block_t *out = block_Alloc( 12 + hdr_size + i_payload );
+ if( out == NULL )
+ 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_buffer = 12 + hdr_size + 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;
+ }
+
+ return VLC_SUCCESS;
+}
projects / vlc / blobdiff