set bits_per_coded_sample according to new lavc api

[ffmpeg] / libavformat / rtp_internal.h

diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h
index 909a5bcd5cc64c5a98a76e1510cfc4591b47b0e1..fdfb8ff02f57be5a4225dbd9b2a63fee98d222f4 100644 (file)
--- a/libavformat/rtp_internal.h
+++ b/libavformat/rtp_internal.h
@@ -15,19 +15,47 @@
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
 // this is a bit of a misnomer, because rtp & rtsp internal structures and prototypes are in here.
-#ifndef RTP_INTERNAL_H
-#define RTP_INTERNAL_H
+#ifndef AVFORMAT_RTP_INTERNAL_H
+#define AVFORMAT_RTP_INTERNAL_H
 
+#include <stdint.h>
+#include "libavcodec/avcodec.h"
+#include "rtp.h"
+
+// these statistics are used for rtcp receiver reports...
+typedef struct {
+    uint16_t max_seq;           ///< highest sequence number seen
+    uint32_t cycles;            ///< shifted count of sequence number cycles
+    uint32_t base_seq;          ///< base sequence number
+    uint32_t bad_seq;           ///< last bad sequence number + 1
+    int probation;              ///< sequence packets till source is valid
+    int received;               ///< packets received
+    int expected_prior;         ///< packets expected in last interval
+    int received_prior;         ///< packets received in last interval
+    uint32_t transit;           ///< relative transit time for previous packet
+    uint32_t jitter;            ///< estimated jitter.
+} RTPStatistics;
+
+/**
+ * Packet parsing for "private" payloads in the RTP specs.
+ *
+ * @param s stream context
+ * @param pkt packet in which to write the parsed data
+ * @param timestamp pointer in which to write the timestamp of this RTP packet
+ * @param buf pointer to raw RTP packet data
+ * @param len length of buf
+ * @param flags flags from the RTP packet header (PKT_FLAG_*)
+ */
 typedef int (*DynamicPayloadPacketHandlerProc) (struct RTPDemuxContext * s,
                                                 AVPacket * pkt,
-                                                uint32_t timestamp,
+                                                uint32_t *timestamp,
                                                 const uint8_t * buf,
-                                                int len);
+                                                int len, int flags);
 
 typedef struct RTPDynamicProtocolHandler_s {
     // fields from AVRtpDynamicPayloadType_s
@@ -60,6 +88,11 @@ struct RTPDemuxContext {
     struct MpegTSContext *ts;   /* only used for MP2T payloads */
     int read_buf_index;
     int read_buf_size;
+    /* used to send back RTCP RR */
+    URLContext *rtp_ctx;
+    char hostname[256];
+
+    RTPStatistics statistics; ///< Statistics for this stream (used by RTCP receiver reports)
 
     /* rtcp sender statistics receive */
     int64_t last_rtcp_ntp_time;    // TODO: move into statistics
@@ -81,8 +114,19 @@ struct RTPDemuxContext {
     /* dynamic payload stuff */
     DynamicPayloadPacketHandlerProc parse_packet;     ///< This is also copied from the dynamic protocol handler structure
     void *dynamic_protocol_context;        ///< This is a copy from the values setup from the sdp parsing, in rtsp.c don't free me.
+    int max_frames_per_packet;
 };
 
 extern RTPDynamicProtocolHandler *RTPFirstDynamicPayloadHandler;
-#endif /* RTP_INTERNAL_H */
+void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler);
+
+int rtsp_next_attr_and_value(const char **p, char *attr, int attr_size, char *value, int value_size); ///< from rtsp.c, but used by rtp dynamic protocol handlers.
+
+void ff_rtp_send_data(AVFormatContext *s1, const uint8_t *buf1, int len, int m);
+const char *ff_rtp_enc_name(int payload_type);
+enum CodecID ff_rtp_codec_id(const char *buf, enum CodecType codec_type);
+
+void av_register_rtp_dynamic_payload_handlers(void);
+
+#endif /* AVFORMAT_RTP_INTERNAL_H */