---
libavformat/rtpdec.h | 22 ++++++++++------------
libavformat/rtpenc.h | 10 +++++-----
2 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/libavformat/rtpdec.h b/libavformat/rtpdec.h
index 4a920a9..415b77d 100644
--- a/libavformat/rtpdec.h
+++ b/libavformat/rtpdec.h
@@ -31,7 +31,7 @@ typedef struct PayloadContext PayloadContext;
typedef struct RTPDynamicProtocolHandler_s RTPDynamicProtocolHandler;
#define RTP_MIN_PACKET_LENGTH 12
-#define RTP_MAX_PACKET_LENGTH 1500 /* XXX: suppress this define */
+#define RTP_MAX_PACKET_LENGTH 1500
#define RTP_REORDER_QUEUE_DEFAULT_SIZE 10
@@ -109,8 +109,7 @@ typedef int (*DynamicPayloadPacketHandlerProc)
(AVFormatContext *ctx,
int len, int flags);
struct RTPDynamicProtocolHandler_s {
- // fields from AVRtpDynamicPayloadType_s
- const char enc_name[50]; /* XXX: still why 50 ? ;-) */
+ const char enc_name[50];
enum AVMediaType codec_type;
enum AVCodecID codec_id;
int static_payload_id; /* 0 means no payload id is set. 0 is a valid
@@ -138,7 +137,6 @@ typedef struct RTPPacket {
struct RTPPacket *next;
} RTPPacket;
-// moved out of rtp.c, because the h264 decoder needs to know about this
structure..
struct RTPDemuxContext {
AVFormatContext *ic;
AVStream *st;
@@ -168,21 +166,21 @@ struct RTPDemuxContext {
/*@}*/
/* 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
+ int64_t last_rtcp_ntp_time;
+ int64_t first_rtcp_ntp_time;
+ uint32_t last_rtcp_timestamp;
int64_t rtcp_ts_offset;
/* 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)
+ unsigned int packet_count;
+ unsigned int octet_count;
+ unsigned int last_octet_count;
/* buffer for partially parsed packets */
uint8_t buf[RTP_MAX_PACKET_LENGTH];
/* 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.
+ DynamicPayloadPacketHandlerProc parse_packet;
+ PayloadContext *dynamic_protocol_context;
};
void ff_register_dynamic_payload_handler(RTPDynamicProtocolHandler *handler);
diff --git a/libavformat/rtpenc.h b/libavformat/rtpenc.h
index 5351b45..369b413 100644
--- a/libavformat/rtpenc.h
+++ b/libavformat/rtpenc.h
@@ -38,13 +38,13 @@ struct RTPMuxContext {
int num_frames;
/* rtcp sender statistics receive */
- int64_t last_rtcp_ntp_time; // TODO: move into statistics
- int64_t first_rtcp_ntp_time; // TODO: move into statistics
+ int64_t last_rtcp_ntp_time;
+ int64_t first_rtcp_ntp_time;
/* 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)
+ unsigned int packet_count;
+ unsigned int octet_count;
+ unsigned int last_octet_count;
int first_packet;
/* buffer for output */
uint8_t *buf;
--
1.7.9.4
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
