admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Delete legacy function to deregister rtp header extension by type

Browse Source 
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}
This commit is contained in:
Danil Chapovalov 2021-10-07 19:12:32 +02:00 committed by WebRTC LUCI CQ
parent 83121d4dfe
commit 723b35f6f0
12 changed files with 9 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
audio/audio_send_stream.cc
View File

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

1
modules/rtp_rtcp/include/rtp_header_extension_map.h
View File

@ -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.

4
modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
View File

@ -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),

7
modules/rtp_rtcp/source/rtp_header_extension_map.cc
View File

@ -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) {

4
modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc
View File

@ -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::kId);
map.Deregister(TransmissionOffset::Uri());
map.Deregister(TransmissionOffset::Uri());
}
TEST(RtpHeaderExtensionTest, NonUniqueId) {

4
modules/rtp_rtcp/source/rtp_rtcp_impl.cc
View File

@ -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);

1
modules/rtp_rtcp/source/rtp_rtcp_impl.h
View File

@ -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;

4
modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
View File

@ -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);

1
modules/rtp_rtcp/source/rtp_rtcp_impl2.h
View File

@ -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;

1
modules/rtp_rtcp/source/rtp_rtcp_interface.h
View File

@ -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

8
modules/rtp_rtcp/source/rtp_sender.cc
View File

@ -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);

2
modules/rtp_rtcp/source/rtp_sender.h
View File

@ -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_);