Author: oej
Date: Wed Feb 11 08:42:47 2015
New Revision: 431660
URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=431660
Log:
Parsing SDP is fun.
Modified:
team/oej/chocolate-video-congestion-11/README.chocolate
team/oej/chocolate-video-congestion-11/channels/chan_sip.c
team/oej/chocolate-video-congestion-11/res/res_rtp_asterisk.c
Modified: team/oej/chocolate-video-congestion-11/README.chocolate
URL:
http://svnview.digium.com/svn/asterisk/team/oej/chocolate-video-congestion-11/README.chocolate?view=diff&rev=431660&r1=431659&r2=431660
==============================================================================
--- team/oej/chocolate-video-congestion-11/README.chocolate (original)
+++ team/oej/chocolate-video-congestion-11/README.chocolate Wed Feb 11 08:42:47
2015
@@ -48,3 +48,10 @@
a=rtcp-fb:100 nack pli
a=rtcp-fb:100 goog-remb
+Mozilla nightly:
+
+ a=rtcp-fb:120 nack
+ a=rtcp-fb:120 nack pli
+ a=rtcp-fb:120 ccm fir
+
+No "goog-remb" support
Modified: team/oej/chocolate-video-congestion-11/channels/chan_sip.c
URL:
http://svnview.digium.com/svn/asterisk/team/oej/chocolate-video-congestion-11/channels/chan_sip.c?view=diff&rev=431660&r1=431659&r2=431660
==============================================================================
--- team/oej/chocolate-video-congestion-11/channels/chan_sip.c (original)
+++ team/oej/chocolate-video-congestion-11/channels/chan_sip.c Wed Feb 11
08:42:47 2015
@@ -11058,6 +11058,7 @@
unsigned int sample_rate;
int debug = sip_debug_test_pvt(p);
char fmtp_string[256];
+ char rtcpfb_string[256];
if (sscanf(a, "rtpmap: %30u %127[^/]/%30u", &codec, mimeSubtype,
&sample_rate) == 3) {
/* We have a rtpmap to handle */
@@ -11090,6 +11091,30 @@
ast_rtp_codecs_payloads_unset(newvideortp,
NULL, codec);
}
}
+ } else if (sscanf(a, "rctp-fb: %3u %255[^\t\n]", &codec, rtcfb_string)
== 2) {
+ /* AVPF RTCP feedback. We need to check if we really have
AVPF, if not ignore these options.
+ Examples:
+ a=rtcp-fb:100 ccm fir
+ a=rtcp-fb:100 nack
+ a=rtcp-fb:100 nack pli
+ a=rtcp-fb:100 goog-remb
+
+ First level choices (RFC 4585, IANA SDP parameters)
+ ack
+ nack
+ trr-int
+ app
+ ccm (RFC 5104)
+
+ Nack can have one of the the following parameters
+ sli, pli, rpsi, app, rai, tllei, pslei, ecn
+
+ Ack can have the following parameters
+ rpsi, app
+ */
+ ast_debug(2, " Got RTCP-FB parameter for codec %d : %s \n",
codec, rtcfb_string);
+ /* Do something clever with this information */
+ /* FInd out if there's a parameter */
}
return found;
Modified: team/oej/chocolate-video-congestion-11/res/res_rtp_asterisk.c
URL:
http://svnview.digium.com/svn/asterisk/team/oej/chocolate-video-congestion-11/res/res_rtp_asterisk.c?view=diff&rev=431660&r1=431659&r2=431660
==============================================================================
--- team/oej/chocolate-video-congestion-11/res/res_rtp_asterisk.c (original)
+++ team/oej/chocolate-video-congestion-11/res/res_rtp_asterisk.c Wed Feb 11
08:42:47 2015
@@ -91,7 +91,7 @@
#define RTCP_PT_FUR 192 /*!< FIR - Full Intra-frame request
(h.261) */
#define RTCP_PT_NACK 193 /*!< NACK - Negative acknowledgement
(h.261) */
-#defien RTCP_SMPTETC 194 /*!> SMTPETC - time code mapping RFC
5484 */
+#define RTCP_SMPTETC 194 /*!> SMTPETC - time code mapping RFC
5484 */
#define RTCP_PT_IJ 195 /*!< IJ - RFC 5450 Extended
Inter-arrival jitter report */
#define RTCP_PT_SR 200 /*!< SR - RFC 3550 Sender report */
#define RTCP_PT_RR 201 /*!< RR - RFC 3550 Receiver report */
--
_____________________________________________________________________
-- Bandwidth and Colocation Provided by http://www.api-digital.com --
svn-commits mailing list
To UNSUBSCRIBE or update options visit:
http://lists.digium.com/mailman/listinfo/svn-commits
