diff options
| -rw-r--r-- | libavformat/allformats.c | 2 | ||||
| -rw-r--r-- | libavformat/rdt.c | 2 | ||||
| -rw-r--r-- | libavformat/rtp.c | 2 | ||||
| -rw-r--r-- | libavformat/rtp.h | 105 | ||||
| -rw-r--r-- | libavformat/rtp_aac.c | 2 | ||||
| -rw-r--r-- | libavformat/rtp_h264.c | 2 | ||||
| -rw-r--r-- | libavformat/rtp_h264.h | 2 | ||||
| -rw-r--r-- | libavformat/rtp_internal.h | 135 | ||||
| -rw-r--r-- | libavformat/rtp_mpv.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpdec.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpenc.c | 2 | ||||
| -rw-r--r-- | libavformat/rtsp.c | 2 |
12 files changed, 115 insertions, 145 deletions
diff --git a/libavformat/allformats.c b/libavformat/allformats.c index a30693020b..a8183c2fbd 100644 --- a/libavformat/allformats.c +++ b/libavformat/allformats.c @@ -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) { \ diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 1b93662239..b7e0fa5222 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -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" diff --git a/libavformat/rtp.c b/libavformat/rtp.c index be70629681..d284f638df 100644 --- a/libavformat/rtp.c +++ b/libavformat/rtp.c @@ -25,7 +25,7 @@ #include <unistd.h> #include "network.h" -#include "rtp_internal.h" +#include "rtp.h" //#define DEBUG diff --git a/libavformat/rtp.h b/libavformat/rtp.h index 08114c8cc5..98c2dc7b49 100644 --- a/libavformat/rtp.h +++ b/libavformat/rtp.h @@ -1,6 +1,7 @@ /* * RTP definitions * Copyright (c) 2002 Fabrice Bellard + * Copyright (c) 2006 Ryan Martell <rdm4@martellventures.com> * * This file is part of FFmpeg. * @@ -89,4 +90,108 @@ int rtp_check_and_send_back_rr(RTPDemuxContext *s, int count); #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 */ diff --git a/libavformat/rtp_aac.c b/libavformat/rtp_aac.c index 4cd8e129d2..e54ff3fca0 100644 --- a/libavformat/rtp_aac.c +++ b/libavformat/rtp_aac.c @@ -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) diff --git a/libavformat/rtp_h264.c b/libavformat/rtp_h264.c index 470a546604..4999e0e693 100644 --- a/libavformat/rtp_h264.c +++ b/libavformat/rtp_h264.c @@ -46,7 +46,7 @@ #include "network.h" #include <assert.h> -#include "rtp_internal.h" +#include "rtp.h" #include "rtp_h264.h" /** diff --git a/libavformat/rtp_h264.h b/libavformat/rtp_h264.h index 79e08f02ee..94eac47aea 100644 --- a/libavformat/rtp_h264.h +++ b/libavformat/rtp_h264.h @@ -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); diff --git a/libavformat/rtp_internal.h b/libavformat/rtp_internal.h deleted file mode 100644 index 6b7588f10b..0000000000 --- a/libavformat/rtp_internal.h +++ /dev/null @@ -1,135 +0,0 @@ -/* - * RTP definitions - * Copyright (c) 2006 Ryan Martell <rdm4@martellventures.com> - * - * This file is part of FFmpeg. - * - * FFmpeg is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License as published by the Free Software Foundation; either - * version 2.1 of the License, or (at your option) any later version. - * - * FFmpeg is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * 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 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 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_INTERNAL_H */ - diff --git a/libavformat/rtp_mpv.c b/libavformat/rtp_mpv.c index c6a46c802e..2221dd2489 100644 --- a/libavformat/rtp_mpv.c +++ b/libavformat/rtp_mpv.c @@ -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. */ diff --git a/libavformat/rtpdec.c b/libavformat/rtpdec.c index ebe1b45221..f59484e644 100644 --- a/libavformat/rtpdec.c +++ b/libavformat/rtpdec.c @@ -29,7 +29,7 @@ #include <unistd.h> #include "network.h" -#include "rtp_internal.h" +#include "rtp.h" #include "rtp_h264.h" //#define DEBUG diff --git a/libavformat/rtpenc.c b/libavformat/rtpenc.c index 0ef363c2ad..389e3c7fa6 100644 --- a/libavformat/rtpenc.c +++ b/libavformat/rtpenc.c @@ -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" diff --git a/libavformat/rtsp.c b/libavformat/rtsp.c index d6f87f7269..1db4a7feb2 100644 --- a/libavformat/rtsp.c +++ b/libavformat/rtsp.c @@ -34,7 +34,7 @@ #include "network.h" #include "rtsp.h" -#include "rtp_internal.h" +#include "rtp.h" #include "rdt.h" //#define DEBUG |