admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove IceCandidateType::kNumValues

Browse Source 
Bug: none
Change-Id: I108a006d6ff00f436c87dc9ee5b7e3c27b7b6c83
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/336242
Commit-Queue: Tomas Gunnarsson <tommi@webrtc.org>
Reviewed-by: Björn Terelius <terelius@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#41642}
This commit is contained in:
Tommi 2024-01-29 15:14:33 +01:00 committed by WebRTC LUCI CQ
parent 3cbe63eac1
commit 7cb4ce0079
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
logging/rtc_event_log/encoder/rtc_event_log_encoder_legacy.cc
View File

@ -139,10 +139,6 @@ rtclog::IceCandidatePairConfig::IceCandidateType ConvertIceCandidateType(
return rtclog::IceCandidatePairConfig::PRFLX; return rtclog::IceCandidatePairConfig::PRFLX;
case IceCandidateType::kRelay: case IceCandidateType::kRelay:
return rtclog::IceCandidatePairConfig::RELAY; return rtclog::IceCandidatePairConfig::RELAY;
default:
// TODO(tommi): Remove the default handler when kNumValues is gone.
RTC_DCHECK_NOTREACHED();
return rtclog::IceCandidatePairConfig::UNKNOWN_CANDIDATE_TYPE;
} }
} }
@ -200,6 +196,7 @@ rtclog::IceCandidatePairConfig::NetworkType ConvertIceCandidateNetworkType(
return rtclog::IceCandidatePairConfig::CELLULAR; return rtclog::IceCandidatePairConfig::CELLULAR;
case IceCandidateNetworkType::kNumValues: case IceCandidateNetworkType::kNumValues:
RTC_DCHECK_NOTREACHED(); RTC_DCHECK_NOTREACHED();
break;
} }
RTC_DCHECK_NOTREACHED(); RTC_DCHECK_NOTREACHED();
return rtclog::IceCandidatePairConfig::UNKNOWN_NETWORK_TYPE; return rtclog::IceCandidatePairConfig::UNKNOWN_NETWORK_TYPE;

2
logging/rtc_event_log/encoder/rtc_event_log_encoder_new_format.cc
View File

@ -206,8 +206,6 @@ rtclog2::IceCandidatePairConfig::IceCandidateType ConvertToProtoFormat(
return rtclog2::IceCandidatePairConfig::PRFLX; return rtclog2::IceCandidatePairConfig::PRFLX;
case IceCandidateType::kRelay: case IceCandidateType::kRelay:
return rtclog2::IceCandidatePairConfig::RELAY; return rtclog2::IceCandidatePairConfig::RELAY;
case IceCandidateType::kNumValues:
RTC_DCHECK_NOTREACHED();
} }
RTC_DCHECK_NOTREACHED(); RTC_DCHECK_NOTREACHED();
return rtclog2::IceCandidatePairConfig::UNKNOWN_CANDIDATE_TYPE; return rtclog2::IceCandidatePairConfig::UNKNOWN_CANDIDATE_TYPE;

5
logging/rtc_event_log/events/rtc_event_ice_candidate_pair_config.h
View File

@ -32,14 +32,13 @@ enum class IceCandidatePairConfigType {
kNumValues, kNumValues,
}; };
// TODO(qingsi): Change the names of candidate types to "host", "srflx", "prflx" // TODO(tommi): Change the names of candidate types to "host", "srflx" for
// and "relay" after the naming is spec-compliant in the signaling part // spec-compliance.
enum class IceCandidateType { enum class IceCandidateType {
kLocal, kLocal,
kStun, kStun,
kPrflx, kPrflx,
kRelay, kRelay,
kNumValues,
}; };
enum class IceCandidatePairProtocol { enum class IceCandidatePairProtocol {

25
logging/rtc_event_log/rtc_event_log_unittest_helper.cc
View File

@ -217,10 +217,27 @@ EventGenerator::NewProbeResultSuccess() {
return std::make_unique<RtcEventProbeResultSuccess>(id, bitrate_bps); return std::make_unique<RtcEventProbeResultSuccess>(id, bitrate_bps);
} }
constexpr uint32_t CandidateTypeCount() {
// This switch statement only exists to catch changes to the IceCandidateType
// enumeration. If you get an error here, please update the switch statement
// and the return value.
IceCandidateType type = IceCandidateType::kLocal;
switch (type) {
case IceCandidateType::kLocal:
case IceCandidateType::kStun:
case IceCandidateType::kPrflx:
case IceCandidateType::kRelay:
break;
}
return 4u;
}
std::unique_ptr<RtcEventIceCandidatePairConfig> std::unique_ptr<RtcEventIceCandidatePairConfig>
EventGenerator::NewIceCandidatePairConfig() { EventGenerator::NewIceCandidatePairConfig() {
IceCandidateType local_candidate_type = static_cast<IceCandidateType>( static_assert(static_cast<int>(IceCandidateType::kLocal) == 0,
prng_.Rand(static_cast<uint32_t>(IceCandidateType::kNumValues) - 1)); "Expect kLocal to be the first enum value, equal to 0");
IceCandidateType local_candidate_type =
static_cast<IceCandidateType>(prng_.Rand(CandidateTypeCount() - 1));
IceCandidateNetworkType local_network_type = IceCandidateNetworkType local_network_type =
static_cast<IceCandidateNetworkType>(prng_.Rand( static_cast<IceCandidateNetworkType>(prng_.Rand(
static_cast<uint32_t>(IceCandidateNetworkType::kNumValues) - 1)); static_cast<uint32_t>(IceCandidateNetworkType::kNumValues) - 1));
@ -228,8 +245,8 @@ EventGenerator::NewIceCandidatePairConfig() {
static_cast<IceCandidatePairAddressFamily>(prng_.Rand( static_cast<IceCandidatePairAddressFamily>(prng_.Rand(
static_cast<uint32_t>(IceCandidatePairAddressFamily::kNumValues) - static_cast<uint32_t>(IceCandidatePairAddressFamily::kNumValues) -
1)); 1));
IceCandidateType remote_candidate_type = static_cast<IceCandidateType>( IceCandidateType remote_candidate_type =
prng_.Rand(static_cast<uint32_t>(IceCandidateType::kNumValues) - 1)); static_cast<IceCandidateType>(prng_.Rand(CandidateTypeCount() - 1));
IceCandidatePairAddressFamily remote_address_family = IceCandidatePairAddressFamily remote_address_family =
static_cast<IceCandidatePairAddressFamily>(prng_.Rand( static_cast<IceCandidatePairAddressFamily>(prng_.Rand(
static_cast<uint32_t>(IceCandidatePairAddressFamily::kNumValues) - static_cast<uint32_t>(IceCandidatePairAddressFamily::kNumValues) -

3
rtc_tools/rtc_event_log_to_text/converter.cc
View File

@ -234,8 +234,7 @@ bool Convert(std::string inputfile,
candidate_type_name{{IceCandidateType::kLocal, "LOCAL"}, candidate_type_name{{IceCandidateType::kLocal, "LOCAL"},
{IceCandidateType::kStun, "STUN"}, {IceCandidateType::kStun, "STUN"},
{IceCandidateType::kPrflx, "PRFLX"}, {IceCandidateType::kPrflx, "PRFLX"},
{IceCandidateType::kRelay, "RELAY"}, {IceCandidateType::kRelay, "RELAY"}};
{IceCandidateType::kNumValues, "NUM_VALUES"}};
static const std::map<IceCandidatePairProtocol, std::string> static const std::map<IceCandidatePairProtocol, std::string>
protocol_name{{IceCandidatePairProtocol::kUnknown, "UNKNOWN"}, protocol_name{{IceCandidatePairProtocol::kUnknown, "UNKNOWN"},