From 0de9380be54e9ccf49631a93f49cff8b8329ec54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st>
Date: Wed, 17 Oct 2012 01:45:39 +0300
Subject: [PATCH] rtp: Update the check for distinguishing between RTP and RTCP
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Also add enums for more RTCP packet types, according to the IANA
list of registered types.
Signed-off-by: Martin Storsjö <martin@martin.st>
---
libavformat/rtp.h | 15 +++++++++++++--
1 file changed, 13 insertions(+), 2 deletions(-)
diff --git a/libavformat/rtp.h b/libavformat/rtp.h
index b01caebb321..6df4ed4f19e 100644
--- a/libavformat/rtp.h
+++ b/libavformat/rtp.h
@@ -84,13 +84,24 @@ enum AVCodecID ff_rtp_codec_id(const char *buf, enum AVMediaType codec_type);
/* RTCP packet types */
enum RTCPType {
+ RTCP_FIR = 192,
+ RTCP_NACK, // 193
+ RTCP_SMPTETC,// 194
+ RTCP_IJ, // 195
RTCP_SR = 200,
RTCP_RR, // 201
RTCP_SDES, // 202
RTCP_BYE, // 203
- RTCP_APP // 204
+ RTCP_APP, // 204
+ RTCP_RTPFB,// 205
+ RTCP_PSFB, // 206
+ RTCP_XR, // 207
+ RTCP_AVB, // 208
+ RTCP_RSI, // 209
+ RTCP_TOKEN,// 210
};
-#define RTP_PT_IS_RTCP(x) ((x) >= RTCP_SR && (x) <= RTCP_APP)
+#define RTP_PT_IS_RTCP(x) (((x) >= RTCP_FIR && (x) <= RTCP_IJ) || \
+ ((x) >= RTCP_SR && (x) <= RTCP_TOKEN))
#endif /* AVFORMAT_RTP_H */
--
GitLab