Removes use of DeRegister Rtp Header Extension for video

webrtc/video/vie_receiver.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 138 matching lines @@
 void ViEReceiver::RegisterRtpRtcpModules(
     const std::vector<RtpRtcp*>& rtp_modules) {
   rtc::CritScope lock(&receive_cs_);
   // Only change the "simulcast" modules, the base module can be accessed
   // without a lock whereas the simulcast modules require locking as they can be
   // changed in runtime.
   rtp_rtcp_simulcast_ =
       std::vector<RtpRtcp*>(rtp_modules.begin() + 1, rtp_modules.end());
 }
 
-bool ViEReceiver::SetReceiveTimestampOffsetStatus(bool enable, int id) {
-  if (enable) {
-    return rtp_header_parser_->RegisterRtpHeaderExtension(
-        kRtpExtensionTransmissionTimeOffset, id);
+bool ViEReceiver::SetReceiveTimestampOffsetStatus(int id) {
+  return rtp_header_parser_->RegisterRtpHeaderExtension(
+      kRtpExtensionTransmissionTimeOffset, id);
+}
+
+bool ViEReceiver::SetReceiveAbsoluteSendTimeStatus(int id) {
+  if (rtp_header_parser_->RegisterRtpHeaderExtension(
+      kRtpExtensionAbsoluteSendTime, id)) {
+    receiving_ast_enabled_ = true;
+    return true;
   } else {
-    return rtp_header_parser_->DeregisterRtpHeaderExtension(
-        kRtpExtensionTransmissionTimeOffset);
+    return false;
   }
 }
 
-bool ViEReceiver::SetReceiveAbsoluteSendTimeStatus(bool enable, int id) {
-  if (enable) {
-    if (rtp_header_parser_->RegisterRtpHeaderExtension(
-        kRtpExtensionAbsoluteSendTime, id)) {
-      receiving_ast_enabled_ = true;
-      return true;
-    } else {
-      return false;
-    }
+bool ViEReceiver::SetReceiveVideoRotationStatus(int id) {
+  if (rtp_header_parser_->RegisterRtpHeaderExtension(
+          kRtpExtensionVideoRotation, id)) {
+    receiving_cvo_enabled_ = true;
+    return true;
   } else {
-    receiving_ast_enabled_ = false;
-    return rtp_header_parser_->DeregisterRtpHeaderExtension(
-        kRtpExtensionAbsoluteSendTime);
+    return false;
   }
 }
 
-bool ViEReceiver::SetReceiveVideoRotationStatus(bool enable, int id) {
-  if (enable) {
-    if (rtp_header_parser_->RegisterRtpHeaderExtension(
-            kRtpExtensionVideoRotation, id)) {
-      receiving_cvo_enabled_ = true;
-      return true;
-    } else {
-      return false;
-    }
+bool ViEReceiver::SetReceiveTransportSequenceNumber(int id) {
+  if (rtp_header_parser_->RegisterRtpHeaderExtension(
+          kRtpExtensionTransportSequenceNumber, id)) {
+    receiving_tsn_enabled_ = true;
+    return true;
   } else {
-    receiving_cvo_enabled_ = false;
-    return rtp_header_parser_->DeregisterRtpHeaderExtension(
-        kRtpExtensionVideoRotation);
+    return false;
   }
 }
 
-bool ViEReceiver::SetReceiveTransportSequenceNumber(bool enable, int id) {
-  if (enable) {
-    if (rtp_header_parser_->RegisterRtpHeaderExtension(
-            kRtpExtensionTransportSequenceNumber, id)) {
-      receiving_tsn_enabled_ = true;
-      return true;
-    } else {
-      return false;
-    }
-  } else {
-    receiving_tsn_enabled_ = false;
-    return rtp_header_parser_->DeregisterRtpHeaderExtension(
-        kRtpExtensionTransportSequenceNumber);
-  }
-}
-
 int32_t ViEReceiver::OnReceivedPayloadData(const uint8_t* payload_data,
                                            const size_t payload_size,
                                            const WebRtcRTPHeader* rtp_header) {
   RTC_DCHECK(vcm_);
   WebRtcRTPHeader rtp_header_with_ntp = *rtp_header;
   rtp_header_with_ntp.ntp_time_ms =
       ntp_estimator_->Estimate(rtp_header->header.timestamp);
   if (vcm_->IncomingPacket(payload_data,
                            payload_size,
                            rtp_header_with_ntp) != 0) {
@@ skipping 231 matching lines @@
       rtp_receive_statistics_->GetStatistician(header.ssrc);
   if (!statistician)
     return false;
   // Check if this is a retransmission.
   int64_t min_rtt = 0;
   rtp_rtcp_->RTT(rtp_receiver_->SSRC(), NULL, NULL, &min_rtt, NULL);
   return !in_order &&
       statistician->IsRetransmitOfOldPacket(header, min_rtt);
 }
 }  // namespace webrtc