[FFmpeg-cvslog] r16817 - in trunk/libavformat: allformats.c rdt.c rtp.c rtp.h rtp_aac.c rtp_h264.c rtp_h264.h rtp_internal.h rtp_mpv.c rtpdec.c rtpenc.c rtsp.c
lucabe
subversion
Tue Jan 27 13:23:16 CET 2009
Author: lucabe
Date: Tue Jan 27 13:23:16 2009
New Revision: 16817
Log:
Merge rtp_internal.h in rtp.h, and remove rtp_internal.h
Deleted:
trunk/libavformat/rtp_internal.h
Modified:
trunk/libavformat/allformats.c
trunk/libavformat/rdt.c
trunk/libavformat/rtp.c
trunk/libavformat/rtp.h
trunk/libavformat/rtp_aac.c
trunk/libavformat/rtp_h264.c
trunk/libavformat/rtp_h264.h
trunk/libavformat/rtp_mpv.c
trunk/libavformat/rtpdec.c
trunk/libavformat/rtpenc.c
trunk/libavformat/rtsp.c
Modified: trunk/libavformat/allformats.c
==============================================================================
--- trunk/libavformat/allformats.c Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/allformats.c Tue Jan 27 13:23:16 2009 (r16817)
@@ -19,7 +19,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
#include "avformat.h"
-#include "rtp_internal.h"
+#include "rtp.h"
#include "rdt.h"
#define REGISTER_MUXER(X,x) { \
Modified: trunk/libavformat/rdt.c
==============================================================================
--- trunk/libavformat/rdt.c Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/rdt.c Tue Jan 27 13:23:16 2009 (r16817)
@@ -27,7 +27,7 @@
#include "avformat.h"
#include "libavutil/avstring.h"
-#include "rtp_internal.h"
+#include "rtp.h"
#include "rdt.h"
#include "libavutil/base64.h"
#include "libavutil/md5.h"
Modified: trunk/libavformat/rtp.c
==============================================================================
--- trunk/libavformat/rtp.c Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/rtp.c Tue Jan 27 13:23:16 2009 (r16817)
@@ -25,7 +25,7 @@
#include <unistd.h>
#include "network.h"
-#include "rtp_internal.h"
+#include "rtp.h"
//#define DEBUG
Modified: trunk/libavformat/rtp.h
==============================================================================
--- trunk/libavformat/rtp.h Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/rtp.h Tue Jan 27 13:23:16 2009 (r16817)
@@ -1,6 +1,7 @@
/*
* RTP definitions
* Copyright (c) 2002 Fabrice Bellard
+ * Copyright (c) 2006 Ryan Martell <rdm4 at martellventures.com>
*
* This file is part of FFmpeg.
*
@@ -89,4 +90,108 @@ int rtp_check_and_send_back_rr(RTPDemuxC
#define RTCP_TX_RATIO_NUM 5
#define RTCP_TX_RATIO_DEN 1000
+// 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 st stream that this packet belongs to
+ * @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) (PayloadContext *s,
+ AVStream *st,
+ AVPacket * pkt,
+ uint32_t *timestamp,
+ const uint8_t * buf,
+ int len, int flags);
+
+struct RTPDynamicProtocolHandler_s {
+ // fields from AVRtpDynamicPayloadType_s
+ const char enc_name[50]; /* XXX: still why 50 ? ;-) */
+ enum CodecType codec_type;
+ enum CodecID codec_id;
+
+ // may be null
+ int (*parse_sdp_a_line) (AVFormatContext *s,
+ int st_index,
+ PayloadContext *priv_data,
+ const char *line); ///< Parse the a= line from the sdp field
+ PayloadContext *(*open) (); ///< allocate any data needed by the rtp parsing for this dynamic data.
+ void (*close)(PayloadContext *protocol_data); ///< free any data needed by the rtp parsing for this dynamic data.
+ DynamicPayloadPacketHandlerProc parse_packet; ///< parse handler for this dynamic packet.
+
+ struct RTPDynamicProtocolHandler_s *next;
+};
+
+// moved out of rtp.c, because the h264 decoder needs to know about this structure..
+struct RTPDemuxContext {
+ AVFormatContext *ic;
+ AVStream *st;
+ int payload_type;
+ uint32_t ssrc;
+ uint16_t seq;
+ uint32_t timestamp;
+ uint32_t base_timestamp;
+ uint32_t cur_timestamp;
+ int max_payload_size;
+ 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
+ int64_t first_rtcp_ntp_time; // TODO: move into statistics
+ uint32_t last_rtcp_timestamp; // TODO: move into statistics
+
+ /* rtcp sender statistics */
+ unsigned int packet_count; // TODO: move into statistics (outgoing)
+ unsigned int octet_count; // TODO: move into statistics (outgoing)
+ unsigned int last_octet_count; // TODO: move into statistics (outgoing)
+ int first_packet;
+ /* buffer for output */
+ uint8_t buf[RTP_MAX_PACKET_LENGTH];
+ uint8_t *buf_ptr;
+
+ /* special infos for au headers parsing */
+ RTPPayloadData *rtp_payload_data; // TODO: Move into dynamic payload handlers
+
+ /* dynamic payload stuff */
+ DynamicPayloadPacketHandlerProc parse_packet; ///< This is also copied from the dynamic protocol handler structure
+ PayloadContext *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;
+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_H */
Modified: trunk/libavformat/rtp_aac.c
==============================================================================
--- trunk/libavformat/rtp_aac.c Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/rtp_aac.c Tue Jan 27 13:23:16 2009 (r16817)
@@ -20,7 +20,7 @@
#include "avformat.h"
#include "rtp_aac.h"
-#include "rtp_internal.h"
+#include "rtp.h"
#define MAX_FRAMES_PER_PACKET (s->max_frames_per_packet ? s->max_frames_per_packet : 5)
#define MAX_AU_HEADERS_SIZE (2 + 2 * MAX_FRAMES_PER_PACKET)
Modified: trunk/libavformat/rtp_h264.c
==============================================================================
--- trunk/libavformat/rtp_h264.c Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/rtp_h264.c Tue Jan 27 13:23:16 2009 (r16817)
@@ -46,7 +46,7 @@
#include "network.h"
#include <assert.h>
-#include "rtp_internal.h"
+#include "rtp.h"
#include "rtp_h264.h"
/**
Modified: trunk/libavformat/rtp_h264.h
==============================================================================
--- trunk/libavformat/rtp_h264.h Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/rtp_h264.h Tue Jan 27 13:23:16 2009 (r16817)
@@ -22,7 +22,7 @@
#ifndef AVFORMAT_RTP_H264_H
#define AVFORMAT_RTP_H264_H
-#include "rtp_internal.h"
+#include "rtp.h"
extern RTPDynamicProtocolHandler ff_h264_dynamic_handler;
void ff_rtp_send_h264(AVFormatContext *s1, const uint8_t *buf1, int size);
Modified: trunk/libavformat/rtp_mpv.c
==============================================================================
--- trunk/libavformat/rtp_mpv.c Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/rtp_mpv.c Tue Jan 27 13:23:16 2009 (r16817)
@@ -22,7 +22,7 @@
#include "libavcodec/mpegvideo.h"
#include "avformat.h"
-#include "rtp_internal.h"
+#include "rtp.h"
/* NOTE: a single frame must be passed with sequence header if
needed. XXX: use slices. */
Modified: trunk/libavformat/rtpdec.c
==============================================================================
--- trunk/libavformat/rtpdec.c Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/rtpdec.c Tue Jan 27 13:23:16 2009 (r16817)
@@ -29,7 +29,7 @@
#include <unistd.h>
#include "network.h"
-#include "rtp_internal.h"
+#include "rtp.h"
#include "rtp_h264.h"
//#define DEBUG
Modified: trunk/libavformat/rtpenc.c
==============================================================================
--- trunk/libavformat/rtpenc.c Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/rtpenc.c Tue Jan 27 13:23:16 2009 (r16817)
@@ -26,7 +26,7 @@
#include <unistd.h>
#include "network.h"
-#include "rtp_internal.h"
+#include "rtp.h"
#include "rtp_mpv.h"
#include "rtp_aac.h"
#include "rtp_h264.h"
Modified: trunk/libavformat/rtsp.c
==============================================================================
--- trunk/libavformat/rtsp.c Tue Jan 27 07:04:01 2009 (r16816)
+++ trunk/libavformat/rtsp.c Tue Jan 27 13:23:16 2009 (r16817)
@@ -34,7 +34,7 @@
#include "network.h"
#include "rtsp.h"
-#include "rtp_internal.h"
+#include "rtp.h"
#include "rdt.h"
//#define DEBUG
More information about the ffmpeg-cvslog
mailing list