Skip to content

V
vlc
Commit 53391ce6 authored by Pierre Ynard's avatar Pierre Ynard
Browse files
Options

rtp sout: make private functions static

parent c6d32327
Hide whitespace changes
Inline Side-by-side
Showing with 35 additions and 35 deletions
modules/stream_out/rtpfmt.c
View file @ 53391ce6
...@@ -35,22 +35,23 @@ ...@@ -35,22 +35,23 @@
#include <assert.h> #include <assert.h>
int rtp_packetize_mpa (sout_stream_id_t *, block_t *); static int rtp_packetize_mpa (sout_stream_id_t *, block_t *);
int rtp_packetize_mpv (sout_stream_id_t *, block_t *); static int rtp_packetize_mpv (sout_stream_id_t *, block_t *);
int rtp_packetize_ac3 (sout_stream_id_t *, block_t *); static int rtp_packetize_ac3 (sout_stream_id_t *, block_t *);
int rtp_packetize_split(sout_stream_id_t *, block_t *); static int rtp_packetize_split(sout_stream_id_t *, block_t *);
int rtp_packetize_swab (sout_stream_id_t *, block_t *); static int rtp_packetize_swab (sout_stream_id_t *, block_t *);
int rtp_packetize_mp4a (sout_stream_id_t *, block_t *); static int rtp_packetize_mp4a (sout_stream_id_t *, block_t *);
int rtp_packetize_mp4a_latm (sout_stream_id_t *, block_t *); static int rtp_packetize_mp4a_latm (sout_stream_id_t *, block_t *);
int rtp_packetize_h263 (sout_stream_id_t *, block_t *); static int rtp_packetize_h263 (sout_stream_id_t *, block_t *);
int rtp_packetize_h264 (sout_stream_id_t *, block_t *); static int rtp_packetize_h264 (sout_stream_id_t *, block_t *);
int rtp_packetize_amr (sout_stream_id_t *, block_t *); static int rtp_packetize_amr (sout_stream_id_t *, block_t *);
int rtp_packetize_spx (sout_stream_id_t *, block_t *); static int rtp_packetize_spx (sout_stream_id_t *, block_t *);
int rtp_packetize_t140 (sout_stream_id_t *, block_t *); static int rtp_packetize_t140 (sout_stream_id_t *, block_t *);
int rtp_packetize_g726_16 (sout_stream_id_t *, block_t *); static int rtp_packetize_g726_16 (sout_stream_id_t *, block_t *);
int rtp_packetize_g726_24 (sout_stream_id_t *, block_t *); static int rtp_packetize_g726_24 (sout_stream_id_t *, block_t *);
int rtp_packetize_g726_32 (sout_stream_id_t *, block_t *); static int rtp_packetize_g726_32 (sout_stream_id_t *, block_t *);
int rtp_packetize_g726_40 (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 *);
static void sprintf_hexa( char *s, uint8_t *p_data, int i_data ) static void sprintf_hexa( char *s, uint8_t *p_data, int i_data )
{ {
...@@ -352,13 +353,12 @@ int rtp_get_fmt( vlc_object_t *obj, es_format_t *p_fmt, const char *mux, ...@@ -352,13 +353,12 @@ int rtp_get_fmt( vlc_object_t *obj, es_format_t *p_fmt, const char *mux,
} }
int static int
rtp_packetize_h264_nal( sout_stream_id_t *id, rtp_packetize_h264_nal( sout_stream_id_t *id,
const uint8_t *p_data, int i_data, int64_t i_pts, const uint8_t *p_data, int i_data, int64_t i_pts,
int64_t i_dts, bool b_last, int64_t i_length ); int64_t i_dts, bool b_last, int64_t i_length );
int rtp_packetize_mpa( sout_stream_id_t *id, static int rtp_packetize_mpa( sout_stream_id_t *id, block_t *in )
block_t *in )
{ {
int i_max = rtp_mtu (id) - 4; /* payload max in one packet */ int i_max = rtp_mtu (id) - 4; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max; int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
...@@ -394,7 +394,7 @@ int rtp_packetize_mpa( sout_stream_id_t *id, ...@@ -394,7 +394,7 @@ int rtp_packetize_mpa( sout_stream_id_t *id,
} }
/* rfc2250 */ /* rfc2250 */
int rtp_packetize_mpv( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_mpv( sout_stream_id_t *id, block_t *in )
{ {
int i_max = rtp_mtu (id) - 4; /* payload max in one packet */ int i_max = rtp_mtu (id) - 4; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max; int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
...@@ -492,7 +492,7 @@ int rtp_packetize_mpv( sout_stream_id_t *id, block_t *in ) ...@@ -492,7 +492,7 @@ int rtp_packetize_mpv( sout_stream_id_t *id, block_t *in )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
int rtp_packetize_ac3( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_ac3( sout_stream_id_t *id, block_t *in )
{ {
int i_max = rtp_mtu (id) - 2; /* payload max in one packet */ int i_max = rtp_mtu (id) - 2; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max; int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
...@@ -528,7 +528,7 @@ int rtp_packetize_ac3( sout_stream_id_t *id, block_t *in ) ...@@ -528,7 +528,7 @@ int rtp_packetize_ac3( sout_stream_id_t *id, block_t *in )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
int rtp_packetize_split( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_split( sout_stream_id_t *id, block_t *in )
{ {
int i_max = rtp_mtu (id); /* payload max in one packet */ int i_max = rtp_mtu (id); /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max; int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
...@@ -561,7 +561,7 @@ int rtp_packetize_split( sout_stream_id_t *id, block_t *in ) ...@@ -561,7 +561,7 @@ int rtp_packetize_split( sout_stream_id_t *id, block_t *in )
} }
/* split and convert from little endian to network byte order */ /* split and convert from little endian to network byte order */
int rtp_packetize_swab( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_swab( sout_stream_id_t *id, block_t *in )
{ {
int i_max = rtp_mtu (id); /* payload max in one packet */ int i_max = rtp_mtu (id); /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max; int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
...@@ -594,7 +594,7 @@ int rtp_packetize_swab( sout_stream_id_t *id, block_t *in ) ...@@ -594,7 +594,7 @@ int rtp_packetize_swab( sout_stream_id_t *id, block_t *in )
} }
/* rfc3016 */ /* rfc3016 */
int rtp_packetize_mp4a_latm( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_mp4a_latm( sout_stream_id_t *id, block_t *in )
{ {
int i_max = rtp_mtu (id) - 2; /* payload max in one packet */ int i_max = rtp_mtu (id) - 2; /* payload max in one packet */
int latmhdrsize = in->i_buffer / 0xff + 1; int latmhdrsize = in->i_buffer / 0xff + 1;
...@@ -646,7 +646,7 @@ int rtp_packetize_mp4a_latm( sout_stream_id_t *id, block_t *in ) ...@@ -646,7 +646,7 @@ int rtp_packetize_mp4a_latm( sout_stream_id_t *id, block_t *in )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
int rtp_packetize_mp4a( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_mp4a( sout_stream_id_t *id, block_t *in )
{ {
int i_max = rtp_mtu (id) - 4; /* payload max in one packet */ int i_max = rtp_mtu (id) - 4; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max; int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
...@@ -689,7 +689,7 @@ int rtp_packetize_mp4a( sout_stream_id_t *id, block_t *in ) ...@@ -689,7 +689,7 @@ int rtp_packetize_mp4a( sout_stream_id_t *id, block_t *in )
/* rfc2429 */ /* rfc2429 */
#define RTP_H263_HEADER_SIZE (2) // plen = 0 #define RTP_H263_HEADER_SIZE (2) // plen = 0
#define RTP_H263_PAYLOAD_START (14) // plen = 0 #define RTP_H263_PAYLOAD_START (14) // plen = 0
int rtp_packetize_h263( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_h263( sout_stream_id_t *id, block_t *in )
{ {
uint8_t *p_data = in->p_buffer; uint8_t *p_data = in->p_buffer;
int i_data = in->i_buffer; int i_data = in->i_buffer;
...@@ -748,7 +748,7 @@ int rtp_packetize_h263( sout_stream_id_t *id, block_t *in ) ...@@ -748,7 +748,7 @@ int rtp_packetize_h263( sout_stream_id_t *id, block_t *in )
} }
/* rfc3984 */ /* rfc3984 */
int static int
rtp_packetize_h264_nal( sout_stream_id_t *id, rtp_packetize_h264_nal( sout_stream_id_t *id,
const uint8_t *p_data, int i_data, int64_t i_pts, const uint8_t *p_data, int i_data, int64_t i_pts,
int64_t i_dts, bool b_last, int64_t i_length ) int64_t i_dts, bool b_last, int64_t i_length )
...@@ -819,7 +819,7 @@ rtp_packetize_h264_nal( sout_stream_id_t *id, ...@@ -819,7 +819,7 @@ rtp_packetize_h264_nal( sout_stream_id_t *id,
return VLC_SUCCESS; return VLC_SUCCESS;
} }
int rtp_packetize_h264( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_h264( sout_stream_id_t *id, block_t *in )
{ {
const uint8_t *p_buffer = in->p_buffer; const uint8_t *p_buffer = in->p_buffer;
int i_buffer = in->i_buffer; int i_buffer = in->i_buffer;
...@@ -859,7 +859,7 @@ int rtp_packetize_h264( sout_stream_id_t *id, block_t *in ) ...@@ -859,7 +859,7 @@ int rtp_packetize_h264( sout_stream_id_t *id, block_t *in )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
int rtp_packetize_amr( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_amr( sout_stream_id_t *id, block_t *in )
{ {
int i_max = rtp_mtu (id) - 2; /* payload max in one packet */ int i_max = rtp_mtu (id) - 2; /* payload max in one packet */
int i_count = ( in->i_buffer + i_max - 1 ) / i_max; int i_count = ( in->i_buffer + i_max - 1 ) / i_max;
...@@ -897,7 +897,7 @@ int rtp_packetize_amr( sout_stream_id_t *id, block_t *in ) ...@@ -897,7 +897,7 @@ int rtp_packetize_amr( sout_stream_id_t *id, block_t *in )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
int rtp_packetize_t140( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_t140( sout_stream_id_t *id, block_t *in )
{ {
const size_t i_max = rtp_mtu (id); const size_t i_max = rtp_mtu (id);
const uint8_t *p_data = in->p_buffer; const uint8_t *p_data = in->p_buffer;
...@@ -943,7 +943,7 @@ int rtp_packetize_t140( sout_stream_id_t *id, block_t *in ) ...@@ -943,7 +943,7 @@ int rtp_packetize_t140( sout_stream_id_t *id, block_t *in )
} }
int rtp_packetize_spx( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_spx( sout_stream_id_t *id, block_t *in )
{ {
uint8_t *p_buffer = in->p_buffer; uint8_t *p_buffer = in->p_buffer;
int i_data_size, i_payload_size, i_payload_padding; int i_data_size, i_payload_size, i_payload_padding;
...@@ -1049,22 +1049,22 @@ static int rtp_packetize_g726( sout_stream_id_t *id, block_t *in, int i_pad ) ...@@ -1049,22 +1049,22 @@ static int rtp_packetize_g726( sout_stream_id_t *id, block_t *in, int i_pad )
return VLC_SUCCESS; return VLC_SUCCESS;
} }
int rtp_packetize_g726_16( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_g726_16( sout_stream_id_t *id, block_t *in )
{ {
return rtp_packetize_g726( id, in, 4 ); return rtp_packetize_g726( id, in, 4 );
} }
int rtp_packetize_g726_24( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_g726_24( sout_stream_id_t *id, block_t *in )
{ {
return rtp_packetize_g726( id, in, 8 ); return rtp_packetize_g726( id, in, 8 );
} }
int rtp_packetize_g726_32( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_g726_32( sout_stream_id_t *id, block_t *in )
{ {
return rtp_packetize_g726( id, in, 2 ); return rtp_packetize_g726( id, in, 2 );
} }
int rtp_packetize_g726_40( sout_stream_id_t *id, block_t *in ) static int rtp_packetize_g726_40( sout_stream_id_t *id, block_t *in )
{ {
return rtp_packetize_g726( id, in, 8 ); return rtp_packetize_g726( id, in, 8 );
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment