diff --git a/audio/audio_send_stream_tests.cc b/audio/audio_send_stream_tests.cc index ff95ed70e1..436e752e3a 100644 --- a/audio/audio_send_stream_tests.cc +++ b/audio/audio_send_stream_tests.cc @@ -109,7 +109,7 @@ TEST_F(AudioSendStreamCallTest, SupportsAudioLevel) { class AudioLevelObserver : public AudioSendTest { public: AudioLevelObserver() : AudioSendTest() { - extensions_.Register(kAudioLevelExtensionId); + extensions_.Register(kAudioLevelExtensionId); } Action OnSendRtp(rtc::ArrayView packet) override { @@ -118,7 +118,8 @@ TEST_F(AudioSendStreamCallTest, SupportsAudioLevel) { uint8_t audio_level = 0; bool voice = false; - EXPECT_TRUE(rtp_packet.GetExtension(&voice, &audio_level)); + EXPECT_TRUE( + rtp_packet.GetExtension(&voice, &audio_level)); if (audio_level != 0) { // Wait for at least one packet with a non-zero level. observation_complete_.Set(); diff --git a/audio/channel_send.cc b/audio/channel_send.cc index 68cd099a23..7d40048967 100644 --- a/audio/channel_send.cc +++ b/audio/channel_send.cc @@ -643,9 +643,9 @@ void ChannelSend::SetSendAudioLevelIndicationStatus(bool enable, int id) { RTC_DCHECK_RUN_ON(&worker_thread_checker_); include_audio_level_indication_.store(enable); if (enable) { - rtp_rtcp_->RegisterRtpHeaderExtension(AudioLevel::Uri(), id); + rtp_rtcp_->RegisterRtpHeaderExtension(AudioLevelExtension::Uri(), id); } else { - rtp_rtcp_->DeregisterSendRtpHeaderExtension(AudioLevel::Uri()); + rtp_rtcp_->DeregisterSendRtpHeaderExtension(AudioLevelExtension::Uri()); } } diff --git a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc index 7018f71e1b..d9aa472560 100644 --- a/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc +++ b/logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc @@ -449,8 +449,8 @@ void RtcEventLogEncoderNewFormat::EncodeRtpPacket(const Batch& batch, { bool voice_activity; uint8_t audio_level; - if (base_event->template GetExtension(&voice_activity, - &audio_level)) { + if (base_event->template GetExtension(&voice_activity, + &audio_level)) { RTC_DCHECK_LE(audio_level, 0x7Fu); base_audio_level = audio_level; proto_batch->set_audio_level(audio_level); @@ -646,8 +646,8 @@ void RtcEventLogEncoderNewFormat::EncodeRtpPacket(const Batch& batch, const EventType* event = batch[i + 1]; bool voice_activity; uint8_t audio_level; - if (event->template GetExtension(&voice_activity, - &audio_level)) { + if (event->template GetExtension(&voice_activity, + &audio_level)) { RTC_DCHECK_LE(audio_level, 0x7Fu); values[i] = audio_level; } else { @@ -664,8 +664,8 @@ void RtcEventLogEncoderNewFormat::EncodeRtpPacket(const Batch& batch, const EventType* event = batch[i + 1]; bool voice_activity; uint8_t audio_level; - if (event->template GetExtension(&voice_activity, - &audio_level)) { + if (event->template GetExtension(&voice_activity, + &audio_level)) { RTC_DCHECK_LE(audio_level, 0x7Fu); values[i] = voice_activity; } else { diff --git a/logging/rtc_event_log/rtc_event_log2rtp_dump.cc b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc index a0514259aa..250aaf59d7 100644 --- a/logging/rtc_event_log/rtc_event_log2rtp_dump.cc +++ b/logging/rtc_event_log/rtc_event_log2rtp_dump.cc @@ -136,7 +136,7 @@ void ConvertRtpPacket( reconstructed_packet.SetExtension( incoming.rtp.header.extension.transportSequenceNumber); if (incoming.rtp.header.extension.hasAudioLevel) - reconstructed_packet.SetExtension( + reconstructed_packet.SetExtension( incoming.rtp.header.extension.voiceActivity, incoming.rtp.header.extension.audioLevel); if (incoming.rtp.header.extension.hasVideoRotation) diff --git a/logging/rtc_event_log/rtc_event_log_parser.cc b/logging/rtc_event_log/rtc_event_log_parser.cc index d6469e1033..5b0810e9e0 100644 --- a/logging/rtc_event_log/rtc_event_log_parser.cc +++ b/logging/rtc_event_log/rtc_event_log_parser.cc @@ -1036,7 +1036,7 @@ ParsedRtcEventLog::GetDefaultHeaderExtensionMap() { constexpr int kDependencyDescriptorDefaultId = 9; webrtc::RtpHeaderExtensionMap default_map(/*extmap_allow_mixed=*/true); - default_map.Register(kAudioLevelDefaultId); + default_map.Register(kAudioLevelDefaultId); default_map.Register(kTimestampOffsetDefaultId); default_map.Register(kAbsSendTimeDefaultId); default_map.Register(kVideoRotationDefaultId); diff --git a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc index bd83586456..bfc10e5915 100644 --- a/logging/rtc_event_log/rtc_event_log_unittest_helper.cc +++ b/logging/rtc_event_log/rtc_event_log_unittest_helper.cc @@ -616,9 +616,10 @@ void EventGenerator::RandomizeRtpPacket( rtp_packet->SetExtension(prng_.Rand(0x00ffffff)); } - if (extension_map.IsRegistered(AudioLevel::kId) && + if (extension_map.IsRegistered(AudioLevelExtension::kId) && (all_configured_exts || prng_.Rand())) { - rtp_packet->SetExtension(prng_.Rand(), prng_.Rand(127)); + rtp_packet->SetExtension(prng_.Rand(), + prng_.Rand(127)); } if (extension_map.IsRegistered(AbsoluteSendTime::kId) && @@ -728,8 +729,9 @@ RtpHeaderExtensionMap EventGenerator::NewRtpHeaderExtensionMap( return !absl::c_linear_search(excluded_extensions, type); }; - if (not_excluded(AudioLevel::kId) && (configure_all || prng_.Rand())) { - extension_map.Register(id[0]); + if (not_excluded(AudioLevelExtension::kId) && + (configure_all || prng_.Rand())) { + extension_map.Register(id[0]); } if (not_excluded(TransmissionOffset::kId) && (configure_all || prng_.Rand())) { @@ -1026,12 +1028,12 @@ void VerifyLoggedRtpHeader(const Event& original_header, } // AudioLevel header extension. - ASSERT_EQ(original_header.template HasExtension(), + ASSERT_EQ(original_header.template HasExtension(), logged_header.extension.hasAudioLevel); if (logged_header.extension.hasAudioLevel) { bool voice_activity; uint8_t audio_level; - ASSERT_TRUE(original_header.template GetExtension( + ASSERT_TRUE(original_header.template GetExtension( &voice_activity, &audio_level)); EXPECT_EQ(voice_activity, logged_header.extension.voiceActivity); EXPECT_EQ(audio_level, logged_header.extension.audioLevel); diff --git a/media/engine/webrtc_voice_engine_unittest.cc b/media/engine/webrtc_voice_engine_unittest.cc index 8ae441bc69..777d3a0dea 100644 --- a/media/engine/webrtc_voice_engine_unittest.cc +++ b/media/engine/webrtc_voice_engine_unittest.cc @@ -1560,8 +1560,8 @@ TEST_P(WebRtcVoiceEngineTestFake, OnPacketReceivedIdentifiesExtensions) { webrtc::RtpHeaderExtensionMap extension_map(parameters.extensions); webrtc::RtpPacketReceived reference_packet(&extension_map); constexpr uint8_t kAudioLevel = 123; - reference_packet.SetExtension(/*voice_activity=*/true, - kAudioLevel); + reference_packet.SetExtension( + /*voice_activity=*/true, kAudioLevel); // Create a packet without the extension map but with the same content. webrtc::RtpPacketReceived received_packet; ASSERT_TRUE(received_packet.Parse(reference_packet.Buffer())); @@ -1571,8 +1571,9 @@ TEST_P(WebRtcVoiceEngineTestFake, OnPacketReceivedIdentifiesExtensions) { bool voice_activity; uint8_t audio_level; - EXPECT_TRUE(call_.last_received_rtp_packet().GetExtension( - &voice_activity, &audio_level)); + EXPECT_TRUE(call_.last_received_rtp_packet() + .GetExtension(&voice_activity, + &audio_level)); EXPECT_EQ(audio_level, kAudioLevel); } diff --git a/modules/rtp_rtcp/source/rtp_header_extension_map.cc b/modules/rtp_rtcp/source/rtp_header_extension_map.cc index 4b8c7b5385..3701601500 100644 --- a/modules/rtp_rtcp/source/rtp_header_extension_map.cc +++ b/modules/rtp_rtcp/source/rtp_header_extension_map.cc @@ -34,7 +34,7 @@ constexpr ExtensionInfo CreateExtensionInfo() { constexpr ExtensionInfo kExtensions[] = { CreateExtensionInfo(), - CreateExtensionInfo(), + CreateExtensionInfo(), CreateExtensionInfo(), CreateExtensionInfo(), CreateExtensionInfo(), diff --git a/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc b/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc index 42842cc876..8dd0231c2a 100644 --- a/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_header_extension_map_unittest.cc @@ -85,8 +85,8 @@ TEST(RtpHeaderExtensionTest, NonUniqueId) { RtpHeaderExtensionMap map; EXPECT_TRUE(map.Register(3)); - EXPECT_FALSE(map.Register(3)); - EXPECT_TRUE(map.Register(4)); + EXPECT_FALSE(map.Register(3)); + EXPECT_TRUE(map.Register(4)); } TEST(RtpHeaderExtensionTest, GetType) { diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.cc b/modules/rtp_rtcp/source/rtp_header_extensions.cc index e42a84bd06..9f0374b299 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.cc +++ b/modules/rtp_rtcp/source/rtp_header_extensions.cc @@ -160,9 +160,9 @@ bool AbsoluteCaptureTimeExtension::Write(rtc::ArrayView data, // | ID | len=1 |V| level | // +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+ // Sample Audio Level Encoding Using the Two-Byte Header Format -bool AudioLevel::Parse(rtc::ArrayView data, - bool* voice_activity, - uint8_t* audio_level) { +bool AudioLevelExtension::Parse(rtc::ArrayView data, + bool* voice_activity, + uint8_t* audio_level) { // One-byte and two-byte format share the same data definition. if (data.size() != 1) return false; @@ -171,9 +171,9 @@ bool AudioLevel::Parse(rtc::ArrayView data, return true; } -bool AudioLevel::Write(rtc::ArrayView data, - bool voice_activity, - uint8_t audio_level) { +bool AudioLevelExtension::Write(rtc::ArrayView data, + bool voice_activity, + uint8_t audio_level) { // One-byte and two-byte format share the same data definition. RTC_DCHECK_EQ(data.size(), 1); RTC_CHECK_LE(audio_level, 0x7f); diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h index 739d4765d0..51c083a18b 100644 --- a/modules/rtp_rtcp/source/rtp_header_extensions.h +++ b/modules/rtp_rtcp/source/rtp_header_extensions.h @@ -28,6 +28,13 @@ #include "api/video/video_timing.h" #include "modules/rtp_rtcp/include/rtp_rtcp_defines.h" +// This file contains class definitions for reading/writing each RTP header +// extension. Each class must be defined such that it is compatible with being +// an argument to the templated RtpPacket::GetExtension and +// RtpPacketToSend::SetExtension methods. New header extensions must have class +// names ending with "Extension", for the purpose of avoiding collisions with +// RTP extension information exposed in the public API of WebRTC. + namespace webrtc { class AbsoluteSendTime { @@ -75,7 +82,7 @@ class AbsoluteCaptureTimeExtension { const AbsoluteCaptureTime& extension); }; -class AudioLevel { +class AudioLevelExtension { public: static constexpr RTPExtensionType kId = kRtpExtensionAudioLevel; static constexpr uint8_t kValueSizeBytes = 1; @@ -93,6 +100,9 @@ class AudioLevel { bool voice_activity, uint8_t audio_level); }; +// TODO: bugs.webrtc.org/15788 - In two weeks remove this alias and put new +// meaning into AudioLevel class. +using AudioLevel [[deprecated]] = AudioLevelExtension; class CsrcAudioLevel { public: diff --git a/modules/rtp_rtcp/source/rtp_packet_received.cc b/modules/rtp_rtcp/source/rtp_packet_received.cc index 9fa6197e7c..bdd1bb559f 100644 --- a/modules/rtp_rtcp/source/rtp_packet_received.cc +++ b/modules/rtp_rtcp/source/rtp_packet_received.cc @@ -61,7 +61,7 @@ void RtpPacketReceived::GetHeader(RTPHeader* header) const { &header->extension.feedback_request) || GetExtension( &header->extension.transportSequenceNumber); - header->extension.hasAudioLevel = GetExtension( + header->extension.hasAudioLevel = GetExtension( &header->extension.voiceActivity, &header->extension.audioLevel); header->extension.hasVideoRotation = GetExtension(&header->extension.videoRotation); diff --git a/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_unittest.cc index ac464493b8..922a4b15f4 100644 --- a/modules/rtp_rtcp/source/rtp_packet_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_packet_unittest.cc @@ -230,14 +230,14 @@ TEST(RtpPacketTest, CreateWithExtension) { TEST(RtpPacketTest, CreateWith2Extensions) { RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketToSend packet(&extensions); packet.SetPayloadType(kPayloadType); packet.SetSequenceNumber(kSeqNum); packet.SetTimestamp(kTimestamp); packet.SetSsrc(kSsrc); packet.SetExtension(kTimeOffset); - packet.SetExtension(kVoiceActive, kAudioLevel); + packet.SetExtension(kVoiceActive, kAudioLevel); EXPECT_THAT(kPacketWithTOAndAL, ElementsAreArray(packet.data(), packet.size())); } @@ -245,7 +245,7 @@ TEST(RtpPacketTest, CreateWith2Extensions) { TEST(RtpPacketTest, CreateWithTwoByteHeaderExtensionFirst) { RtpPacketToSend::ExtensionManager extensions(/*extmap_allow_mixed=*/true); extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); extensions.Register(kTwoByteExtensionId); RtpPacketToSend packet(&extensions); packet.SetPayloadType(kPayloadType); @@ -257,7 +257,7 @@ TEST(RtpPacketTest, CreateWithTwoByteHeaderExtensionFirst) { TimeDelta::Millis(340)); ASSERT_TRUE(packet.SetExtension(playout_delay)); packet.SetExtension(kTimeOffset); - packet.SetExtension(kVoiceActive, kAudioLevel); + packet.SetExtension(kVoiceActive, kAudioLevel); EXPECT_THAT(kPacketWithTwoByteExtensionIdFirst, ElementsAreArray(packet.data(), packet.size())); } @@ -266,7 +266,7 @@ TEST(RtpPacketTest, CreateWithTwoByteHeaderExtensionLast) { // This test will trigger RtpPacket::PromoteToTwoByteHeaderExtension(). RtpPacketToSend::ExtensionManager extensions(/*extmap_allow_mixed=*/true); extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); extensions.Register(kTwoByteExtensionId); RtpPacketToSend packet(&extensions); packet.SetPayloadType(kPayloadType); @@ -274,7 +274,7 @@ TEST(RtpPacketTest, CreateWithTwoByteHeaderExtensionLast) { packet.SetTimestamp(kTimestamp); packet.SetSsrc(kSsrc); packet.SetExtension(kTimeOffset); - packet.SetExtension(kVoiceActive, kAudioLevel); + packet.SetExtension(kVoiceActive, kAudioLevel); EXPECT_THAT(kPacketWithTOAndAL, ElementsAreArray(packet.data(), packet.size())); // Set extension that requires two-byte header. @@ -331,18 +331,20 @@ TEST(RtpPacketTest, TryToCreateWithLongMid) { TEST(RtpPacketTest, TryToCreateTwoByteHeaderNotSupported) { RtpPacketToSend::ExtensionManager extensions; - extensions.Register(kTwoByteExtensionId); + extensions.Register(kTwoByteExtensionId); RtpPacketToSend packet(&extensions); // Set extension that requires two-byte header. - EXPECT_FALSE(packet.SetExtension(kVoiceActive, kAudioLevel)); + EXPECT_FALSE( + packet.SetExtension(kVoiceActive, kAudioLevel)); } TEST(RtpPacketTest, CreateTwoByteHeaderSupportedIfExtmapAllowMixed) { RtpPacketToSend::ExtensionManager extensions(/*extmap_allow_mixed=*/true); - extensions.Register(kTwoByteExtensionId); + extensions.Register(kTwoByteExtensionId); RtpPacketToSend packet(&extensions); // Set extension that requires two-byte header. - EXPECT_TRUE(packet.SetExtension(kVoiceActive, kAudioLevel)); + EXPECT_TRUE( + packet.SetExtension(kVoiceActive, kAudioLevel)); } TEST(RtpPacketTest, CreateWithMaxSizeHeaderExtension) { @@ -401,13 +403,14 @@ TEST(RtpPacketTest, SetReservedExtensionsAfterPayload) { const size_t kPayloadSize = 4; RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketToSend packet(&extensions); EXPECT_TRUE(packet.ReserveExtension()); packet.SetPayloadSize(kPayloadSize); // Can't set extension after payload. - EXPECT_FALSE(packet.SetExtension(kVoiceActive, kAudioLevel)); + EXPECT_FALSE( + packet.SetExtension(kVoiceActive, kAudioLevel)); // Unless reserved. EXPECT_TRUE(packet.SetExtension(kTimeOffset)); } @@ -679,7 +682,7 @@ TEST(RtpPacketTest, ParseWithOverSizedExtension) { TEST(RtpPacketTest, ParseWith2Extensions) { RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketReceived packet(&extensions); EXPECT_TRUE(packet.Parse(kPacketWithTOAndAL, sizeof(kPacketWithTOAndAL))); int32_t time_offset; @@ -687,7 +690,8 @@ TEST(RtpPacketTest, ParseWith2Extensions) { EXPECT_EQ(kTimeOffset, time_offset); bool voice_active; uint8_t audio_level; - EXPECT_TRUE(packet.GetExtension(&voice_active, &audio_level)); + EXPECT_TRUE( + packet.GetExtension(&voice_active, &audio_level)); EXPECT_EQ(kVoiceActive, voice_active); EXPECT_EQ(kAudioLevel, audio_level); } @@ -695,22 +699,22 @@ TEST(RtpPacketTest, ParseWith2Extensions) { TEST(RtpPacketTest, ParseSecondPacketWithFewerExtensions) { RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketReceived packet(&extensions); EXPECT_TRUE(packet.Parse(kPacketWithTOAndAL, sizeof(kPacketWithTOAndAL))); EXPECT_TRUE(packet.HasExtension()); - EXPECT_TRUE(packet.HasExtension()); + EXPECT_TRUE(packet.HasExtension()); // Second packet without audio level. EXPECT_TRUE(packet.Parse(kPacketWithTO, sizeof(kPacketWithTO))); EXPECT_TRUE(packet.HasExtension()); - EXPECT_FALSE(packet.HasExtension()); + EXPECT_FALSE(packet.HasExtension()); } TEST(RtpPacketTest, ParseWith2ExtensionsInvalidPadding) { RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketReceived packet(&extensions); EXPECT_TRUE(packet.Parse(kPacketWithTOAndALInvalidPadding, sizeof(kPacketWithTOAndALInvalidPadding))); @@ -719,13 +723,14 @@ TEST(RtpPacketTest, ParseWith2ExtensionsInvalidPadding) { EXPECT_EQ(kTimeOffset, time_offset); bool voice_active; uint8_t audio_level; - EXPECT_FALSE(packet.GetExtension(&voice_active, &audio_level)); + EXPECT_FALSE( + packet.GetExtension(&voice_active, &audio_level)); } TEST(RtpPacketTest, ParseWith2ExtensionsReservedExtensionId) { RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketReceived packet(&extensions); EXPECT_TRUE(packet.Parse(kPacketWithTOAndALReservedExtensionId, sizeof(kPacketWithTOAndALReservedExtensionId))); @@ -734,7 +739,8 @@ TEST(RtpPacketTest, ParseWith2ExtensionsReservedExtensionId) { EXPECT_EQ(kTimeOffset, time_offset); bool voice_active; uint8_t audio_level; - EXPECT_FALSE(packet.GetExtension(&voice_active, &audio_level)); + EXPECT_FALSE( + packet.GetExtension(&voice_active, &audio_level)); } TEST(RtpPacketTest, ParseWithAllFeatures) { @@ -778,7 +784,7 @@ TEST(RtpPacketTest, ParseLongTwoByteHeaderExtension) { TEST(RtpPacketTest, ParseTwoByteHeaderExtensionWithPadding) { RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTwoByteExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketReceived packet(&extensions); EXPECT_TRUE( packet.Parse(kPacketWithTwoByteHeaderExtensionWithPadding, @@ -788,7 +794,8 @@ TEST(RtpPacketTest, ParseTwoByteHeaderExtensionWithPadding) { EXPECT_EQ(kTimeOffset, time_offset); bool voice_active; uint8_t audio_level; - EXPECT_TRUE(packet.GetExtension(&voice_active, &audio_level)); + EXPECT_TRUE( + packet.GetExtension(&voice_active, &audio_level)); EXPECT_EQ(kVoiceActive, voice_active); EXPECT_EQ(kAudioLevel, audio_level); } @@ -1187,7 +1194,7 @@ TEST(RtpPacketTest, ReservedExtensionsCountedAsSetExtension) { // Register two extensions. RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketReceived packet(&extensions); @@ -1199,7 +1206,7 @@ TEST(RtpPacketTest, ReservedExtensionsCountedAsSetExtension) { // Only the extension that is both registered and reserved matches // IsExtensionReserved(). EXPECT_FALSE(packet.HasExtension()); - EXPECT_FALSE(packet.HasExtension()); + EXPECT_FALSE(packet.HasExtension()); EXPECT_TRUE(packet.HasExtension()); } @@ -1207,14 +1214,14 @@ TEST(RtpPacketTest, ReservedExtensionsCountedAsSetExtension) { TEST(RtpPacketTest, RemoveMultipleExtensions) { RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketToSend packet(&extensions); packet.SetPayloadType(kPayloadType); packet.SetSequenceNumber(kSeqNum); packet.SetTimestamp(kTimestamp); packet.SetSsrc(kSsrc); packet.SetExtension(kTimeOffset); - packet.SetExtension(kVoiceActive, kAudioLevel); + packet.SetExtension(kVoiceActive, kAudioLevel); EXPECT_THAT(kPacketWithTOAndAL, ElementsAreArray(packet.data(), packet.size())); @@ -1235,21 +1242,21 @@ TEST(RtpPacketTest, RemoveMultipleExtensions) { TEST(RtpPacketTest, RemoveExtensionPreservesOtherUnregisteredExtensions) { RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketToSend packet(&extensions); packet.SetPayloadType(kPayloadType); packet.SetSequenceNumber(kSeqNum); packet.SetTimestamp(kTimestamp); packet.SetSsrc(kSsrc); packet.SetExtension(kTimeOffset); - packet.SetExtension(kVoiceActive, kAudioLevel); + packet.SetExtension(kVoiceActive, kAudioLevel); EXPECT_THAT(kPacketWithTOAndAL, ElementsAreArray(packet.data(), packet.size())); // "Unregister" kRtpExtensionTransmissionTimeOffset. RtpPacketToSend::ExtensionManager extensions1; - extensions1.Register(kAudioLevelExtensionId); + extensions1.Register(kAudioLevelExtensionId); packet.IdentifyExtensions(extensions1); // Make sure we can not delete extension which is set but not registered. @@ -1266,7 +1273,7 @@ TEST(RtpPacketTest, RemoveExtensionPreservesOtherUnregisteredExtensions) { TEST(RtpPacketTest, RemoveExtensionFailure) { RtpPacketToSend::ExtensionManager extensions; extensions.Register(kTransmissionOffsetExtensionId); - extensions.Register(kAudioLevelExtensionId); + extensions.Register(kAudioLevelExtensionId); RtpPacketToSend packet(&extensions); packet.SetPayloadType(kPayloadType); packet.SetSequenceNumber(kSeqNum); diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc index d899b4f44e..07356b8478 100644 --- a/modules/rtp_rtcp/source/rtp_sender.cc +++ b/modules/rtp_rtcp/source/rtp_sender.cc @@ -89,7 +89,7 @@ constexpr RtpExtensionSize kVideoExtensionSizes[] = { constexpr RtpExtensionSize kAudioExtensionSizes[] = { CreateExtensionSize(), CreateExtensionSize(), - CreateExtensionSize(), + CreateExtensionSize(), CreateExtensionSize(), CreateExtensionSize(), CreateExtensionSize(), diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.cc b/modules/rtp_rtcp/source/rtp_sender_audio.cc index 9d2258dc66..7351f313cd 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio.cc +++ b/modules/rtp_rtcp/source/rtp_sender_audio.cc @@ -261,7 +261,7 @@ bool RTPSenderAudio::SendAudio(const RtpAudioFrame& frame) { packet->SetTimestamp(frame.rtp_timestamp); packet->set_capture_time(clock_->CurrentTime()); // Set audio level extension, if included. - packet->SetExtension( + packet->SetExtension( frame.type == AudioFrameType::kAudioFrameSpeech, frame.audio_level_dbov.value_or(127)); diff --git a/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc index 724cd3a5e0..2b7938b85a 100644 --- a/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc @@ -39,7 +39,7 @@ using ::testing::ElementsAreArray; class LoopbackTransportTest : public webrtc::Transport { public: LoopbackTransportTest() { - receivers_extensions_.Register(kAudioLevelExtensionId); + receivers_extensions_.Register(kAudioLevelExtensionId); receivers_extensions_.Register( kAbsoluteCaptureTimeExtensionId); } @@ -102,7 +102,7 @@ TEST_F(RtpSenderAudioTest, SendAudio) { TEST_F(RtpSenderAudioTest, SendAudioWithAudioLevelExtension) { const uint8_t kAudioLevel = 0x5a; - rtp_module_->RegisterRtpHeaderExtension(AudioLevel::Uri(), + rtp_module_->RegisterRtpHeaderExtension(AudioLevelExtension::Uri(), kAudioLevelExtensionId); const char payload_name[] = "PAYLOAD_NAME"; @@ -123,7 +123,7 @@ TEST_F(RtpSenderAudioTest, SendAudioWithAudioLevelExtension) { // Verify AudioLevel extension. bool voice_activity; uint8_t audio_level; - EXPECT_TRUE(transport_.last_sent_packet().GetExtension( + EXPECT_TRUE(transport_.last_sent_packet().GetExtension( &voice_activity, &audio_level)); EXPECT_EQ(kAudioLevel, audio_level); EXPECT_FALSE(voice_activity); diff --git a/modules/rtp_rtcp/source/rtp_sender_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_unittest.cc index c47edfc8fc..7c012bec46 100644 --- a/modules/rtp_rtcp/source/rtp_sender_unittest.cc +++ b/modules/rtp_rtcp/source/rtp_sender_unittest.cc @@ -290,8 +290,8 @@ TEST_F(RtpSenderTest, AllocatePacketReserveExtensions) { TransmissionOffset::Uri(), kTransmissionTimeOffsetExtensionId)); ASSERT_TRUE(rtp_sender_->RegisterRtpHeaderExtension( AbsoluteSendTime::Uri(), kAbsoluteSendTimeExtensionId)); - ASSERT_TRUE(rtp_sender_->RegisterRtpHeaderExtension(AudioLevel::Uri(), - kAudioLevelExtensionId)); + ASSERT_TRUE(rtp_sender_->RegisterRtpHeaderExtension( + AudioLevelExtension::Uri(), kAudioLevelExtensionId)); ASSERT_TRUE(rtp_sender_->RegisterRtpHeaderExtension( TransportSequenceNumber::Uri(), kTransportSequenceNumberExtensionId)); ASSERT_TRUE(rtp_sender_->RegisterRtpHeaderExtension( @@ -305,7 +305,7 @@ TEST_F(RtpSenderTest, AllocatePacketReserveExtensions) { EXPECT_TRUE(packet->HasExtension()); EXPECT_TRUE(packet->HasExtension()); // Do not allocate media specific extensions. - EXPECT_FALSE(packet->HasExtension()); + EXPECT_FALSE(packet->HasExtension()); EXPECT_FALSE(packet->HasExtension()); } diff --git a/test/fuzzers/rtp_packet_fuzzer.cc b/test/fuzzers/rtp_packet_fuzzer.cc index 60afb986de..02fc64a2dc 100644 --- a/test/fuzzers/rtp_packet_fuzzer.cc +++ b/test/fuzzers/rtp_packet_fuzzer.cc @@ -75,7 +75,7 @@ void FuzzOneInput(const uint8_t* data, size_t size) { case kRtpExtensionAudioLevel: bool voice_activity; uint8_t audio_level; - packet.GetExtension(&voice_activity, &audio_level); + packet.GetExtension(&voice_activity, &audio_level); break; case kRtpExtensionCsrcAudioLevel: { std::vector audio_levels;