typedef struct rtsp_stream_t rtsp_stream_t;
typedef struct rtsp_stream_id_t rtsp_stream_id_t;
-rtsp_stream_t *RtspSetup( sout_stream_t *p_stream, const vlc_url_t *url );
+rtsp_stream_t *RtspSetup( vlc_object_t *owner, vod_media_t *media,
+ const char *path );
void RtspUnsetup( rtsp_stream_t *rtsp );
rtsp_stream_id_t *RtspAddId( rtsp_stream_t *rtsp, sout_stream_id_t *sid,
- uint32_t ssrc,
- const char *dst, int ttl,
- unsigned loport, unsigned hiport );
+ uint32_t ssrc, unsigned clock_rate,
+ int mcast_fd );
void RtspDelId( rtsp_stream_t *rtsp, rtsp_stream_id_t * );
char *RtspAppendTrackPath( rtsp_stream_id_t *id, const char *base );
-char *SDPGenerate( const sout_stream_t *p_stream, const char *rtsp_url );
+int RtspTrackAttach( rtsp_stream_t *rtsp, const char *name,
+ rtsp_stream_id_t *id, sout_stream_id_t *sout_id,
+ uint32_t *ssrc, uint16_t *seq_init );
+void RtspTrackDetach( rtsp_stream_t *rtsp, const char *name,
+ sout_stream_id_t *sout_id);
-uint32_t rtp_compute_ts( const sout_stream_id_t *id, int64_t i_pts );
+char *SDPGenerate( sout_stream_t *p_stream, const char *rtsp_url );
+char *SDPGenerateVoD( const vod_media_t *p_media, const char *rtsp_url );
+
+uint32_t rtp_compute_ts( unsigned i_clock_rate, 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( sout_stream_id_t *id );
-int64_t rtp_get_ts( const sout_stream_t *p_stream );
+int64_t rtp_get_ts( const sout_stream_t *p_stream, const sout_stream_id_t *id,
+ const vod_media_t *p_media, const char *psz_vod_session,
+ int64_t *p_npt );
/* RTP packetization */
void rtp_packetize_common (sout_stream_id_t *id, block_t *out,
void rtp_packetize_send (sout_stream_id_t *id, block_t *out);
size_t rtp_mtu (const sout_stream_id_t *id);
-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 *);
+int rtp_packetize_xiph_config( sout_stream_id_t *id, const char *fmtp,
+ int64_t i_pts );
/* RTCP */
typedef struct rtcp_sender_t rtcp_sender_t;
bool mux);
void CloseRTCP (rtcp_sender_t *rtcp);
void SendRTCP (rtcp_sender_t *restrict rtcp, const block_t *rtp);
+
+typedef int (*pf_rtp_packetizer_t)( sout_stream_id_t *, block_t * );
+
+typedef struct rtp_format_t
+{
+ /* Used for SDP and packetization */
+ uint8_t payload_type;
+ unsigned clock_rate;
+ unsigned channels;
+ int cat;
+ /* Used in SDP only */
+ unsigned bitrate;
+ const char *ptname;
+ char *fmtp;
+ /* Used for packetization only */
+ pf_rtp_packetizer_t pf_packetize;
+} rtp_format_t;
+
+int rtp_get_fmt( vlc_object_t *obj, es_format_t *p_fmt, const char *mux,
+ rtp_format_t *p_rtp_fmt );
+
+/* VoD */
+int OpenVoD ( vlc_object_t * );
+void CloseVoD( vlc_object_t * );
+
+int vod_check_range(vod_media_t *p_media, const char *psz_session,
+ int64_t start, int64_t end);
+void vod_play(vod_media_t *p_media, const char *psz_session,
+ int64_t *start, int64_t end);
+void vod_pause(vod_media_t *p_media, const char *psz_session, int64_t *npt);
+void vod_stop(vod_media_t *p_media, const char *psz_session);
+
+const char *vod_get_mux(const vod_media_t *p_media);
+int vod_init_id(vod_media_t *p_media, const char *psz_session, int es_id,
+ sout_stream_id_t *sout_id, rtp_format_t *rtp_fmt,
+ uint32_t *ssrc, uint16_t *seq_init);
+void vod_detach_id(vod_media_t *p_media, const char *psz_session,
+ sout_stream_id_t *sout_id);
+