Removes use of DeRegister Rtp Header Extension for video

webrtc/video/vie_channel.cc

 /*
  *  Copyright (c) 2012 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 359 matching lines @@
   }
 }
 
 int ViEChannel::GetRequiredNackListSize(int target_delay_ms) {
   // The max size of the nack list should be large enough to accommodate the
   // the number of packets (frames) resulting from the increased delay.
   // Roughly estimating for ~40 packets per frame @ 30fps.
   return target_delay_ms * 40 * 30 / 1000;
 }
 
-int ViEChannel::SetSendTimestampOffsetStatus(bool enable, int id) {
-  // Disable any previous registrations of this extension to avoid errors.
-  for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
-    rtp_rtcp->DeregisterSendRtpHeaderExtension(
-        kRtpExtensionTransmissionTimeOffset);
-  }
-  if (!enable)
-    return 0;
+int ViEChannel::SetSendTimestampOffsetStatus(int id) {
   // Enable the extension.
   int error = 0;
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     error |= rtp_rtcp->RegisterSendRtpHeaderExtension(
         kRtpExtensionTransmissionTimeOffset, id);
   }
   return error;
 }
 
-int ViEChannel::SetSendAbsoluteSendTimeStatus(bool enable, int id) {
-  // Disable any previous registrations of this extension to avoid errors.
-  for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
-    rtp_rtcp->DeregisterSendRtpHeaderExtension(kRtpExtensionAbsoluteSendTime);
-  if (!enable)
-    return 0;
+int ViEChannel::SetSendAbsoluteSendTimeStatus(int id) {
   // Enable the extension.
   int error = 0;
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     error |= rtp_rtcp->RegisterSendRtpHeaderExtension(
         kRtpExtensionAbsoluteSendTime, id);
   }
   return error;
 }
 
-int ViEChannel::SetSendVideoRotationStatus(bool enable, int id) {
-  // Disable any previous registrations of this extension to avoid errors.
-  for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_)
-    rtp_rtcp->DeregisterSendRtpHeaderExtension(kRtpExtensionVideoRotation);
-  if (!enable)
-    return 0;
+int ViEChannel::SetSendVideoRotationStatus(int id) {
   // Enable the extension.
   int error = 0;
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     error |= rtp_rtcp->RegisterSendRtpHeaderExtension(
         kRtpExtensionVideoRotation, id);
   }
   return error;
 }
 
-int ViEChannel::SetSendTransportSequenceNumber(bool enable, int id) {
+int ViEChannel::SetSendTransportSequenceNumber(int id) {
   RTC_DCHECK(sender_);
-  // Disable any previous registrations of this extension to avoid errors.
-  for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
-    rtp_rtcp->DeregisterSendRtpHeaderExtension(
-        kRtpExtensionTransportSequenceNumber);
-  }
-  if (!enable)
-    return 0;
   // Enable the extension.
   int error = 0;
   for (RtpRtcp* rtp_rtcp : rtp_rtcp_modules_) {
     error |= rtp_rtcp->RegisterSendRtpHeaderExtension(
         kRtpExtensionTransportSequenceNumber, id);
   }
   return error;
 }
 
 RtpState ViEChannel::GetRtpStateForSsrc(uint32_t ssrc) const {
@@ skipping 283 matching lines @@
   rtc::CritScope lock(&crit_);
   receive_stats_callback_ = receive_statistics_proxy;
 }
 
 void ViEChannel::SetIncomingVideoStream(
     IncomingVideoStream* incoming_video_stream) {
   rtc::CritScope lock(&crit_);
   incoming_video_stream_ = incoming_video_stream;
 }
 }  // namespace webrtc