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

webrtc/pc/mediasession.cc

 /*
  *  Copyright 2004 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 737 matching lines @@
     bool add_legacy_stream,
     StreamParamsVec* current_streams,
     MediaContentDescriptionImpl<C>* offer) {
   offer->AddCodecs(codecs);
   offer->SortCodecs();
 
   if (secure_policy == SEC_REQUIRED) {
     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);
 
   if (!AddStreamParams(
           offer->type(), options.streams, current_streams,
           offer, add_legacy_stream)) {
     return false;
   }
 
 #ifdef HAVE_SRTP
@@ skipping 273 matching lines @@
   answer->AddCodecs(negotiated_codecs);
   answer->SortCodecs();
   answer->set_protocol(offer->protocol());
   RtpHeaderExtensions negotiated_rtp_extensions;
   NegotiateRtpHeaderExtensions(local_rtp_extenstions,
                                offer->rtp_header_extensions(),
                                &negotiated_rtp_extensions);
   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;
     if (SelectCrypto(offer, bundle_enabled, &crypto)) {
       if (current_cryptos) {
         FindMatchingCrypto(*current_cryptos, crypto, &crypto);
       }
       answer->AddCrypto(crypto);
     }
   }
@@ skipping 927 matching lines @@
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_VIDEO));
 }
 
 const DataContentDescription* GetFirstDataContentDescription(
     const SessionDescription* sdesc) {
   return static_cast<const DataContentDescription*>(
       GetFirstMediaContentDescription(sdesc, MEDIA_TYPE_DATA));
 }
 
 }  // namespace cricket