Removes use of DeRegister Rtp Header Extension for video

webrtc/video/vie_receiver.cc

Index: webrtc/video/vie_receiver.cc
diff --git a/webrtc/video/vie_receiver.cc b/webrtc/video/vie_receiver.cc
index 8fcb380f92b03f552bf839c17307e8cdd9b7ea7d..4048ad70f64306c18fb6b09c886eeec6669517b3 100644
--- a/webrtc/video/vie_receiver.cc
+++ b/webrtc/video/vie_receiver.cc
@@ -156,61 +156,38 @@ void ViEReceiver::RegisterRtpRtcpModules(
       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);
-  } else {
-    return rtp_header_parser_->DeregisterRtpHeaderExtension(
-        kRtpExtensionTransmissionTimeOffset);
-  }
+bool ViEReceiver::EnableReceiveTimestampOffset(int id) {
+  return rtp_header_parser_->RegisterRtpHeaderExtension(
+      kRtpExtensionTransmissionTimeOffset, id);
 }
 
-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::EnableReceiveAbsoluteSendTime(int id) {
+  if (rtp_header_parser_->RegisterRtpHeaderExtension(
+      kRtpExtensionAbsoluteSendTime, id)) {
+    receiving_ast_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::EnableReceiveVideoRotation(int id) {
+  if (rtp_header_parser_->RegisterRtpHeaderExtension(
+          kRtpExtensionVideoRotation, id)) {
+    receiving_cvo_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;
-    }
+bool ViEReceiver::EnableReceiveTransportSequenceNumber(int id) {
+  if (rtp_header_parser_->RegisterRtpHeaderExtension(
+          kRtpExtensionTransportSequenceNumber, id)) {
+    receiving_tsn_enabled_ = true;
+    return true;
   } else {
-    receiving_tsn_enabled_ = false;
-    return rtp_header_parser_->DeregisterRtpHeaderExtension(
-        kRtpExtensionTransportSequenceNumber);
+    return false;
   }
 }