Fix -Wunused-but-set-variable.
Bug: None Change-Id: I8943227108e46c4c942895e4bd8fb276947502e0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/236525 Reviewed-by: Harald Alvestrand <hta@webrtc.org> Reviewed-by: Sergey Silkin <ssilkin@webrtc.org> Reviewed-by: Alessio Bazzica <alessiob@webrtc.org> Reviewed-by: Niels Moller <nisse@webrtc.org> Reviewed-by: Björn Terelius <terelius@webrtc.org> Reviewed-by: Henrik Lundin <henrik.lundin@webrtc.org> Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org> Cr-Commit-Position: refs/heads/main@{#35272}
This commit is contained in:
parent
9ae0c1c348
commit
e5e78c4521
@ -182,20 +182,16 @@ void RampUpTester::ModifyVideoConfigs(
|
|||||||
|
|
||||||
send_config->rtp.extensions.clear();
|
send_config->rtp.extensions.clear();
|
||||||
|
|
||||||
bool remb;
|
|
||||||
bool transport_cc;
|
bool transport_cc;
|
||||||
if (extension_type_ == RtpExtension::kAbsSendTimeUri) {
|
if (extension_type_ == RtpExtension::kAbsSendTimeUri) {
|
||||||
remb = true;
|
|
||||||
transport_cc = false;
|
transport_cc = false;
|
||||||
send_config->rtp.extensions.push_back(
|
send_config->rtp.extensions.push_back(
|
||||||
RtpExtension(extension_type_.c_str(), kAbsSendTimeExtensionId));
|
RtpExtension(extension_type_.c_str(), kAbsSendTimeExtensionId));
|
||||||
} else if (extension_type_ == RtpExtension::kTransportSequenceNumberUri) {
|
} else if (extension_type_ == RtpExtension::kTransportSequenceNumberUri) {
|
||||||
remb = false;
|
|
||||||
transport_cc = true;
|
transport_cc = true;
|
||||||
send_config->rtp.extensions.push_back(RtpExtension(
|
send_config->rtp.extensions.push_back(RtpExtension(
|
||||||
extension_type_.c_str(), kTransportSequenceNumberExtensionId));
|
extension_type_.c_str(), kTransportSequenceNumberExtensionId));
|
||||||
} else {
|
} else {
|
||||||
remb = true;
|
|
||||||
transport_cc = false;
|
transport_cc = false;
|
||||||
send_config->rtp.extensions.push_back(RtpExtension(
|
send_config->rtp.extensions.push_back(RtpExtension(
|
||||||
extension_type_.c_str(), kTransmissionTimeOffsetExtensionId));
|
extension_type_.c_str(), kTransmissionTimeOffsetExtensionId));
|
||||||
|
|||||||
@ -8828,7 +8828,6 @@ class WebRtcVideoChannelSimulcastTest : public ::testing::Test {
|
|||||||
ASSERT_EQ(expected_streams.size(), video_streams.size());
|
ASSERT_EQ(expected_streams.size(), video_streams.size());
|
||||||
|
|
||||||
size_t num_streams = video_streams.size();
|
size_t num_streams = video_streams.size();
|
||||||
int total_max_bitrate_bps = 0;
|
|
||||||
for (size_t i = 0; i < num_streams; ++i) {
|
for (size_t i = 0; i < num_streams; ++i) {
|
||||||
EXPECT_EQ(expected_streams[i].width, video_streams[i].width);
|
EXPECT_EQ(expected_streams[i].width, video_streams[i].width);
|
||||||
EXPECT_EQ(expected_streams[i].height, video_streams[i].height);
|
EXPECT_EQ(expected_streams[i].height, video_streams[i].height);
|
||||||
@ -8859,12 +8858,6 @@ class WebRtcVideoChannelSimulcastTest : public ::testing::Test {
|
|||||||
EXPECT_EQ(expected_streams[i].num_temporal_layers,
|
EXPECT_EQ(expected_streams[i].num_temporal_layers,
|
||||||
video_streams[i].num_temporal_layers);
|
video_streams[i].num_temporal_layers);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (i == num_streams - 1) {
|
|
||||||
total_max_bitrate_bps += video_streams[i].max_bitrate_bps;
|
|
||||||
} else {
|
|
||||||
total_max_bitrate_bps += video_streams[i].target_bitrate_bps;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
EXPECT_TRUE(channel_->SetVideoSend(ssrcs.front(), nullptr, nullptr));
|
EXPECT_TRUE(channel_->SetVideoSend(ssrcs.front(), nullptr, nullptr));
|
||||||
|
|||||||
@ -138,7 +138,6 @@ TEST_P(SplitBySamplesTest, PayloadSizes) {
|
|||||||
|
|
||||||
EXPECT_EQ(expected_split.num_frames, results.size());
|
EXPECT_EQ(expected_split.num_frames, results.size());
|
||||||
uint32_t expected_timestamp = kBaseTimestamp;
|
uint32_t expected_timestamp = kBaseTimestamp;
|
||||||
uint32_t expected_byte_offset = 0;
|
|
||||||
uint8_t value = 0;
|
uint8_t value = 0;
|
||||||
for (size_t i = 0; i != expected_split.num_frames; ++i) {
|
for (size_t i = 0; i != expected_split.num_frames; ++i) {
|
||||||
const auto& result = results[i];
|
const auto& result = results[i];
|
||||||
@ -155,7 +154,6 @@ TEST_P(SplitBySamplesTest, PayloadSizes) {
|
|||||||
|
|
||||||
expected_timestamp += rtc::checked_cast<uint32_t>(
|
expected_timestamp += rtc::checked_cast<uint32_t>(
|
||||||
expected_split.frame_sizes[i] * samples_per_ms_);
|
expected_split.frame_sizes[i] * samples_per_ms_);
|
||||||
expected_byte_offset += rtc::checked_cast<uint32_t>(length_bytes);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@ -135,11 +135,9 @@ TEST_F(ExpandTest, DelayedPacketOutage) {
|
|||||||
// arrived before it).
|
// arrived before it).
|
||||||
TEST_F(ExpandTest, LostPacketOutage) {
|
TEST_F(ExpandTest, LostPacketOutage) {
|
||||||
AudioMultiVector output(num_channels_);
|
AudioMultiVector output(num_channels_);
|
||||||
size_t sum_output_len_samples = 0;
|
|
||||||
for (int i = 0; i < 10; ++i) {
|
for (int i = 0; i < 10; ++i) {
|
||||||
EXPECT_EQ(0, expand_.Process(&output));
|
EXPECT_EQ(0, expand_.Process(&output));
|
||||||
EXPECT_GT(output.Size(), 0u);
|
EXPECT_GT(output.Size(), 0u);
|
||||||
sum_output_len_samples += output.Size();
|
|
||||||
EXPECT_EQ(0, statistics_.last_outage_duration_samples());
|
EXPECT_EQ(0, statistics_.last_outage_duration_samples());
|
||||||
}
|
}
|
||||||
expand_.SetParametersForMergeAfterExpand();
|
expand_.SetParametersForMergeAfterExpand();
|
||||||
|
|||||||
@ -372,7 +372,6 @@ class NetEqBgnTest : public NetEqDecodingTest {
|
|||||||
PopulateRtpInfo(0, 0, &rtp_info);
|
PopulateRtpInfo(0, 0, &rtp_info);
|
||||||
rtp_info.payloadType = payload_type;
|
rtp_info.payloadType = payload_type;
|
||||||
|
|
||||||
uint32_t receive_timestamp = 0;
|
|
||||||
bool muted;
|
bool muted;
|
||||||
for (int n = 0; n < 10; ++n) { // Insert few packets and get audio.
|
for (int n = 0; n < 10; ++n) { // Insert few packets and get audio.
|
||||||
auto block = input.GetNextBlock();
|
auto block = input.GetNextBlock();
|
||||||
@ -393,8 +392,6 @@ class NetEqBgnTest : public NetEqDecodingTest {
|
|||||||
rtp_info.timestamp +=
|
rtp_info.timestamp +=
|
||||||
rtc::checked_cast<uint32_t>(expected_samples_per_channel);
|
rtc::checked_cast<uint32_t>(expected_samples_per_channel);
|
||||||
rtp_info.sequenceNumber++;
|
rtp_info.sequenceNumber++;
|
||||||
receive_timestamp +=
|
|
||||||
rtc::checked_cast<uint32_t>(expected_samples_per_channel);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
output.Reset();
|
output.Reset();
|
||||||
|
|||||||
@ -257,11 +257,6 @@ void ISACTest::EncodeDecode(int testNr,
|
|||||||
wbISACConfig),
|
wbISACConfig),
|
||||||
kISAC16kPayloadType));
|
kISAC16kPayloadType));
|
||||||
|
|
||||||
bool adaptiveMode = false;
|
|
||||||
if ((swbISACConfig.currentRateBitPerSec == -1) ||
|
|
||||||
(wbISACConfig.currentRateBitPerSec == -1)) {
|
|
||||||
adaptiveMode = true;
|
|
||||||
}
|
|
||||||
_myTimer.Reset();
|
_myTimer.Reset();
|
||||||
_channel_A2B->ResetStats();
|
_channel_A2B->ResetStats();
|
||||||
_channel_B2A->ResetStats();
|
_channel_B2A->ResetStats();
|
||||||
|
|||||||
@ -118,12 +118,11 @@ TEST(RnnVadTest, CepstralFeaturesConstantAverageZeroDerivative) {
|
|||||||
std::array<float, kFrameSize20ms24kHz> samples;
|
std::array<float, kFrameSize20ms24kHz> samples;
|
||||||
rtc::ArrayView<float, kFrameSize20ms24kHz> samples_view(samples);
|
rtc::ArrayView<float, kFrameSize20ms24kHz> samples_view(samples);
|
||||||
WriteTestData(samples);
|
WriteTestData(samples);
|
||||||
bool is_silence;
|
|
||||||
|
|
||||||
// Fill the spectral features with test data.
|
// Fill the spectral features with test data.
|
||||||
std::array<float, kTestFeatureVectorSize> feature_vector;
|
std::array<float, kTestFeatureVectorSize> feature_vector;
|
||||||
for (int i = 0; i < kCepstralCoeffsHistorySize; ++i) {
|
for (int i = 0; i < kCepstralCoeffsHistorySize; ++i) {
|
||||||
is_silence = sfe.CheckSilenceComputeFeatures(
|
sfe.CheckSilenceComputeFeatures(
|
||||||
samples_view, samples_view, GetHigherBandsSpectrum(&feature_vector),
|
samples_view, samples_view, GetHigherBandsSpectrum(&feature_vector),
|
||||||
GetAverage(&feature_vector), GetFirstDerivative(&feature_vector),
|
GetAverage(&feature_vector), GetFirstDerivative(&feature_vector),
|
||||||
GetSecondDerivative(&feature_vector),
|
GetSecondDerivative(&feature_vector),
|
||||||
@ -133,7 +132,7 @@ TEST(RnnVadTest, CepstralFeaturesConstantAverageZeroDerivative) {
|
|||||||
|
|
||||||
// Feed the test data one last time but using a different output vector.
|
// Feed the test data one last time but using a different output vector.
|
||||||
std::array<float, kTestFeatureVectorSize> feature_vector_last;
|
std::array<float, kTestFeatureVectorSize> feature_vector_last;
|
||||||
is_silence = sfe.CheckSilenceComputeFeatures(
|
sfe.CheckSilenceComputeFeatures(
|
||||||
samples_view, samples_view, GetHigherBandsSpectrum(&feature_vector_last),
|
samples_view, samples_view, GetHigherBandsSpectrum(&feature_vector_last),
|
||||||
GetAverage(&feature_vector_last),
|
GetAverage(&feature_vector_last),
|
||||||
GetFirstDerivative(&feature_vector_last),
|
GetFirstDerivative(&feature_vector_last),
|
||||||
|
|||||||
@ -156,30 +156,22 @@ class ChannelTest : public ::testing::Test, public sigslot::has_slots<> {
|
|||||||
// channels.
|
// channels.
|
||||||
RTC_DCHECK_EQ(flags1 & RAW_PACKET_TRANSPORT, flags2 & RAW_PACKET_TRANSPORT);
|
RTC_DCHECK_EQ(flags1 & RAW_PACKET_TRANSPORT, flags2 & RAW_PACKET_TRANSPORT);
|
||||||
rtc::Thread* worker_thread = rtc::Thread::Current();
|
rtc::Thread* worker_thread = rtc::Thread::Current();
|
||||||
rtc::PacketTransportInternal* rtp1 = nullptr;
|
|
||||||
rtc::PacketTransportInternal* rtcp1 = nullptr;
|
|
||||||
rtc::PacketTransportInternal* rtp2 = nullptr;
|
|
||||||
rtc::PacketTransportInternal* rtcp2 = nullptr;
|
|
||||||
// Based on flags, create fake DTLS or raw packet transports.
|
// Based on flags, create fake DTLS or raw packet transports.
|
||||||
if (flags1 & RAW_PACKET_TRANSPORT) {
|
if (flags1 & RAW_PACKET_TRANSPORT) {
|
||||||
fake_rtp_packet_transport1_.reset(
|
fake_rtp_packet_transport1_.reset(
|
||||||
new rtc::FakePacketTransport("channel1_rtp"));
|
new rtc::FakePacketTransport("channel1_rtp"));
|
||||||
rtp1 = fake_rtp_packet_transport1_.get();
|
|
||||||
if (!(flags1 & RTCP_MUX)) {
|
if (!(flags1 & RTCP_MUX)) {
|
||||||
fake_rtcp_packet_transport1_.reset(
|
fake_rtcp_packet_transport1_.reset(
|
||||||
new rtc::FakePacketTransport("channel1_rtcp"));
|
new rtc::FakePacketTransport("channel1_rtcp"));
|
||||||
rtcp1 = fake_rtcp_packet_transport1_.get();
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Confirmed to work with KT_RSA and KT_ECDSA.
|
// Confirmed to work with KT_RSA and KT_ECDSA.
|
||||||
fake_rtp_dtls_transport1_.reset(new cricket::FakeDtlsTransport(
|
fake_rtp_dtls_transport1_.reset(new cricket::FakeDtlsTransport(
|
||||||
"channel1", cricket::ICE_CANDIDATE_COMPONENT_RTP, network_thread_));
|
"channel1", cricket::ICE_CANDIDATE_COMPONENT_RTP, network_thread_));
|
||||||
rtp1 = fake_rtp_dtls_transport1_.get();
|
|
||||||
if (!(flags1 & RTCP_MUX)) {
|
if (!(flags1 & RTCP_MUX)) {
|
||||||
fake_rtcp_dtls_transport1_.reset(new cricket::FakeDtlsTransport(
|
fake_rtcp_dtls_transport1_.reset(new cricket::FakeDtlsTransport(
|
||||||
"channel1", cricket::ICE_CANDIDATE_COMPONENT_RTCP,
|
"channel1", cricket::ICE_CANDIDATE_COMPONENT_RTCP,
|
||||||
network_thread_));
|
network_thread_));
|
||||||
rtcp1 = fake_rtcp_dtls_transport1_.get();
|
|
||||||
}
|
}
|
||||||
if (flags1 & DTLS) {
|
if (flags1 & DTLS) {
|
||||||
auto cert1 = rtc::RTCCertificate::Create(
|
auto cert1 = rtc::RTCCertificate::Create(
|
||||||
@ -194,22 +186,18 @@ class ChannelTest : public ::testing::Test, public sigslot::has_slots<> {
|
|||||||
if (flags2 & RAW_PACKET_TRANSPORT) {
|
if (flags2 & RAW_PACKET_TRANSPORT) {
|
||||||
fake_rtp_packet_transport2_.reset(
|
fake_rtp_packet_transport2_.reset(
|
||||||
new rtc::FakePacketTransport("channel2_rtp"));
|
new rtc::FakePacketTransport("channel2_rtp"));
|
||||||
rtp2 = fake_rtp_packet_transport2_.get();
|
|
||||||
if (!(flags2 & RTCP_MUX)) {
|
if (!(flags2 & RTCP_MUX)) {
|
||||||
fake_rtcp_packet_transport2_.reset(
|
fake_rtcp_packet_transport2_.reset(
|
||||||
new rtc::FakePacketTransport("channel2_rtcp"));
|
new rtc::FakePacketTransport("channel2_rtcp"));
|
||||||
rtcp2 = fake_rtcp_packet_transport2_.get();
|
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Confirmed to work with KT_RSA and KT_ECDSA.
|
// Confirmed to work with KT_RSA and KT_ECDSA.
|
||||||
fake_rtp_dtls_transport2_.reset(new cricket::FakeDtlsTransport(
|
fake_rtp_dtls_transport2_.reset(new cricket::FakeDtlsTransport(
|
||||||
"channel2", cricket::ICE_CANDIDATE_COMPONENT_RTP, network_thread_));
|
"channel2", cricket::ICE_CANDIDATE_COMPONENT_RTP, network_thread_));
|
||||||
rtp2 = fake_rtp_dtls_transport2_.get();
|
|
||||||
if (!(flags2 & RTCP_MUX)) {
|
if (!(flags2 & RTCP_MUX)) {
|
||||||
fake_rtcp_dtls_transport2_.reset(new cricket::FakeDtlsTransport(
|
fake_rtcp_dtls_transport2_.reset(new cricket::FakeDtlsTransport(
|
||||||
"channel2", cricket::ICE_CANDIDATE_COMPONENT_RTCP,
|
"channel2", cricket::ICE_CANDIDATE_COMPONENT_RTCP,
|
||||||
network_thread_));
|
network_thread_));
|
||||||
rtcp2 = fake_rtcp_dtls_transport2_.get();
|
|
||||||
}
|
}
|
||||||
if (flags2 & DTLS) {
|
if (flags2 & DTLS) {
|
||||||
auto cert2 = rtc::RTCCertificate::Create(
|
auto cert2 = rtc::RTCCertificate::Create(
|
||||||
|
|||||||
@ -144,8 +144,7 @@ TEST(SwapQueueDeathTest, UnsuccessfulItemVerifyFunctor) {
|
|||||||
int invalid_value = -4;
|
int invalid_value = -4;
|
||||||
EXPECT_TRUE(queue.Insert(&valid_value));
|
EXPECT_TRUE(queue.Insert(&valid_value));
|
||||||
EXPECT_TRUE(queue.Remove(&valid_value));
|
EXPECT_TRUE(queue.Remove(&valid_value));
|
||||||
bool result;
|
EXPECT_DEATH((void)queue.Insert(&invalid_value), "");
|
||||||
EXPECT_DEATH(result = queue.Insert(&invalid_value), "");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(SwapQueueDeathTest, UnSuccessfulItemVerifyInsert) {
|
TEST(SwapQueueDeathTest, UnSuccessfulItemVerifyInsert) {
|
||||||
@ -154,8 +153,7 @@ TEST(SwapQueueDeathTest, UnSuccessfulItemVerifyInsert) {
|
|||||||
SwapQueueItemVerifier<std::vector<int>, &LengthVerifierFunction>>
|
SwapQueueItemVerifier<std::vector<int>, &LengthVerifierFunction>>
|
||||||
queue(2, template_element);
|
queue(2, template_element);
|
||||||
std::vector<int> invalid_chunk(kChunkSize - 1, 0);
|
std::vector<int> invalid_chunk(kChunkSize - 1, 0);
|
||||||
bool result;
|
EXPECT_DEATH((void)queue.Insert(&invalid_chunk), "");
|
||||||
EXPECT_DEATH(result = queue.Insert(&invalid_chunk), "");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
TEST(SwapQueueDeathTest, UnSuccessfulItemVerifyRemove) {
|
TEST(SwapQueueDeathTest, UnSuccessfulItemVerifyRemove) {
|
||||||
@ -167,8 +165,7 @@ TEST(SwapQueueDeathTest, UnSuccessfulItemVerifyRemove) {
|
|||||||
std::vector<int> valid_chunk(kChunkSize, 0);
|
std::vector<int> valid_chunk(kChunkSize, 0);
|
||||||
EXPECT_TRUE(queue.Insert(&valid_chunk));
|
EXPECT_TRUE(queue.Insert(&valid_chunk));
|
||||||
EXPECT_EQ(valid_chunk.size(), kChunkSize);
|
EXPECT_EQ(valid_chunk.size(), kChunkSize);
|
||||||
bool result;
|
EXPECT_DEATH((void)queue.Remove(&invalid_chunk), "");
|
||||||
EXPECT_DEATH(result = queue.Remove(&invalid_chunk), "");
|
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|||||||
@ -1450,7 +1450,6 @@ void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) {
|
|||||||
int64_t min_send_receive_diff_ms = std::numeric_limits<int64_t>::max();
|
int64_t min_send_receive_diff_ms = std::numeric_limits<int64_t>::max();
|
||||||
int64_t min_rtt_ms = std::numeric_limits<int64_t>::max();
|
int64_t min_rtt_ms = std::numeric_limits<int64_t>::max();
|
||||||
|
|
||||||
int64_t prev_y = 0;
|
|
||||||
std::vector<MatchedSendArrivalTimes> matched_rtp_rtcp =
|
std::vector<MatchedSendArrivalTimes> matched_rtp_rtcp =
|
||||||
GetNetworkTrace(parsed_log_);
|
GetNetworkTrace(parsed_log_);
|
||||||
absl::c_stable_sort(matched_rtp_rtcp, [](const MatchedSendArrivalTimes& a,
|
absl::c_stable_sort(matched_rtp_rtcp, [](const MatchedSendArrivalTimes& a,
|
||||||
@ -1464,7 +1463,6 @@ void EventLogAnalyzer::CreateNetworkDelayFeedbackGraph(Plot* plot) {
|
|||||||
continue;
|
continue;
|
||||||
float x = config_.GetCallTimeSec(1000 * packet.feedback_arrival_time_ms);
|
float x = config_.GetCallTimeSec(1000 * packet.feedback_arrival_time_ms);
|
||||||
int64_t y = packet.arrival_time_ms - packet.send_time_ms;
|
int64_t y = packet.arrival_time_ms - packet.send_time_ms;
|
||||||
prev_y = y;
|
|
||||||
int64_t rtt_ms = packet.feedback_arrival_time_ms - packet.send_time_ms;
|
int64_t rtt_ms = packet.feedback_arrival_time_ms - packet.send_time_ms;
|
||||||
min_rtt_ms = std::min(rtt_ms, min_rtt_ms);
|
min_rtt_ms = std::min(rtt_ms, min_rtt_ms);
|
||||||
min_send_receive_diff_ms = std::min(y, min_send_receive_diff_ms);
|
min_send_receive_diff_ms = std::min(y, min_send_receive_diff_ms);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user