Delete legacy function to deregister rtp header extension by type

Bug: None
Change-Id: I1d9447df41edf109665a5c746a6dc2c912aad8a7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/234526
Reviewed-by: Jakob Ivarsson <jakobi@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#35179}

audio/audio_send_stream.cc

@@ -269,11 +269,10 @@ void AudioSendStream::ConfigureStream(
   }
 
   if (first_time || new_ids.abs_send_time != old_ids.abs_send_time) {
-    rtp_rtcp_module_->DeregisterSendRtpHeaderExtension(
+    absl::string_view uri = AbsoluteSendTime::Uri();
-        kRtpExtensionAbsoluteSendTime);
+    rtp_rtcp_module_->DeregisterSendRtpHeaderExtension(uri);
     if (new_ids.abs_send_time) {
-      rtp_rtcp_module_->RegisterRtpHeaderExtension(AbsoluteSendTime::Uri(),
+      rtp_rtcp_module_->RegisterRtpHeaderExtension(uri, new_ids.abs_send_time);
-                                                   new_ids.abs_send_time);
     }
   }
 
@@ -331,11 +330,11 @@ void AudioSendStream::ConfigureStream(
   }
 
   if (first_time || new_ids.abs_capture_time != old_ids.abs_capture_time) {
-    rtp_rtcp_module_->DeregisterSendRtpHeaderExtension(
+    absl::string_view uri = AbsoluteCaptureTimeExtension::Uri();
-        kRtpExtensionAbsoluteCaptureTime);
+    rtp_rtcp_module_->DeregisterSendRtpHeaderExtension(uri);
     if (new_ids.abs_capture_time) {
-      rtp_rtcp_module_->RegisterRtpHeaderExtension(
+      rtp_rtcp_module_->RegisterRtpHeaderExtension(uri,
-          AbsoluteCaptureTimeExtension::Uri(), new_ids.abs_capture_time);
+                                                   new_ids.abs_capture_time);
     }
   }
 

modules/rtp_rtcp/include/rtp_header_extension_map.h

@@ -53,7 +53,6 @@ class RtpHeaderExtensionMap {
     return ids_[type];
   }
 
-  int32_t Deregister(RTPExtensionType type);
   void Deregister(absl::string_view uri);
 
   // Corresponds to the SDP attribute extmap-allow-mixed, see RFC8285.

modules/rtp_rtcp/mocks/mock_rtp_rtcp.h

@@ -50,10 +50,6 @@ class MockRtpRtcpInterface : public RtpRtcpInterface {
               RegisterRtpHeaderExtension,
               (absl::string_view uri, int id),
               (override));
-  MOCK_METHOD(int32_t,
-              DeregisterSendRtpHeaderExtension,
-              (RTPExtensionType type),
-              (override));
   MOCK_METHOD(void,
               DeregisterSendRtpHeaderExtension,
               (absl::string_view uri),

modules/rtp_rtcp/source/rtp_header_extension_map.cc

@@ -118,13 +118,6 @@ RTPExtensionType RtpHeaderExtensionMap::GetType(int id) const {
   return kInvalidType;
 }
 
-int32_t RtpHeaderExtensionMap::Deregister(RTPExtensionType type) {
-  if (IsRegistered(type)) {
-    ids_[type] = kInvalidId;
-  }
-  return 0;
-}
-
 void RtpHeaderExtensionMap::Deregister(absl::string_view uri) {
   for (const ExtensionInfo& extension : kExtensions) {
     if (extension.uri == uri) {

modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc

@@ -77,8 +77,8 @@ TEST(RtpHeaderExtensionTest, Idempotent) {
   EXPECT_TRUE(map.Register<TransmissionOffset>(3));
   EXPECT_TRUE(map.Register<TransmissionOffset>(3));
 
-  map.Deregister(TransmissionOffset::kId);
+  map.Deregister(TransmissionOffset::Uri());
-  map.Deregister(TransmissionOffset::kId);
+  map.Deregister(TransmissionOffset::Uri());
 }
 
 TEST(RtpHeaderExtensionTest, NonUniqueId) {

modules/rtp_rtcp/source/rtp_rtcp_impl.cc

@@ -630,10 +630,6 @@ void ModuleRtpRtcpImpl::RegisterRtpHeaderExtension(absl::string_view uri,
   RTC_CHECK(registered);
 }
 
-int32_t ModuleRtpRtcpImpl::DeregisterSendRtpHeaderExtension(
-    const RTPExtensionType type) {
-  return rtp_sender_->packet_generator.DeregisterRtpHeaderExtension(type);
-}
 void ModuleRtpRtcpImpl::DeregisterSendRtpHeaderExtension(
     absl::string_view uri) {
   rtp_sender_->packet_generator.DeregisterRtpHeaderExtension(uri);

modules/rtp_rtcp/source/rtp_rtcp_impl.h

@@ -76,7 +76,6 @@ class ModuleRtpRtcpImpl : public RtpRtcp, public RTCPReceiver::ModuleRtpRtcp {
 
   // Register RTP header extension.
   void RegisterRtpHeaderExtension(absl::string_view uri, int id) override;
-  int32_t DeregisterSendRtpHeaderExtension(RTPExtensionType type) override;
   void DeregisterSendRtpHeaderExtension(absl::string_view uri) override;
 
   bool SupportsPadding() const override;

modules/rtp_rtcp/source/rtp_rtcp_impl2.cc

@@ -584,10 +584,6 @@ void ModuleRtpRtcpImpl2::RegisterRtpHeaderExtension(absl::string_view uri,
   RTC_CHECK(registered);
 }
 
-int32_t ModuleRtpRtcpImpl2::DeregisterSendRtpHeaderExtension(
-    const RTPExtensionType type) {
-  return rtp_sender_->packet_generator.DeregisterRtpHeaderExtension(type);
-}
 void ModuleRtpRtcpImpl2::DeregisterSendRtpHeaderExtension(
     absl::string_view uri) {
   rtp_sender_->packet_generator.DeregisterRtpHeaderExtension(uri);

modules/rtp_rtcp/source/rtp_rtcp_impl2.h

@@ -83,7 +83,6 @@ class ModuleRtpRtcpImpl2 final : public RtpRtcpInterface,
   void SetExtmapAllowMixed(bool extmap_allow_mixed) override;
 
   void RegisterRtpHeaderExtension(absl::string_view uri, int id) override;
-  int32_t DeregisterSendRtpHeaderExtension(RTPExtensionType type) override;
   void DeregisterSendRtpHeaderExtension(absl::string_view uri) override;
 
   bool SupportsPadding() const override;

modules/rtp_rtcp/source/rtp_rtcp_interface.h

@@ -218,7 +218,6 @@ class RtpRtcpInterface : public RtcpFeedbackSenderInterface {
   // Register extension by uri, triggers CHECK on falure.
   virtual void RegisterRtpHeaderExtension(absl::string_view uri, int id) = 0;
 
-  virtual int32_t DeregisterSendRtpHeaderExtension(RTPExtensionType type) = 0;
   virtual void DeregisterSendRtpHeaderExtension(absl::string_view uri) = 0;
 
   // Returns true if RTP module is send media, and any of the extensions

modules/rtp_rtcp/source/rtp_sender.cc

@@ -238,14 +238,6 @@ bool RTPSender::IsRtpHeaderExtensionRegistered(RTPExtensionType type) const {
   return rtp_header_extension_map_.IsRegistered(type);
 }
 
-int32_t RTPSender::DeregisterRtpHeaderExtension(RTPExtensionType type) {
-  MutexLock lock(&send_mutex_);
-  rtp_header_extension_map_.Deregister(type);
-  supports_bwe_extension_ = HasBweExtension(rtp_header_extension_map_);
-  UpdateHeaderSizes();
-  return 0;
-}
-
 void RTPSender::DeregisterRtpHeaderExtension(absl::string_view uri) {
   MutexLock lock(&send_mutex_);
   rtp_header_extension_map_.Deregister(uri);

modules/rtp_rtcp/source/rtp_sender.h

@@ -88,8 +88,6 @@ class RTPSender {
       RTC_LOCKS_EXCLUDED(send_mutex_);
   bool IsRtpHeaderExtensionRegistered(RTPExtensionType type) const
       RTC_LOCKS_EXCLUDED(send_mutex_);
-  int32_t DeregisterRtpHeaderExtension(RTPExtensionType type)
-      RTC_LOCKS_EXCLUDED(send_mutex_);
   void DeregisterRtpHeaderExtension(absl::string_view uri)
       RTC_LOCKS_EXCLUDED(send_mutex_);