zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Optional: Use nullopt and implicit construction in /media

Browse Source 
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.

TBR=pthatcher@webrtc.org

Bug: None
Change-Id: I6dd8677a65f897877fc848aefa7ab37d844e70ed
Reviewed-on: https://webrtc-review.googlesource.com/23573
Commit-Queue: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20816}
This commit is contained in:
Oskar Sundbom
2017-11-16 11:09:55 +01:00
committed by Commit Bot
parent 872cf38c4d
commit 7880758b90
15 changed files with 252 additions and 303 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
media/base/codec_unittest.cc
View File

@ -313,15 +313,14 @@ TEST(CodecTest, TestToCodecParameters) {
EXPECT_EQ(96, codec_params_1.payload_type);
EXPECT_EQ(cricket::MEDIA_TYPE_VIDEO, codec_params_1.kind);
EXPECT_EQ("V", codec_params_1.name);
EXPECT_EQ(rtc::Optional<int>(cricket::kVideoCodecClockrate),
codec_params_1.clock_rate);
EXPECT_EQ(rtc::Optional<int>(), codec_params_1.num_channels);
EXPECT_EQ(cricket::kVideoCodecClockrate, codec_params_1.clock_rate);
EXPECT_EQ(rtc::nullopt, codec_params_1.num_channels);
const AudioCodec a(97, "A", 44100, 20000, 2);
webrtc::RtpCodecParameters codec_params_2 = a.ToCodecParameters();
EXPECT_EQ(97, codec_params_2.payload_type);
EXPECT_EQ(cricket::MEDIA_TYPE_AUDIO, codec_params_2.kind);
EXPECT_EQ("A", codec_params_2.name);
EXPECT_EQ(rtc::Optional<int>(44100), codec_params_2.clock_rate);
EXPECT_EQ(rtc::Optional<int>(2), codec_params_2.num_channels);
EXPECT_EQ(44100, codec_params_2.clock_rate);
EXPECT_EQ(2, codec_params_2.num_channels);
}