X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fstream_out%2Frtp.h;h=01e7288ece697dcef4a0641609109fe489ed65b8;hb=86205b1ee926a25d788a31c3d92f9114009193db;hp=3cddd59a149717156c6de15fcbbe7e3c4ad4fd45;hpb=df61d33b06e2b3cbbe746b2f5a9bea5b370c24ff;p=vlc

diff --git a/modules/stream_out/rtp.h b/modules/stream_out/rtp.h
index 3cddd59a14..01e7288ece 100644
--- a/modules/stream_out/rtp.h
+++ b/modules/stream_out/rtp.h
@@ -29,38 +29,43 @@ rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url );
 void RtspUnsetup( rtsp_stream_t *rtsp );
 
 rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
-                             unsigned i, uint32_t ssrc,
+                             uint32_t ssrc,
                              const char *dst, int ttl,
                              unsigned loport, unsigned hiport );
 void RtspDelId( rtsp_stream_t *rtsp, rtsp_stream_id_t * );
 
-char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url );
+char *RtspAppendTrackPath( rtsp_stream_id_t *id, const char *base );
 
-int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux );
+char *SDPGenerate( sout_stream_t *p_stream, const char *rtsp_url );
+
+uint32_t rtp_compute_ts( const sout_stream_id_t *id, int64_t i_pts );
+int rtp_add_sink( sout_stream_id_t *id, int fd, bool rtcp_mux, uint16_t *seq );
 void rtp_del_sink( sout_stream_id_t *id, int fd );
-uint16_t rtp_get_seq( const sout_stream_id_t *id );
-unsigned rtp_get_num( const sout_stream_id_t *id );
+uint16_t rtp_get_seq( sout_stream_id_t *id );
+int64_t rtp_get_ts( const sout_stream_t *p_stream );
 
 /* RTP packetization */
 void rtp_packetize_common (sout_stream_id_t *id, block_t *out,
                            int b_marker, int64_t i_pts);
 void rtp_packetize_send (sout_stream_id_t *id, block_t *out);
 size_t rtp_mtu (const sout_stream_id_t *id);
-size_t rtp_plen (const sout_stream_id_t * id, unsigned ptime);
 
-int rtp_packetize_l16  (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_l8   (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_mpa  (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_mpv  (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_ac3  (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_split(sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_mp4a (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_mp4a_latm (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_h263 (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_h264 (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_amr  (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_spx  (sout_stream_t *, sout_stream_id_t *, block_t *);
-int rtp_packetize_t140 (sout_stream_t *, sout_stream_id_t *, block_t *);
+int rtp_packetize_mpa  (sout_stream_id_t *, block_t *);
+int rtp_packetize_mpv  (sout_stream_id_t *, block_t *);
+int rtp_packetize_ac3  (sout_stream_id_t *, block_t *);
+int rtp_packetize_split(sout_stream_id_t *, block_t *);
+int rtp_packetize_swab (sout_stream_id_t *, block_t *);
+int rtp_packetize_mp4a (sout_stream_id_t *, block_t *);
+int rtp_packetize_mp4a_latm (sout_stream_id_t *, block_t *);
+int rtp_packetize_h263 (sout_stream_id_t *, block_t *);
+int rtp_packetize_h264 (sout_stream_id_t *, block_t *);
+int rtp_packetize_amr  (sout_stream_id_t *, block_t *);
+int rtp_packetize_spx  (sout_stream_id_t *, block_t *);
+int rtp_packetize_t140 (sout_stream_id_t *, block_t *);
+int rtp_packetize_g726_16 (sout_stream_id_t *, block_t *);
+int rtp_packetize_g726_24 (sout_stream_id_t *, block_t *);
+int rtp_packetize_g726_32 (sout_stream_id_t *, block_t *);
+int rtp_packetize_g726_40 (sout_stream_id_t *, block_t *);
 
 /* RTCP */
 typedef struct rtcp_sender_t rtcp_sender_t;