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

webrtc/pc/mediasession.cc

Index: webrtc/pc/mediasession.cc
diff --git a/webrtc/pc/mediasession.cc b/webrtc/pc/mediasession.cc
index 6a98f7d07681d2a2c0c2d19f1c969595487f8883..a9d1b95c22aee6aae9299315a9ecc05586242336 100644
--- a/webrtc/pc/mediasession.cc
+++ b/webrtc/pc/mediasession.cc
@@ -755,11 +755,9 @@ static bool CreateMediaContentOffer(
     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 @@ static bool CreateMediaContentAnswer(
   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;