commit b6275c19aa706ca1c308ac82e1549f9cb479c8a6 parent 2dde4490f02a911d8eb121ed443a474b41eb102c Author: Michael Froman <mfroman@mozilla.com> Date: Thu, 9 Oct 2025 13:42:44 -0500 Bug 1993083 - Vendor libwebrtc from 4b42b471cc Upstream commit: https://webrtc.googlesource.com/src/+/4b42b471ccb473a95c90f2f25af0921feb1d3a87 constexpr-ify unit tests more removing some of the more common patterns from git grep "^const .* k" | grep unittest.cc | awk '{print $2}' | sort | uniq -c | sort -b -n typically done using git grep "^const something k" | grep unittest.cc | awk -F ':' '{print $1}' | sort | uniq | xargs sed -i 's/^const something k/constexpr something k/g' Bug: webrtc:429563452 Change-Id: I52fcbebd0ad8a6e98879107d7923be51da06f802 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/400400 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Commit-Queue: Philipp Hancke <phancke@meta.com> Reviewed-by: Danil Chapovalov <danilchap@webrtc.org> Cr-Commit-Position: refs/heads/main@{#45150} Diffstat:
21 files changed, 96 insertions(+), 95 deletions(-)
diff --git a/third_party/libwebrtc/README.mozilla.last-vendor b/third_party/libwebrtc/README.mozilla.last-vendor @@ -1,4 +1,4 @@ # ./mach python dom/media/webrtc/third_party_build/vendor-libwebrtc.py --from-local /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc --commit mozpatches libwebrtc -libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T18:41:32.738763+00:00. +libwebrtc updated from /home/mfroman/mozilla/elm/.moz-fast-forward/moz-libwebrtc commit mozpatches on 2025-10-09T18:42:35.066355+00:00. # base of lastest vendoring -c2d1e495a9 +4b42b471cc diff --git a/third_party/libwebrtc/api/test/network_emulation/dual_pi2_network_queue_unittest.cc b/third_party/libwebrtc/api/test/network_emulation/dual_pi2_network_queue_unittest.cc @@ -31,7 +31,7 @@ using ::testing::Field; using ::testing::Optional; using ::testing::Property; -const DataSize kPacketSize = DataSize::Bytes(1000); +constexpr DataSize kPacketSize = DataSize::Bytes(1000); TEST(DualPi2NetworkQueueTest, EnqueuePacket) { DualPi2NetworkQueue queue; diff --git a/third_party/libwebrtc/audio/audio_send_stream_unittest.cc b/third_party/libwebrtc/audio/audio_send_stream_unittest.cc @@ -79,8 +79,8 @@ using ::testing::WithArg; constexpr float kTolerance = 0.0001f; constexpr uint32_t kSsrc = 1234; -const char* kCName = "foo_name"; -const std::array<uint32_t, 2> kCsrcs = {5678, 9012}; +constexpr char kCName[] = "foo_name"; +constexpr std::array<uint32_t, 2> kCsrcs = {5678, 9012}; constexpr int kAudioLevelId = 2; constexpr int kTransportSequenceNumberId = 4; constexpr int32_t kEchoDelayMedian = 254; @@ -90,7 +90,7 @@ constexpr double kEchoReturnLoss = -65; constexpr double kEchoReturnLossEnhancement = 101; constexpr double kResidualEchoLikelihood = -1.0f; constexpr double kResidualEchoLikelihoodMax = 23.0f; -const CallSendStatistics kCallStats = {112, 12, 13456, 17890}; +constexpr CallSendStatistics kCallStats = {112, 12, 13456, 17890}; constexpr int kFractionLost = 123; constexpr int kCumulativeLost = 567; constexpr uint32_t kInterarrivalJitter = 132; @@ -110,11 +110,11 @@ const AudioCodecSpec kCodecSpecs[] = { // TODO(dklee): This mirrors calculation in audio_send_stream.cc, which // should be made more precise in the future. This can be changed when that // logic is more accurate. -const DataSize kOverheadPerPacket = DataSize::Bytes(20 + 8 + 10 + 12); -const TimeDelta kMinFrameLength = TimeDelta::Millis(20); -const TimeDelta kMaxFrameLength = TimeDelta::Millis(120); -const DataRate kMinOverheadRate = kOverheadPerPacket / kMaxFrameLength; -const DataRate kMaxOverheadRate = kOverheadPerPacket / kMinFrameLength; +constexpr DataSize kOverheadPerPacket = DataSize::Bytes(20 + 8 + 10 + 12); +constexpr TimeDelta kMinFrameLength = TimeDelta::Millis(20); +constexpr TimeDelta kMaxFrameLength = TimeDelta::Millis(120); +constexpr DataRate kMinOverheadRate = kOverheadPerPacket / kMaxFrameLength; +constexpr DataRate kMaxOverheadRate = kOverheadPerPacket / kMinFrameLength; class MockLimitObserver : public BitrateAllocator::LimitObserver { public: diff --git a/third_party/libwebrtc/modules/audio_processing/test/conversational_speech/generator_unittest.cc b/third_party/libwebrtc/modules/audio_processing/test/conversational_speech/generator_unittest.cc @@ -70,15 +70,15 @@ using conversational_speech::SaveTiming; using conversational_speech::Turn; using conversational_speech::WavReaderFactory; -const char* const audiotracks_path = "/path/to/audiotracks"; -const char* const timing_filepath = "/path/to/timing_file.txt"; -const char* const output_path = "/path/to/output_dir"; +constexpr char kAudioTracksPath[] = "/path/to/audiotracks"; +constexpr char kTimingFilePath[] = "/path/to/timing_file.txt"; +constexpr char kOutputPath[] = "/path/to/output_dir"; -const std::vector<Turn> expected_timing = { +const std::vector<Turn> kExpectedTiming = { {"A", "a1", 0, 0}, {"B", "b1", 0, 0}, {"A", "a2", 100, 0}, {"B", "b2", -200, 0}, {"A", "a3", 0, 0}, {"A", "a3", 0, 0}, }; -const std::size_t kNumberOfTurns = expected_timing.size(); +const size_t kNumberOfTurns = kExpectedTiming.size(); // Default arguments for MockWavReaderFactory ctor. // Fake audio track parameters. @@ -174,31 +174,31 @@ void DeleteFolderAndContents(absl::string_view dir) { using ::testing::_; TEST(ConversationalSpeechTest, Settings) { - const conversational_speech::Config config(audiotracks_path, timing_filepath, - output_path); + const conversational_speech::Config config(kAudioTracksPath, kTimingFilePath, + kOutputPath); // Test getters. - EXPECT_EQ(audiotracks_path, config.audiotracks_path()); - EXPECT_EQ(timing_filepath, config.timing_filepath()); - EXPECT_EQ(output_path, config.output_path()); + EXPECT_EQ(kAudioTracksPath, config.audiotracks_path()); + EXPECT_EQ(kTimingFilePath, config.timing_filepath()); + EXPECT_EQ(kOutputPath, config.output_path()); } TEST(ConversationalSpeechTest, TimingSaveLoad) { // Save test timing. const std::string temporary_filepath = TempFilename(OutputPath(), "TempTimingTestFile"); - SaveTiming(temporary_filepath, expected_timing); + SaveTiming(temporary_filepath, kExpectedTiming); // Create a std::vector<Turn> instance by loading from file. std::vector<Turn> actual_timing = LoadTiming(temporary_filepath); RemoveFile(temporary_filepath); // Check size. - EXPECT_EQ(expected_timing.size(), actual_timing.size()); + EXPECT_EQ(kExpectedTiming.size(), actual_timing.size()); // Check Turn instances. - for (size_t index = 0; index < expected_timing.size(); ++index) { - EXPECT_EQ(expected_timing[index], actual_timing[index]) + for (size_t index = 0; index < kExpectedTiming.size(); ++index) { + EXPECT_EQ(kExpectedTiming[index], actual_timing[index]) << "turn #" << index << " not matching"; } } @@ -211,7 +211,7 @@ TEST(ConversationalSpeechTest, MultiEndCallCreate) { // Inject the mock wav reader factory. conversational_speech::MultiEndCall multiend_call( - expected_timing, audiotracks_path, std::move(mock_wavreader_factory)); + kExpectedTiming, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_TRUE(multiend_call.valid()); // Test. @@ -230,7 +230,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupDifferentSampleRates) { // There are two unique audio tracks to read. EXPECT_CALL(*mock_wavreader_factory, Create(::testing::_)).Times(2); - MultiEndCall multiend_call(timing, audiotracks_path, + MultiEndCall multiend_call(timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_FALSE(multiend_call.valid()); } @@ -245,7 +245,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupMultipleChannels) { // There is one unique audio track to read. EXPECT_CALL(*mock_wavreader_factory, Create(::testing::_)).Times(1); - MultiEndCall multiend_call(timing, audiotracks_path, + MultiEndCall multiend_call(timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_FALSE(multiend_call.valid()); } @@ -261,7 +261,7 @@ TEST(ConversationalSpeechTest, // There are two unique audio tracks to read. EXPECT_CALL(*mock_wavreader_factory, Create(::testing::_)).Times(2); - MultiEndCall multiend_call(timing, audiotracks_path, + MultiEndCall multiend_call(timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_FALSE(multiend_call.valid()); } @@ -277,7 +277,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupFirstOffsetNegative) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(1); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_FALSE(multiend_call.valid()); } @@ -296,7 +296,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupSimple) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(1); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_TRUE(multiend_call.valid()); // Test. @@ -321,7 +321,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupPause) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(1); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_TRUE(multiend_call.valid()); // Test. @@ -346,7 +346,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupCrossTalk) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(1); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_TRUE(multiend_call.valid()); // Test. @@ -370,7 +370,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupInvalidOrder) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(1); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_FALSE(multiend_call.valid()); } @@ -390,7 +390,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupCrossTalkThree) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(2); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_TRUE(multiend_call.valid()); // Test. @@ -417,7 +417,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupSelfCrossTalkNearInvalid) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(1); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_FALSE(multiend_call.valid()); } @@ -440,7 +440,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupSelfCrossTalkFarInvalid) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(2); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_FALSE(multiend_call.valid()); } @@ -461,7 +461,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupCrossTalkMiddleValid) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(2); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_TRUE(multiend_call.valid()); // Test. @@ -489,7 +489,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupCrossTalkMiddleInvalid) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(2); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_FALSE(multiend_call.valid()); } @@ -510,7 +510,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupCrossTalkMiddleAndPause) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(2); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_TRUE(multiend_call.valid()); // Test. @@ -534,7 +534,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupCrossTalkFullOverlapValid) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(1); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_TRUE(multiend_call.valid()); // Test. @@ -562,7 +562,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupLongSequence) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(2); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_TRUE(multiend_call.valid()); // Test. @@ -592,7 +592,7 @@ TEST(ConversationalSpeechTest, MultiEndCallSetupLongSequenceInvalid) { EXPECT_CALL(*mock_wavreader_factory, Create(_)).Times(2); conversational_speech::MultiEndCall multiend_call( - timing, audiotracks_path, std::move(mock_wavreader_factory)); + timing, kAudioTracksPath, std::move(mock_wavreader_factory)); EXPECT_FALSE(multiend_call.valid()); } diff --git a/third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc b/third_party/libwebrtc/modules/congestion_controller/goog_cc/goog_cc_network_control_unittest.cc @@ -72,7 +72,8 @@ int CountBandwidthDips(std::queue<DataRate> bandwidth_history, } constexpr uint32_t kInitialBitrateKbps = 60; -const DataRate kInitialBitrate = DataRate::KilobitsPerSec(kInitialBitrateKbps); +constexpr DataRate kInitialBitrate = + DataRate::KilobitsPerSec(kInitialBitrateKbps); constexpr float kDefaultPacingRate = 2.5f; CallClient* CreateVideoSendingClient( diff --git a/third_party/libwebrtc/modules/congestion_controller/pcc/bitrate_controller_unittest.cc b/third_party/libwebrtc/modules/congestion_controller/pcc/bitrate_controller_unittest.cc @@ -41,13 +41,13 @@ constexpr double kThroughputPower = 0.99; constexpr double kDelayGradientThreshold = 0.01; constexpr double kDelayGradientNegativeBound = 10; -const DataRate kTargetSendingRate = DataRate::KilobitsPerSec(300); +constexpr DataRate kTargetSendingRate = DataRate::KilobitsPerSec(300); constexpr double kEpsilon = 0.05; -const Timestamp kStartTime = Timestamp::Micros(0); -const TimeDelta kPacketsDelta = TimeDelta::Millis(1); -const TimeDelta kIntervalDuration = TimeDelta::Millis(1000); -const TimeDelta kDefaultRtt = TimeDelta::Millis(1000); -const DataSize kDefaultDataSize = DataSize::Bytes(100); +constexpr Timestamp kStartTime = Timestamp::Micros(0); +constexpr TimeDelta kPacketsDelta = TimeDelta::Millis(1); +constexpr TimeDelta kIntervalDuration = TimeDelta::Millis(1000); +constexpr TimeDelta kDefaultRtt = TimeDelta::Millis(1000); +constexpr DataSize kDefaultDataSize = DataSize::Bytes(100); std::vector<PacketResult> CreatePacketResults( const std::vector<Timestamp>& packets_send_times, diff --git a/third_party/libwebrtc/modules/congestion_controller/pcc/monitor_interval_unittest.cc b/third_party/libwebrtc/modules/congestion_controller/pcc/monitor_interval_unittest.cc @@ -25,12 +25,12 @@ namespace webrtc { namespace pcc { namespace test { namespace { -const DataRate kTargetSendingRate = DataRate::KilobitsPerSec(300); -const Timestamp kStartTime = Timestamp::Micros(0); -const TimeDelta kPacketsDelta = TimeDelta::Millis(1); -const TimeDelta kIntervalDuration = TimeDelta::Millis(100); -const TimeDelta kDefaultDelay = TimeDelta::Millis(100); -const DataSize kDefaultPacketSize = DataSize::Bytes(100); +constexpr DataRate kTargetSendingRate = DataRate::KilobitsPerSec(300); +constexpr Timestamp kStartTime = Timestamp::Micros(0); +constexpr TimeDelta kPacketsDelta = TimeDelta::Millis(1); +constexpr TimeDelta kIntervalDuration = TimeDelta::Millis(100); +constexpr TimeDelta kDefaultDelay = TimeDelta::Millis(100); +constexpr DataSize kDefaultPacketSize = DataSize::Bytes(100); constexpr double kDelayGradientThreshold = 0.01; std::vector<PacketResult> CreatePacketResults( diff --git a/third_party/libwebrtc/modules/congestion_controller/pcc/pcc_network_controller_unittest.cc b/third_party/libwebrtc/modules/congestion_controller/pcc/pcc_network_controller_unittest.cc @@ -34,8 +34,8 @@ namespace webrtc { namespace test { namespace { -const DataRate kInitialBitrate = DataRate::KilobitsPerSec(60); -const Timestamp kDefaultStartTime = Timestamp::Millis(10000000); +constexpr DataRate kInitialBitrate = DataRate::KilobitsPerSec(60); +constexpr Timestamp kDefaultStartTime = Timestamp::Millis(10000000); constexpr double kDataRateMargin = 0.20; constexpr double kMinDataRateFactor = 1 - kDataRateMargin; diff --git a/third_party/libwebrtc/modules/congestion_controller/pcc/rtt_tracker_unittest.cc b/third_party/libwebrtc/modules/congestion_controller/pcc/rtt_tracker_unittest.cc @@ -19,9 +19,9 @@ namespace webrtc { namespace pcc { namespace test { namespace { -const TimeDelta kInitialRtt = TimeDelta::Micros(10); +constexpr TimeDelta kInitialRtt = TimeDelta::Micros(10); constexpr double kAlpha = 0.9; -const Timestamp kStartTime = Timestamp::Seconds(0); +constexpr Timestamp kStartTime = Timestamp::Seconds(0); PacketResult GetPacketWithRtt(TimeDelta rtt) { SentPacket packet; diff --git a/third_party/libwebrtc/modules/congestion_controller/pcc/utility_function_unittest.cc b/third_party/libwebrtc/modules/congestion_controller/pcc/utility_function_unittest.cc @@ -32,13 +32,13 @@ constexpr double kThroughputPower = 0.9; constexpr double kThroughputCoefficient = 1; constexpr double kDelayGradientNegativeBound = 10; -const Timestamp kStartTime = Timestamp::Micros(0); -const TimeDelta kPacketsDelta = TimeDelta::Millis(1); -const TimeDelta kIntervalDuration = TimeDelta::Millis(100); -const DataRate kSendingBitrate = DataRate::BitsPerSec(1000); +constexpr Timestamp kStartTime = Timestamp::Micros(0); +constexpr TimeDelta kPacketsDelta = TimeDelta::Millis(1); +constexpr TimeDelta kIntervalDuration = TimeDelta::Millis(100); +constexpr DataRate kSendingBitrate = DataRate::BitsPerSec(1000); -const DataSize kDefaultDataSize = DataSize::Bytes(100); -const TimeDelta kDefaultDelay = TimeDelta::Millis(100); +constexpr DataSize kDefaultDataSize = DataSize::Bytes(100); +constexpr TimeDelta kDefaultDelay = TimeDelta::Millis(100); std::vector<PacketResult> CreatePacketResults( const std::vector<Timestamp>& packets_send_times, diff --git a/third_party/libwebrtc/modules/video_coding/utility/frame_dropper_unittest.cc b/third_party/libwebrtc/modules/video_coding/utility/frame_dropper_unittest.cc @@ -24,8 +24,8 @@ constexpr size_t kFrameSizeBytes = 1250; constexpr size_t kLargeFrameSizeBytes = 25000; -const bool kIncludeKeyFrame = true; -const bool kDoNotIncludeKeyFrame = false; +constexpr bool kIncludeKeyFrame = true; +constexpr bool kDoNotIncludeKeyFrame = false; } // namespace diff --git a/third_party/libwebrtc/p2p/base/port_unittest.cc b/third_party/libwebrtc/p2p/base/port_unittest.cc @@ -124,7 +124,7 @@ constexpr int kTiebreaker1 = 11111; constexpr int kTiebreaker2 = 22222; constexpr int kTiebreakerDefault = 44444; -const char* kTestData = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; +constexpr char kTestData[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890"; Candidate GetCandidate(Port* port) { RTC_DCHECK_GE(port->Candidates().size(), 1); diff --git a/third_party/libwebrtc/p2p/base/wrapping_active_ice_controller_unittest.cc b/third_party/libwebrtc/p2p/base/wrapping_active_ice_controller_unittest.cc @@ -67,7 +67,7 @@ const Connection* kConnectionThree = const std::vector<const Connection*> kEmptyConnsList = std::vector<const Connection*>(); -const TimeDelta kTick = TimeDelta::Millis(1); +constexpr TimeDelta kTick = TimeDelta::Millis(1); TEST(WrappingActiveIceControllerTest, CreateLegacyIceControllerFromFactory) { AutoThread main; diff --git a/third_party/libwebrtc/rtc_base/async_dns_resolver_unittest.cc b/third_party/libwebrtc/rtc_base/async_dns_resolver_unittest.cc @@ -28,7 +28,7 @@ namespace { using ::testing::IsTrue; -const TimeDelta kDefaultTimeout = TimeDelta::Millis(1000); +constexpr TimeDelta kDefaultTimeout = TimeDelta::Millis(1000); constexpr int kPortNumber = 3027; TEST(AsyncDnsResolver, ConstructorWorks) { diff --git a/third_party/libwebrtc/rtc_base/openssl_utility_unittest.cc b/third_party/libwebrtc/rtc_base/openssl_utility_unittest.cc @@ -34,7 +34,7 @@ namespace webrtc { namespace { // Fake P-256 key for use with the test certificates below. -const unsigned char kFakeSSLPrivateKey[] = { +constexpr unsigned char kFakeSSLPrivateKey[] = { 0x30, 0x81, 0x87, 0x02, 0x01, 0x00, 0x30, 0x13, 0x06, 0x07, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x02, 0x01, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x03, 0x01, 0x07, 0x04, 0x6d, 0x30, 0x6b, 0x02, 0x01, 0x01, 0x04, 0x20, @@ -50,7 +50,7 @@ const unsigned char kFakeSSLPrivateKey[] = { // A self-signed certificate with CN *.webrtc.org and SANs foo.test, *.bar.test, // and test.webrtc.org. -const unsigned char kFakeSSLCertificate[] = { +constexpr unsigned char kFakeSSLCertificate[] = { 0x30, 0x82, 0x02, 0x9e, 0x30, 0x82, 0x02, 0x42, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00, 0xc8, 0x83, 0x59, 0x4d, 0x90, 0xc3, 0x5f, 0xc8, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, @@ -110,7 +110,7 @@ const unsigned char kFakeSSLCertificate[] = { 0xc3, 0x71}; // A self-signed SSL certificate with only the legacy CN field *.webrtc.org. -const unsigned char kFakeSSLCertificateLegacy[] = { +constexpr unsigned char kFakeSSLCertificateLegacy[] = { 0x30, 0x82, 0x02, 0x6a, 0x30, 0x82, 0x02, 0x0e, 0xa0, 0x03, 0x02, 0x01, 0x02, 0x02, 0x09, 0x00, 0xc8, 0x83, 0x59, 0x4d, 0x90, 0xc3, 0x5f, 0xc8, 0x30, 0x0c, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03, 0x02, diff --git a/third_party/libwebrtc/rtc_base/rtc_certificate_unittest.cc b/third_party/libwebrtc/rtc_base/rtc_certificate_unittest.cc @@ -27,7 +27,7 @@ namespace webrtc { namespace { -const char* kTestCertCommonName = "RTCCertificateTest's certificate"; +constexpr char kTestCertCommonName[] = "RTCCertificateTest's certificate"; } // namespace diff --git a/third_party/libwebrtc/rtc_base/ssl_identity_unittest.cc b/third_party/libwebrtc/rtc_base/ssl_identity_unittest.cc @@ -56,23 +56,23 @@ constexpr char kTestCertificate[] = "itAE+OjGF+PFKbwX8Q==\n" "-----END CERTIFICATE-----\n"; -const unsigned char kTestCertSha1[] = {0xA6, 0xC8, 0x59, 0xEA, 0xC3, 0x7E, 0x6D, - 0x33, 0xCF, 0xE2, 0x69, 0x9D, 0x74, 0xE6, - 0xF6, 0x8A, 0x9E, 0x47, 0xA7, 0xCA}; -const unsigned char kTestCertSha224[] = { +constexpr unsigned char kTestCertSha1[] = { + 0xA6, 0xC8, 0x59, 0xEA, 0xC3, 0x7E, 0x6D, 0x33, 0xCF, 0xE2, + 0x69, 0x9D, 0x74, 0xE6, 0xF6, 0x8A, 0x9E, 0x47, 0xA7, 0xCA}; +constexpr unsigned char kTestCertSha224[] = { 0xd4, 0xce, 0xc6, 0xcf, 0x28, 0xcb, 0xe9, 0x77, 0x38, 0x36, 0xcf, 0xb1, 0x3b, 0x4a, 0xd7, 0xbd, 0xae, 0x24, 0x21, 0x08, 0xcf, 0x6a, 0x44, 0x0d, 0x3f, 0x94, 0x2a, 0x5b}; -const unsigned char kTestCertSha256[] = { +constexpr unsigned char kTestCertSha256[] = { 0x41, 0x6b, 0xb4, 0x93, 0x47, 0x79, 0x77, 0x24, 0x77, 0x0b, 0x8b, 0x2e, 0xa6, 0x2b, 0xe0, 0xf9, 0x0a, 0xed, 0x1f, 0x31, 0xa6, 0xf7, 0x5c, 0xa1, 0x5a, 0xc4, 0xb0, 0xa2, 0xa4, 0x78, 0xb9, 0x76}; -const unsigned char kTestCertSha384[] = { +constexpr unsigned char kTestCertSha384[] = { 0x42, 0x31, 0x9a, 0x79, 0x1d, 0xd6, 0x08, 0xbf, 0x3b, 0xba, 0x36, 0xd8, 0x37, 0x4a, 0x9a, 0x75, 0xd3, 0x25, 0x6e, 0x28, 0x92, 0xbe, 0x06, 0xb7, 0xc5, 0xa0, 0x83, 0xe3, 0x86, 0xb1, 0x03, 0xfc, 0x64, 0x47, 0xd6, 0xd8, 0xaa, 0xd9, 0x36, 0x60, 0x04, 0xcc, 0xbe, 0x7d, 0x6a, 0xe8, 0x34, 0x49}; -const unsigned char kTestCertSha512[] = { +constexpr unsigned char kTestCertSha512[] = { 0x51, 0x1d, 0xec, 0x02, 0x3d, 0x51, 0x45, 0xd3, 0xd8, 0x1d, 0xa4, 0x9d, 0x43, 0xc9, 0xee, 0x32, 0x6f, 0x4f, 0x37, 0xee, 0xab, 0x3f, 0x25, 0xdf, 0x72, 0xfc, 0x61, 0x1a, 0xd5, 0x92, 0xff, 0x6b, 0x28, diff --git a/third_party/libwebrtc/test/video_codec_tester_unittest.cc b/third_party/libwebrtc/test/video_codec_tester_unittest.cc @@ -85,8 +85,8 @@ using Stream = VideoCodecTester::VideoCodecStats::Stream; constexpr int kWidth = 2; constexpr int kHeight = 2; -const DataRate kBitrate = DataRate::BytesPerSec(100); -const Frequency kFramerate = Frequency::Hertz(30); +constexpr DataRate kBitrate = DataRate::BytesPerSec(100); +constexpr Frequency kFramerate = Frequency::Hertz(30); constexpr Frequency k90kHz = Frequency::Hertz(90000); scoped_refptr<I420Buffer> CreateYuvBuffer(uint8_t y = 0, diff --git a/third_party/libwebrtc/video/receive_statistics_proxy_unittest.cc b/third_party/libwebrtc/video/receive_statistics_proxy_unittest.cc @@ -49,7 +49,7 @@ namespace internal { namespace { using ::testing::DoubleEq; -const TimeDelta kFreqOffsetProcessInterval = TimeDelta::Seconds(40); +constexpr TimeDelta kFreqOffsetProcessInterval = TimeDelta::Seconds(40); constexpr uint32_t kRemoteSsrc = 456; constexpr int kMinRequiredSamples = 200; constexpr int kWidth = 1280; @@ -1324,11 +1324,11 @@ class ReceiveStatisticsProxyTestWithFreezeDuration // the current one. // // Condition 1: 3 * avg_frame_duration > avg_frame_duration + 150 -const auto kFreezeDetectionCond1Freeze = std::make_tuple(150, 483, 1); -const auto kFreezeDetectionCond1NotFreeze = std::make_tuple(150, 482, 0); +constexpr auto kFreezeDetectionCond1Freeze = std::make_tuple(150, 483, 1); +constexpr auto kFreezeDetectionCond1NotFreeze = std::make_tuple(150, 482, 0); // Condition 2: 3 * avg_frame_duration < avg_frame_duration + 150 -const auto kFreezeDetectionCond2Freeze = std::make_tuple(30, 185, 1); -const auto kFreezeDetectionCond2NotFreeze = std::make_tuple(30, 184, 0); +constexpr auto kFreezeDetectionCond2Freeze = std::make_tuple(30, 185, 1); +constexpr auto kFreezeDetectionCond2NotFreeze = std::make_tuple(30, 184, 0); INSTANTIATE_TEST_SUITE_P(_, ReceiveStatisticsProxyTestWithFreezeDuration, diff --git a/third_party/libwebrtc/video/send_delay_stats_unittest.cc b/third_party/libwebrtc/video/send_delay_stats_unittest.cc @@ -29,7 +29,7 @@ constexpr uint32_t kSsrc2 = 42; constexpr uint32_t kRtxSsrc1 = 18; constexpr uint32_t kRtxSsrc2 = 43; constexpr uint16_t kPacketId = 2345; -const TimeDelta kMaxPacketDelay = TimeDelta::Seconds(11); +constexpr TimeDelta kMaxPacketDelay = TimeDelta::Seconds(11); constexpr int kMinRequiredPeriodicSamples = 5; constexpr int kProcessIntervalMs = 2000; } // namespace diff --git a/third_party/libwebrtc/video/video_stream_encoder_unittest.cc b/third_party/libwebrtc/video/video_stream_encoder_unittest.cc @@ -150,10 +150,10 @@ constexpr int kMinFramerateFps = 2; constexpr int kMinBalancedFramerateFps = 7; constexpr TimeDelta kFrameTimeout = TimeDelta::Millis(100); constexpr size_t kMaxPayloadLength = 1440; -const DataRate kTargetBitrate = DataRate::KilobitsPerSec(1000); -const DataRate kLowTargetBitrate = DataRate::KilobitsPerSec(100); -const DataRate kStartBitrate = DataRate::KilobitsPerSec(600); -const DataRate kSimulcastTargetBitrate = DataRate::KilobitsPerSec(3150); +constexpr DataRate kTargetBitrate = DataRate::KilobitsPerSec(1000); +constexpr DataRate kLowTargetBitrate = DataRate::KilobitsPerSec(100); +constexpr DataRate kStartBitrate = DataRate::KilobitsPerSec(600); +constexpr DataRate kSimulcastTargetBitrate = DataRate::KilobitsPerSec(3150); constexpr int kMaxInitialFramedrop = 4; constexpr int kDefaultFramerate = 30; constexpr int64_t kFrameIntervalMs = kNumMillisecsPerSec / kDefaultFramerate; @@ -175,7 +175,7 @@ constexpr uint8_t kCodedFrameVp8Qp25[] = { #ifdef RTC_ENABLE_H265 // Default value from encoder_info_settings.cc -const DataRate kDefaultH265Bitrate180p = DataRate::KilobitsPerSec(150); +constexpr DataRate kDefaultH265Bitrate180p = DataRate::KilobitsPerSec(150); #endif VideoFrame CreateSimpleNV12Frame() {