commit 5f0b83b7fb6de95f33f20656e969e0280d72c315
author Taylor Brandstetter <deadbeef@webrtc.org> Fri Mar 18 22:02:07 2016
committer Taylor Brandstetter <deadbeef@webrtc.org> Fri Mar 18 22:02:13 2016
tree ee545b54eb50fdeba78e5136eb2b733a4b149ab6
parent 1300caa3fea840572614772f96755ce7f4080ef6

Enabling rtcp-rsize negotiation and fixing some issues with it.

Sending of reduced size RTCP packets should be enabled only if it's
enabled in the send parameters (which corresponds to the remote description).

Since the RTCPReceiver's RtcpMode isn't used at all, I removed it to ease
confusion.

BUG=webrtc:4868
R=pbos@webrtc.org, pthatcher@google.com, pthatcher@webrtc.org, stefan@webrtc.org

Review URL: https://codereview.webrtc.org/1713493003 .

Cr-Commit-Position: refs/heads/master@{#12057}

webrtc/pc/mediasession.cc

diff --git a/webrtc/pc/mediasession.cc b/webrtc/pc/mediasession.cc
index 6a98f7d..a9d1b95 100644
--- a/webrtc/pc/mediasession.cc
+++ b/webrtc/pc/mediasession.cc
@@ -755,11 +755,9 @@
     offer->set_crypto_required(CT_SDES);
   }
   offer->set_rtcp_mux(options.rtcp_mux_enabled);
-  // TODO(deadbeef): Once we're sure this works correctly, enable it in
-  // CreateOffer.
-  // if (offer->type() == cricket::MEDIA_TYPE_VIDEO) {
-  //   offer->set_rtcp_reduced_size(true);
-  // }
+  if (offer->type() == cricket::MEDIA_TYPE_VIDEO) {
+    offer->set_rtcp_reduced_size(true);
+  }
   offer->set_multistream(options.is_muc);
   offer->set_rtp_header_extensions(rtp_extensions);
 
@@ -1053,11 +1051,9 @@
   answer->set_rtp_header_extensions(negotiated_rtp_extensions);
 
   answer->set_rtcp_mux(options.rtcp_mux_enabled && offer->rtcp_mux());
-  // TODO(deadbeef): Once we're sure this works correctly, enable it in
-  // CreateAnswer.
-  // if (answer->type() == cricket::MEDIA_TYPE_VIDEO) {
-  //   answer->set_rtcp_reduced_size(offer->rtcp_reduced_size());
-  // }
+  if (answer->type() == cricket::MEDIA_TYPE_VIDEO) {
+    answer->set_rtcp_reduced_size(offer->rtcp_reduced_size());
+  }
 
   if (sdes_policy != SEC_DISABLED) {
     CryptoParams crypto;