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 /ortc

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: Idb0e5e038ad59a6021cb53ef10e8f6733b1da05b
Reviewed-on: https://webrtc-review.googlesource.com/23618
Commit-Queue: Oskar Sundbom <ossu@webrtc.org>
Reviewed-by: Steve Anton <steveanton@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#20864}
This commit is contained in:
Oskar Sundbom
2017-11-16 10:57:44 +01:00
committed by Commit Bot
parent 3ecdd0f02a
commit ff610bd2b2
5 changed files with 27 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ortc/ortcrtpreceiveradapter.cc
View File

@ -22,7 +22,7 @@ namespace {
void FillAudioReceiverParameters(webrtc::RtpParameters* parameters) { void FillAudioReceiverParameters(webrtc::RtpParameters* parameters) {
for (webrtc::RtpCodecParameters& codec : parameters->codecs) { for (webrtc::RtpCodecParameters& codec : parameters->codecs) {
if (!codec.num_channels) { if (!codec.num_channels) {
codec.num_channels = rtc::Optional<int>(1); codec.num_channels = 1;
} }
} }
} }
@ -30,7 +30,7 @@ void FillAudioReceiverParameters(webrtc::RtpParameters* parameters) {
void FillVideoReceiverParameters(webrtc::RtpParameters* parameters) { void FillVideoReceiverParameters(webrtc::RtpParameters* parameters) {
for (webrtc::RtpCodecParameters& codec : parameters->codecs) { for (webrtc::RtpCodecParameters& codec : parameters->codecs) {
if (!codec.clock_rate) { if (!codec.clock_rate) {
codec.clock_rate = rtc::Optional<int>(cricket::kVideoCodecClockrate); codec.clock_rate = cricket::kVideoCodecClockrate;
} }
} }
} }

4
ortc/ortcrtpsenderadapter.cc
View File

@ -21,7 +21,7 @@ namespace {
void FillAudioSenderParameters(webrtc::RtpParameters* parameters) { void FillAudioSenderParameters(webrtc::RtpParameters* parameters) {
for (webrtc::RtpCodecParameters& codec : parameters->codecs) { for (webrtc::RtpCodecParameters& codec : parameters->codecs) {
if (!codec.num_channels) { if (!codec.num_channels) {
codec.num_channels = rtc::Optional<int>(1); codec.num_channels = 1;
} }
} }
} }
@ -29,7 +29,7 @@ void FillAudioSenderParameters(webrtc::RtpParameters* parameters) {
void FillVideoSenderParameters(webrtc::RtpParameters* parameters) { void FillVideoSenderParameters(webrtc::RtpParameters* parameters) {
for (webrtc::RtpCodecParameters& codec : parameters->codecs) { for (webrtc::RtpCodecParameters& codec : parameters->codecs) {
if (!codec.clock_rate) { if (!codec.clock_rate) {
codec.clock_rate = rtc::Optional<int>(cricket::kVideoCodecClockrate); codec.clock_rate = cricket::kVideoCodecClockrate;
} }
} }
} }

31
ortc/rtpparametersconversion.cc
View File

@ -234,47 +234,44 @@ rtc::Optional<RtcpFeedback> ToRtcpFeedback(
const cricket::FeedbackParam& cricket_feedback) { const cricket::FeedbackParam& cricket_feedback) {
if (cricket_feedback.id() == cricket::kRtcpFbParamCcm) { if (cricket_feedback.id() == cricket::kRtcpFbParamCcm) {
if (cricket_feedback.param() == cricket::kRtcpFbCcmParamFir) { if (cricket_feedback.param() == cricket::kRtcpFbCcmParamFir) {
return rtc::Optional<RtcpFeedback>( return RtcpFeedback(RtcpFeedbackType::CCM, RtcpFeedbackMessageType::FIR);
{RtcpFeedbackType::CCM, RtcpFeedbackMessageType::FIR});
} else { } else {
RTC_LOG(LS_WARNING) << "Unsupported parameter for CCM RTCP feedback: " RTC_LOG(LS_WARNING) << "Unsupported parameter for CCM RTCP feedback: "
<< cricket_feedback.param(); << cricket_feedback.param();
return rtc::Optional<RtcpFeedback>(); return rtc::nullopt;
} }
} else if (cricket_feedback.id() == cricket::kRtcpFbParamNack) { } else if (cricket_feedback.id() == cricket::kRtcpFbParamNack) {
if (cricket_feedback.param().empty()) { if (cricket_feedback.param().empty()) {
return rtc::Optional<RtcpFeedback>( return RtcpFeedback(RtcpFeedbackType::NACK,
{RtcpFeedbackType::NACK, RtcpFeedbackMessageType::GENERIC_NACK}); RtcpFeedbackMessageType::GENERIC_NACK);
} else if (cricket_feedback.param() == cricket::kRtcpFbNackParamPli) { } else if (cricket_feedback.param() == cricket::kRtcpFbNackParamPli) {
return rtc::Optional<RtcpFeedback>( return RtcpFeedback(RtcpFeedbackType::NACK, RtcpFeedbackMessageType::PLI);
{RtcpFeedbackType::NACK, RtcpFeedbackMessageType::PLI});
} else { } else {
RTC_LOG(LS_WARNING) << "Unsupported parameter for NACK RTCP feedback: " RTC_LOG(LS_WARNING) << "Unsupported parameter for NACK RTCP feedback: "
<< cricket_feedback.param(); << cricket_feedback.param();
return rtc::Optional<RtcpFeedback>(); return rtc::nullopt;
} }
} else if (cricket_feedback.id() == cricket::kRtcpFbParamRemb) { } else if (cricket_feedback.id() == cricket::kRtcpFbParamRemb) {
if (!cricket_feedback.param().empty()) { if (!cricket_feedback.param().empty()) {
RTC_LOG(LS_WARNING) << "Unsupported parameter for REMB RTCP feedback: " RTC_LOG(LS_WARNING) << "Unsupported parameter for REMB RTCP feedback: "
<< cricket_feedback.param(); << cricket_feedback.param();
return rtc::Optional<RtcpFeedback>(); return rtc::nullopt;
} else { } else {
return rtc::Optional<RtcpFeedback>(RtcpFeedback(RtcpFeedbackType::REMB)); return RtcpFeedback(RtcpFeedbackType::REMB);
} }
} else if (cricket_feedback.id() == cricket::kRtcpFbParamTransportCc) { } else if (cricket_feedback.id() == cricket::kRtcpFbParamTransportCc) {
if (!cricket_feedback.param().empty()) { if (!cricket_feedback.param().empty()) {
RTC_LOG(LS_WARNING) RTC_LOG(LS_WARNING)
<< "Unsupported parameter for transport-cc RTCP feedback: " << "Unsupported parameter for transport-cc RTCP feedback: "
<< cricket_feedback.param(); << cricket_feedback.param();
return rtc::Optional<RtcpFeedback>(); return rtc::nullopt;
} else { } else {
return rtc::Optional<RtcpFeedback>( return RtcpFeedback(RtcpFeedbackType::TRANSPORT_CC);
RtcpFeedback(RtcpFeedbackType::TRANSPORT_CC));
} }
} }
RTC_LOG(LS_WARNING) << "Unsupported RTCP feedback type: " RTC_LOG(LS_WARNING) << "Unsupported RTCP feedback type: "
<< cricket_feedback.id(); << cricket_feedback.id();
return rtc::Optional<RtcpFeedback>(); return rtc::nullopt;
} }
std::vector<RtpEncodingParameters> ToRtpEncodings( std::vector<RtpEncodingParameters> ToRtpEncodings(
@ -314,8 +311,7 @@ template <>
void ToRtpCodecCapabilityTypeSpecific<cricket::AudioCodec>( void ToRtpCodecCapabilityTypeSpecific<cricket::AudioCodec>(
const cricket::AudioCodec& cricket_codec, const cricket::AudioCodec& cricket_codec,
RtpCodecCapability* codec) { RtpCodecCapability* codec) {
codec->num_channels = codec->num_channels = static_cast<int>(cricket_codec.channels);
rtc::Optional<int>(static_cast<int>(cricket_codec.channels));
} }
template <> template <>
@ -355,8 +351,7 @@ template <>
void ToRtpCodecParametersTypeSpecific<cricket::AudioCodec>( void ToRtpCodecParametersTypeSpecific<cricket::AudioCodec>(
const cricket::AudioCodec& cricket_codec, const cricket::AudioCodec& cricket_codec,
RtpCodecParameters* codec) { RtpCodecParameters* codec) {
codec->num_channels = codec->num_channels = static_cast<int>(cricket_codec.channels);
rtc::Optional<int>(static_cast<int>(cricket_codec.channels));
} }
template <> template <>

16
ortc/rtpparametersconversion_unittest.cc
View File

@ -421,9 +421,9 @@ TEST(RtpParametersConversionTest, ToAudioRtpCodecCapability) {
EXPECT_EQ("foo", codec.name); EXPECT_EQ("foo", codec.name);
EXPECT_EQ(cricket::MEDIA_TYPE_AUDIO, codec.kind); EXPECT_EQ(cricket::MEDIA_TYPE_AUDIO, codec.kind);
EXPECT_EQ(rtc::Optional<int>(50), codec.preferred_payload_type); EXPECT_EQ(50, codec.preferred_payload_type);
EXPECT_EQ(rtc::Optional<int>(22222), codec.clock_rate); EXPECT_EQ(22222, codec.clock_rate);
EXPECT_EQ(rtc::Optional<int>(4), codec.num_channels); EXPECT_EQ(4, codec.num_channels);
ASSERT_EQ(1u, codec.parameters.size()); ASSERT_EQ(1u, codec.parameters.size());
EXPECT_EQ("bar", codec.parameters["foo"]); EXPECT_EQ("bar", codec.parameters["foo"]);
EXPECT_EQ(1u, codec.rtcp_feedback.size()); EXPECT_EQ(1u, codec.rtcp_feedback.size());
@ -444,8 +444,8 @@ TEST(RtpParametersConversionTest, ToVideoRtpCodecCapability) {
EXPECT_EQ("VID", codec.name); EXPECT_EQ("VID", codec.name);
EXPECT_EQ(cricket::MEDIA_TYPE_VIDEO, codec.kind); EXPECT_EQ(cricket::MEDIA_TYPE_VIDEO, codec.kind);
EXPECT_EQ(rtc::Optional<int>(101), codec.preferred_payload_type); EXPECT_EQ(101, codec.preferred_payload_type);
EXPECT_EQ(rtc::Optional<int>(80000), codec.clock_rate); EXPECT_EQ(80000, codec.clock_rate);
ASSERT_EQ(2u, codec.parameters.size()); ASSERT_EQ(2u, codec.parameters.size());
EXPECT_EQ("bar", codec.parameters["foo"]); EXPECT_EQ("bar", codec.parameters["foo"]);
EXPECT_EQ("param", codec.parameters["ANOTHER"]); EXPECT_EQ("param", codec.parameters["ANOTHER"]);
@ -496,8 +496,8 @@ TEST(RtpParametersConversionTest, ToAudioRtpCodecParameters) {
EXPECT_EQ("foo", codec.name); EXPECT_EQ("foo", codec.name);
EXPECT_EQ(cricket::MEDIA_TYPE_AUDIO, codec.kind); EXPECT_EQ(cricket::MEDIA_TYPE_AUDIO, codec.kind);
EXPECT_EQ(50, codec.payload_type); EXPECT_EQ(50, codec.payload_type);
EXPECT_EQ(rtc::Optional<int>(22222), codec.clock_rate); EXPECT_EQ(22222, codec.clock_rate);
EXPECT_EQ(rtc::Optional<int>(4), codec.num_channels); EXPECT_EQ(4, codec.num_channels);
ASSERT_EQ(1u, codec.parameters.size()); ASSERT_EQ(1u, codec.parameters.size());
EXPECT_EQ("bar", codec.parameters["foo"]); EXPECT_EQ("bar", codec.parameters["foo"]);
EXPECT_EQ(1u, codec.rtcp_feedback.size()); EXPECT_EQ(1u, codec.rtcp_feedback.size());
@ -519,7 +519,7 @@ TEST(RtpParametersConversionTest, ToVideoRtpCodecParameters) {
EXPECT_EQ("VID", codec.name); EXPECT_EQ("VID", codec.name);
EXPECT_EQ(cricket::MEDIA_TYPE_VIDEO, codec.kind); EXPECT_EQ(cricket::MEDIA_TYPE_VIDEO, codec.kind);
EXPECT_EQ(101, codec.payload_type); EXPECT_EQ(101, codec.payload_type);
EXPECT_EQ(rtc::Optional<int>(80000), codec.clock_rate); EXPECT_EQ(80000, codec.clock_rate);
ASSERT_EQ(2u, codec.parameters.size()); ASSERT_EQ(2u, codec.parameters.size());
EXPECT_EQ("bar", codec.parameters["foo"]); EXPECT_EQ("bar", codec.parameters["foo"]);
EXPECT_EQ("param", codec.parameters["ANOTHER"]); EXPECT_EQ("param", codec.parameters["ANOTHER"]);

4
ortc/rtptransportadapter.cc
View File

@ -204,7 +204,7 @@ RTCError RtpTransportAdapter::SetSrtpSendKey(
webrtc::RTCErrorType::UNSUPPORTED_OPERATION, webrtc::RTCErrorType::UNSUPPORTED_OPERATION,
"The send key and receive key must have the same cipher suite."); "The send key and receive key must have the same cipher suite.");
} }
send_key_ = rtc::Optional<cricket::CryptoParams>(params); send_key_ = params;
return RTCError::OK(); return RTCError::OK();
} }
@ -220,7 +220,7 @@ RTCError RtpTransportAdapter::SetSrtpReceiveKey(
webrtc::RTCErrorType::UNSUPPORTED_OPERATION, webrtc::RTCErrorType::UNSUPPORTED_OPERATION,
"The send key and receive key must have the same cipher suite."); "The send key and receive key must have the same cipher suite.");
} }
receive_key_ = rtc::Optional<cricket::CryptoParams>(params); receive_key_ = params;
return RTCError::OK(); return RTCError::OK();
} }