From fedc00c391510eec26aac7ad36c1be11a4b1c94b Mon Sep 17 00:00:00 2001 From: Oskar Sundbom Date: Thu, 16 Nov 2017 10:55:08 +0100 Subject: [PATCH] Optional: Use nullopt and implicit construction in /call Changes places where we explicitly construct an Optional to instead use nullopt or the requisite value type only. This CL was uploaded by git cl split. Bug: None Change-Id: I25e460b7a848c765369ce881f8833081eedf2558 Reviewed-on: https://webrtc-review.googlesource.com/23600 Reviewed-by: Karl Wiberg Commit-Queue: Oskar Sundbom Cr-Commit-Position: refs/heads/master@{#21575} --- call/call_perf_tests.cc | 5 ++--- call/call_unittest.cc | 30 ++++++++++++++---------------- call/rtp_rtcp_demuxer_helper.cc | 8 ++++---- 3 files changed, 20 insertions(+), 23 deletions(-) diff --git a/call/call_perf_tests.cc b/call/call_perf_tests.cc index 8e734e963a..47295056df 100644 --- a/call/call_perf_tests.cc +++ b/call/call_perf_tests.cc @@ -239,9 +239,8 @@ void CallPerfTest::TestAudioVideoSync(FecMode fec, AudioSendStream::Config audio_send_config(audio_send_transport.get()); audio_send_config.voe_channel_id = send_channel_id; audio_send_config.rtp.ssrc = kAudioSendSsrc; - audio_send_config.send_codec_spec = - rtc::Optional( - {kAudioSendPayloadType, {"ISAC", 16000, 1}}); + audio_send_config.send_codec_spec = AudioSendStream::Config::SendCodecSpec( + kAudioSendPayloadType, {"ISAC", 16000, 1}); audio_send_config.encoder_factory = CreateBuiltinAudioEncoderFactory(); audio_send_stream = sender_call_->CreateAudioSendStream(audio_send_config); diff --git a/call/call_unittest.cc b/call/call_unittest.cc index bf1fe53543..a9bb36fff9 100644 --- a/call/call_unittest.cc +++ b/call/call_unittest.cc @@ -499,7 +499,7 @@ TEST(CallTest, RecreatingAudioStreamWithSameSsrcReusesRtpState) { TEST(CallBitrateTest, BiggerMaskMinUsed) { CallBitrateHelper call; Call::Config::BitrateConfigMask mask; - mask.min_bitrate_bps = rtc::Optional(1234); + mask.min_bitrate_bps = 1234; EXPECT_CALL(call.mock_cc(), SetBweBitrates(*mask.min_bitrate_bps, testing::_, testing::_)); @@ -509,7 +509,7 @@ TEST(CallBitrateTest, BiggerMaskMinUsed) { TEST(CallBitrateTest, BiggerConfigMinUsed) { CallBitrateHelper call; Call::Config::BitrateConfigMask mask; - mask.min_bitrate_bps = rtc::Optional(1000); + mask.min_bitrate_bps = 1000; EXPECT_CALL(call.mock_cc(), SetBweBitrates(1000, testing::_, testing::_)); call->SetBitrateConfigMask(mask); @@ -524,7 +524,7 @@ TEST(CallBitrateTest, BiggerConfigMinUsed) { TEST(CallBitrateTest, LatestStartMaskPreferred) { CallBitrateHelper call; Call::Config::BitrateConfigMask mask; - mask.start_bitrate_bps = rtc::Optional(1300); + mask.start_bitrate_bps = 1300; EXPECT_CALL(call.mock_cc(), SetBweBitrates(testing::_, *mask.start_bitrate_bps, testing::_)); @@ -545,8 +545,7 @@ TEST(CallBitrateTest, SmallerMaskMaxUsed) { CallBitrateHelper call(bitrate_config); Call::Config::BitrateConfigMask mask; - mask.max_bitrate_bps = - rtc::Optional(bitrate_config.start_bitrate_bps + 1000); + mask.max_bitrate_bps = bitrate_config.start_bitrate_bps + 1000; EXPECT_CALL(call.mock_cc(), SetBweBitrates(testing::_, testing::_, *mask.max_bitrate_bps)); @@ -559,8 +558,7 @@ TEST(CallBitrateTest, SmallerConfigMaxUsed) { CallBitrateHelper call(bitrate_config); Call::Config::BitrateConfigMask mask; - mask.max_bitrate_bps = - rtc::Optional(bitrate_config.start_bitrate_bps + 2000); + mask.max_bitrate_bps = bitrate_config.start_bitrate_bps + 2000; // Expect no calls because nothing changes EXPECT_CALL(call.mock_cc(), @@ -575,7 +573,7 @@ TEST(CallBitrateTest, MaskStartLessThanConfigMinClamped) { CallBitrateHelper call(bitrate_config); Call::Config::BitrateConfigMask mask; - mask.start_bitrate_bps = rtc::Optional(1000); + mask.start_bitrate_bps = 1000; EXPECT_CALL(call.mock_cc(), SetBweBitrates(2000, 2000, testing::_)); call->SetBitrateConfigMask(mask); @@ -587,7 +585,7 @@ TEST(CallBitrateTest, MaskStartGreaterThanConfigMaxClamped) { CallBitrateHelper call(bitrate_config); Call::Config::BitrateConfigMask mask; - mask.max_bitrate_bps = rtc::Optional(1000); + mask.max_bitrate_bps = 1000; EXPECT_CALL(call.mock_cc(), SetBweBitrates(testing::_, -1, 1000)); call->SetBitrateConfigMask(mask); @@ -599,7 +597,7 @@ TEST(CallBitrateTest, MaskMinGreaterThanConfigMaxClamped) { CallBitrateHelper call(bitrate_config); Call::Config::BitrateConfigMask mask; - mask.max_bitrate_bps = rtc::Optional(1000); + mask.max_bitrate_bps = 1000; EXPECT_CALL(call.mock_cc(), SetBweBitrates(1000, testing::_, 1000)); call->SetBitrateConfigMask(mask); @@ -609,7 +607,7 @@ TEST(CallBitrateTest, SettingMaskStartForcesUpdate) { CallBitrateHelper call; Call::Config::BitrateConfigMask mask; - mask.start_bitrate_bps = rtc::Optional(1000); + mask.start_bitrate_bps = 1000; // SetBweBitrates should be called twice with the same params since // start_bitrate_bps is set. @@ -654,7 +652,7 @@ TEST(CallBitrateTest, SetBweBitratesNotCalledWhenEffectiveMaxUnchanged) { // Reduce effective max to 1000 with the mask. Call::Config::BitrateConfigMask mask; - mask.max_bitrate_bps = rtc::Optional(1000); + mask.max_bitrate_bps = 1000; EXPECT_CALL(call.mock_cc(), SetBweBitrates(testing::_, testing::_, 1000)); call->SetBitrateConfigMask(mask); @@ -670,7 +668,7 @@ TEST(CallBitrateTest, SetBweBitratesNotCalledWhenStartMaskRemoved) { CallBitrateHelper call; Call::Config::BitrateConfigMask mask; - mask.start_bitrate_bps = rtc::Optional(1000); + mask.start_bitrate_bps = 1000; EXPECT_CALL(call.mock_cc(), SetBweBitrates(0, 1000, -1)); call->SetBitrateConfigMask(mask); @@ -685,7 +683,7 @@ TEST(CallBitrateTest, SetBitrateConfigAfterSetBitrateConfigMaskWithStart) { CallBitrateHelper call; Call::Config::BitrateConfigMask mask; - mask.start_bitrate_bps = rtc::Optional(1000); + mask.start_bitrate_bps = 1000; EXPECT_CALL(call.mock_cc(), SetBweBitrates(0, 1000, -1)); call->SetBitrateConfigMask(mask); @@ -707,12 +705,12 @@ TEST(CallBitrateTest, SetBweBitratesNotCalledWhenClampedMinUnchanged) { // Set min to 2000; it is clamped to the max (1000). Call::Config::BitrateConfigMask mask; - mask.min_bitrate_bps = rtc::Optional(2000); + mask.min_bitrate_bps = 2000; EXPECT_CALL(call.mock_cc(), SetBweBitrates(1000, -1, 1000)); call->SetBitrateConfigMask(mask); // Set min to 3000; the clamped value stays the same so nothing happens. - mask.min_bitrate_bps = rtc::Optional(3000); + mask.min_bitrate_bps = 3000; call->SetBitrateConfigMask(mask); } diff --git a/call/rtp_rtcp_demuxer_helper.cc b/call/rtp_rtcp_demuxer_helper.cc index d36242b11b..deabe73842 100644 --- a/call/rtp_rtcp_demuxer_helper.cc +++ b/call/rtp_rtcp_demuxer_helper.cc @@ -27,7 +27,7 @@ rtc::Optional ParseRtcpPacketSenderSsrc( for (const uint8_t* next_packet = packet.begin(); next_packet < packet.end(); next_packet = header.NextPacket()) { if (!header.Parse(next_packet, packet.end() - next_packet)) { - return rtc::Optional(); + return rtc::nullopt; } switch (header.type()) { @@ -41,15 +41,15 @@ rtc::Optional ParseRtcpPacketSenderSsrc( if (header.payload_size_bytes() >= sizeof(uint32_t)) { const uint32_t ssrc_sender = ByteReader::ReadBigEndian(header.payload()); - return rtc::Optional(ssrc_sender); + return ssrc_sender; } else { - return rtc::Optional(); + return rtc::nullopt; } } } } - return rtc::Optional(); + return rtc::nullopt; } } // namespace webrtc