[svn-commits] oej: branch oej/chocolate-video-congestion-11 r433319 - in /team/oej/chocolat...

[SVN commits to the Digium repositories]

Author: oej
Date: Tue Mar 24 03:55:53 2015
New Revision: 433319

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=433319
Log:
Adding setting to enable Google REMB support

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/channels/sip/include/sip.h

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=433319&r1=433318&r2=433319
==============================================================================
--- team/oej/chocolate-video-congestion-11/README.chocolate (original)
+++ team/oej/chocolate-video-congestion-11/README.chocolate Tue Mar 24 03:55:53 2015
@@ -25,6 +25,7 @@
   - ENUMs for feedback messages
 * Add SDP parameters for rtcp-fb
 * Add sip.conf options for rtcp-fb enabling
+* Add test command (CLI or something) to force sending backoff
 * Send feedback based on RTCP
 * Forward incoming feedback across bridge and send out on other side
   for optimal video pass through

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=433319&r1=433318&r2=433319
==============================================================================
--- team/oej/chocolate-video-congestion-11/channels/chan_sip.c (original)
+++ team/oej/chocolate-video-congestion-11/channels/chan_sip.c Tue Mar 24 03:55:53 2015
@@ -20153,6 +20153,7 @@
 		ast_cli(fd, "  Send RPID    : %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[0], SIP_SENDRPID)));
 		ast_cli(fd, "  TrustIDOutbnd: %s\n", trust_id_outbound2str(ast_test_flag(&peer->flags[1], SIP_PAGE2_TRUST_ID_OUTBOUND)));
 		ast_cli(fd, "  Subscriptions: %s\n", AST_CLI_YESNO(ast_test_flag(&peer->flags[1], SIP_PAGE2_ALLOWSUBSCRIBE)));
+		ast_cli(fd, "  REMB Support : %s\n", (ast_test_flag(&peer->flags[2], SIP_PAGE3_REMB_ANSWER) && ast_test_flag(&peer->flags[2], SIP_PAGE3_REMB_OFFER)) ? "offer & answer" : (ast_test_flag(&peer->flags[2], SIP_PAGE3_REMB_ANSWER) ? "answer" : "none" ));
 		ast_cli(fd, "  Overlap dial : %s\n", allowoverlap2str(ast_test_flag(&peer->flags[1], SIP_PAGE2_ALLOWOVERLAP)));
 		if (peer->outboundproxy)
 			ast_cli(fd, "  Outb. proxy  : %s %s\n", ast_strlen_zero(peer->outboundproxy->name) ? "<not set>" : peer->outboundproxy->name,
@@ -20747,6 +20748,7 @@
 	ast_cli(a->fd, "  Match Auth Username:    %s\n", AST_CLI_YESNO(global_match_auth_username));
 	ast_cli(a->fd, "  Allow unknown access:   %s\n", AST_CLI_YESNO(sip_cfg.allowguest));
 	ast_cli(a->fd, "  Allow subscriptions:    %s\n", AST_CLI_YESNO(ast_test_flag(&global_flags[1], SIP_PAGE2_ALLOWSUBSCRIBE)));
+	ast_cli(a-<fd, "  REMB Support:            %s\n", (ast_test_flag(&global_flags[2], SIP_PAGE3_REMB_ANSWER) && ast_test_flag(&global_flags[2], SIP_PAGE3_REMB_OFFER)) ? "offer & answer" : (ast_test_flag(&global_flags[2], SIP_PAGE3_REMB_ANSWER) ? "answer" : "none" ));
 	ast_cli(a->fd, "  Allow overlap dialing:  %s\n", allowoverlap2str(ast_test_flag(&global_flags[1], SIP_PAGE2_ALLOWOVERLAP)));
 	ast_cli(a->fd, "  Allow promisc. redir:   %s\n", AST_CLI_YESNO(ast_test_flag(&global_flags[0], SIP_PROMISCREDIR)));
 	ast_cli(a->fd, "  Enable call counters:   %s\n", AST_CLI_YESNO(global_callcounter));
@@ -30373,6 +30375,14 @@
 	} else if (!strcasecmp(v->name, "buggymwi")) {
 		ast_set_flag(&mask[1], SIP_PAGE2_BUGGY_MWI);
 		ast_set2_flag(&flags[1], ast_true(v->value), SIP_PAGE2_BUGGY_MWI);
+	} else if (!strcasecmp(v->name, "googleremb")) {
+		ast_set_flag(&mask[2], SIP_PAGE3_REMB_ANSWER | SIP_PAGE3_REMB_OFFER);
+		ast_clear_flag(&flags[2], SIP_PAGE3_REMB_ANSWER | SIP_PAGE3_REMB_OFFER);
+		if (!strcasecmp(v->value, "offeranswer")){
+			ast_set_flag(&flags[2], SIP_PAGE3_REMB_ANSWER | SIP_PAGE3_REMB_OFFER);
+		} else if (!strcasecmp(v->value, "answeronly")){
+			ast_set_flag(&flags[2], SIP_PAGE3_REMB_ANSWER);
+		}
 	} else
 		res = 0;
 

Modified: team/oej/chocolate-video-congestion-11/channels/sip/include/sip.h
URL: http://svnview.digium.com/svn/asterisk/team/oej/chocolate-video-congestion-11/channels/sip/include/sip.h?view=diff&rev=433319&r1=433318&r2=433319
==============================================================================
--- team/oej/chocolate-video-congestion-11/channels/sip/include/sip.h (original)
+++ team/oej/chocolate-video-congestion-11/channels/sip/include/sip.h Tue Mar 24 03:55:53 2015
@@ -381,9 +381,13 @@
 #define SIP_PAGE3_ICE_SUPPORT            (1 << 6)  /*!< DGP: Enable ICE support */
 #define SIP_PAGE3_FORCE_AVP              (1 << 7)  /*!< DGP: Force 'RTP/AVP' for all streams, even DTLS */
 
+#define SIP_PAGE3_REMB_ANSWER		 (1 << 15)	/*!< DGP: Answer video streams with Google REMB */
+#define SIP_PAGE3_REMB_OFFER		 (1 << 16)	/*!< DGP: Offer Google REMB with video streams */
+
 #define SIP_PAGE3_FLAGS_TO_COPY \
 	(SIP_PAGE3_SNOM_AOC | SIP_PAGE3_SRTP_TAG_32 | SIP_PAGE3_NAT_AUTO_RPORT | SIP_PAGE3_NAT_AUTO_COMEDIA | \
-	 SIP_PAGE3_DIRECT_MEDIA_OUTGOING | SIP_PAGE3_USE_AVPF | SIP_PAGE3_ICE_SUPPORT | SIP_PAGE3_FORCE_AVP)
+	 SIP_PAGE3_DIRECT_MEDIA_OUTGOING | SIP_PAGE3_USE_AVPF | SIP_PAGE3_ICE_SUPPORT | SIP_PAGE3_FORCE_AVP | \
+	SIP_PAGE3_REMB_ANSWER | SIP_PAGE3_REMB_OFFER)
 
 #define CHECK_AUTH_BUF_INITLEN   256