Make rtp_write_header() fail in case of unsupported payload type

[ffmpeg] / libavformat / rdt.h

diff --git a/libavformat/rdt.h b/libavformat/rdt.h
index aa6cbaac3cd2bc39b2af1bc0942d3497fe123c98..1592c2f02d1e7190ab3a6c58a449f27dc6c7f67e 100644 (file)
--- a/libavformat/rdt.h
+++ b/libavformat/rdt.h
@@ -24,11 +24,22 @@
 
 #include <stdint.h>
 #include "avformat.h"
-#include "rtp.h"
+#include "rtpdec.h"
 
 typedef struct RDTDemuxContext RDTDemuxContext;
 
-RDTDemuxContext *ff_rdt_parse_open(AVFormatContext *ic, AVStream *st,
+/**
+ * Allocate and init the RDT parsing context.
+ * @param ic the containing RTSP demuxer context
+ * @param first_stream_of_set_idx index to the first AVStream in the RTSP
+ *              demuxer context's ic->streams array that is part of this
+ *              particular stream's set of streams (with identical content)
+ * @param priv_data private data of the payload data handler context
+ * @param handler pointer to the parse_packet() payload parsing function
+ * @return a newly allocated RDTDemuxContext. Free with ff_rdt_parse_close().
+ */
+RDTDemuxContext *ff_rdt_parse_open(AVFormatContext *ic,
+                                   int first_stream_of_set_idx,
                                    void *priv_data,
                                    RTPDynamicProtocolHandler *handler);
 void ff_rdt_parse_close(RDTDemuxContext *s);
@@ -63,23 +74,22 @@ void av_register_rdt_dynamic_payload_handlers(void);
  */
 void ff_rdt_subscribe_rule(char *cmd, int size,
                            int stream_nr, int rule_nr);
-// FIXME this will be removed ASAP
-void ff_rdt_subscribe_rule2(RDTDemuxContext *s, char *cmd, int size,
-                            int stream_nr, int rule_nr);
 
 /**
  * Parse RDT-style packet header.
  *
  * @param buf input buffer
  * @param len length of input buffer
- * @param sn will be set to the stream number this packet belongs to
- * @param seq will be set to the sequence number this packet belongs to
- * @param rn will be set to the rule number this packet belongs to
- * @param ts will be set to the timestamp of the packet
+ * @param set_id will be set to the set ID this packet belongs to
+ * @param seq_no will be set to the sequence number of the packet
+ * @param stream_id will be set to the stream ID this packet belongs to
+ * @param is_keyframe will be whether this packet belongs to a keyframe
+ * @param timestamp will be set to the timestamp of the packet
  * @return the amount of bytes consumed, or <0 on error
  */
 int ff_rdt_parse_header(const uint8_t *buf, int len,
-                        int *sn, int *seq, int *rn, uint32_t *ts);
+                        int *set_id, int *seq_no, int *stream_id,
+                        int *is_keyframe, uint32_t *timestamp);
 
 /**
  * Parse RDT-style packet data (header + media data).
@@ -88,4 +98,15 @@ int ff_rdt_parse_header(const uint8_t *buf, int len,
 int ff_rdt_parse_packet(RDTDemuxContext *s, AVPacket *pkt,
                         const uint8_t *buf, int len);
 
+/**
+ * Parse a server-related SDP line.
+ *
+ * @param s the RTSP AVFormatContext
+ * @param stream_index the index of the first stream in the set represented
+ *               by the SDP m= line (in s->streams)
+ * @param buf the SDP line
+ */
+void ff_real_parse_sdp_a_line(AVFormatContext *s, int stream_index,
+                              const char *buf);
+
 #endif /* AVFORMAT_RDT_H */