Cleanup arraysize usage in media/
Bug: webrtc:407433458
Change-Id: I3ded72cdc8d84dddae676f5ba769029382b65d11
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/392460
Auto-Submit: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Commit-Queue: Rasmus Brandt <brandtr@webrtc.org>
Reviewed-by: Rasmus Brandt <brandtr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44694}
diff --git a/media/BUILD.gn b/media/BUILD.gn
index 0ba26c7e..a11de12 100644
--- a/media/BUILD.gn
+++ b/media/BUILD.gn
@@ -221,7 +221,6 @@
deps = [
"../api:array_view",
"../rtc_base:checks",
- "../rtc_base:macromagic",
"../rtc_base:stringutils",
"../rtc_base:timeutils",
"../rtc_base/system:rtc_export",
@@ -1032,7 +1031,6 @@
"../rtc_base:checks",
"../rtc_base:copy_on_write_buffer",
"../rtc_base:dscp",
- "../rtc_base:macromagic",
"../rtc_base:safe_conversions",
"../rtc_base:socket",
"../rtc_base:threading",
diff --git a/media/base/stream_params_unittest.cc b/media/base/stream_params_unittest.cc
index b89c5b9..2b9a0f3 100644
--- a/media/base/stream_params_unittest.cc
+++ b/media/base/stream_params_unittest.cc
@@ -16,8 +16,8 @@
#include <string>
#include <vector>
+#include "api/array_view.h"
#include "media/base/test_utils.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/unique_id_generator.h"
#include "test/gmock.h"
#include "test/gtest.h"
@@ -30,10 +30,9 @@
static webrtc::StreamParams CreateStreamParamsWithSsrcGroup(
const std::string& semantics,
- const uint32_t ssrcs_in[],
- size_t len) {
+ webrtc::ArrayView<const uint32_t> ssrcs_in) {
webrtc::StreamParams stream;
- std::vector<uint32_t> ssrcs(ssrcs_in, ssrcs_in + len);
+ std::vector<uint32_t> ssrcs(ssrcs_in.begin(), ssrcs_in.end());
webrtc::SsrcGroup sg(semantics, ssrcs);
stream.ssrcs = ssrcs;
stream.ssrc_groups.push_back(sg);
@@ -48,8 +47,8 @@
webrtc::SsrcGroup("abc", MAKE_VECTOR(kSsrcs2)),
};
- for (size_t i = 0; i < arraysize(ssrc_groups); ++i) {
- for (size_t j = 0; j < arraysize(ssrc_groups); ++j) {
+ for (size_t i = 0; i < std::size(ssrc_groups); ++i) {
+ for (size_t j = 0; j < std::size(ssrc_groups); ++j) {
EXPECT_EQ((ssrc_groups[i] == ssrc_groups[j]), (i == j));
EXPECT_EQ((ssrc_groups[i] != ssrc_groups[j]), (i != j));
}
@@ -85,8 +84,7 @@
}
TEST(StreamParams, HasSsrcGroup) {
- webrtc::StreamParams sp =
- CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, arraysize(kSsrcs2));
+ webrtc::StreamParams sp = CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2);
EXPECT_EQ(2U, sp.ssrcs.size());
EXPECT_EQ(kSsrcs2[0], sp.first_ssrc());
EXPECT_TRUE(sp.has_ssrcs());
@@ -100,8 +98,7 @@
}
TEST(StreamParams, GetSsrcGroup) {
- webrtc::StreamParams sp =
- CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, arraysize(kSsrcs2));
+ webrtc::StreamParams sp = CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2);
EXPECT_EQ(nullptr, sp.get_ssrc_group("xyz"));
EXPECT_EQ(&sp.ssrc_groups[0], sp.get_ssrc_group("XYZ"));
}
@@ -120,18 +117,14 @@
TEST(StreamParams, EqualNotEqual) {
webrtc::StreamParams l1 = webrtc::StreamParams::CreateLegacy(1);
webrtc::StreamParams l2 = webrtc::StreamParams::CreateLegacy(2);
- webrtc::StreamParams sg1 =
- CreateStreamParamsWithSsrcGroup("ABC", kSsrcs1, arraysize(kSsrcs1));
- webrtc::StreamParams sg2 =
- CreateStreamParamsWithSsrcGroup("ABC", kSsrcs2, arraysize(kSsrcs2));
- webrtc::StreamParams sg3 =
- CreateStreamParamsWithSsrcGroup("Abc", kSsrcs2, arraysize(kSsrcs2));
- webrtc::StreamParams sg4 =
- CreateStreamParamsWithSsrcGroup("abc", kSsrcs2, arraysize(kSsrcs2));
+ webrtc::StreamParams sg1 = CreateStreamParamsWithSsrcGroup("ABC", kSsrcs1);
+ webrtc::StreamParams sg2 = CreateStreamParamsWithSsrcGroup("ABC", kSsrcs2);
+ webrtc::StreamParams sg3 = CreateStreamParamsWithSsrcGroup("Abc", kSsrcs2);
+ webrtc::StreamParams sg4 = CreateStreamParamsWithSsrcGroup("abc", kSsrcs2);
webrtc::StreamParams sps[] = {l1, l2, sg1, sg2, sg3, sg4};
- for (size_t i = 0; i < arraysize(sps); ++i) {
- for (size_t j = 0; j < arraysize(sps); ++j) {
+ for (size_t i = 0; i < std::size(sps); ++i) {
+ for (size_t j = 0; j < std::size(sps); ++j) {
EXPECT_EQ((sps[i] == sps[j]), (i == j));
EXPECT_EQ((sps[i] != sps[j]), (i != j));
}
@@ -227,8 +220,7 @@
}
TEST(StreamParams, ToString) {
- webrtc::StreamParams sp =
- CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2, arraysize(kSsrcs2));
+ webrtc::StreamParams sp = CreateStreamParamsWithSsrcGroup("XYZ", kSsrcs2);
sp.set_stream_ids({"stream_id"});
EXPECT_STREQ(
"{ssrcs:[1,2];ssrc_groups:{semantics:XYZ;ssrcs:[1,2]};stream_ids:stream_"
diff --git a/media/base/test_utils.h b/media/base/test_utils.h
index 94f4492..403b492 100644
--- a/media/base/test_utils.h
+++ b/media/base/test_utils.h
@@ -17,7 +17,6 @@
#include <vector>
#include "media/base/stream_params.h"
-#include "rtc_base/arraysize.h"
namespace webrtc {
class VideoFrame;
@@ -34,7 +33,7 @@
inline std::vector<T> MakeVector(const T a[], size_t s) {
return std::vector<T>(a, a + s);
}
-#define MAKE_VECTOR(a) webrtc::MakeVector(a, arraysize(a))
+#define MAKE_VECTOR(a) webrtc::MakeVector(a, std::size(a))
// Create Simulcast StreamParams with given `ssrcs` and `cname`.
StreamParams CreateSimStreamParams(const std::string& cname,
diff --git a/media/base/video_adapter_unittest.cc b/media/base/video_adapter_unittest.cc
index 98b6996..8b4a158 100644
--- a/media/base/video_adapter_unittest.cc
+++ b/media/base/video_adapter_unittest.cc
@@ -23,7 +23,6 @@
#include "api/video/video_source_interface.h"
#include "media/base/fake_frame_source.h"
#include "media/base/video_common.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/time_utils.h"
#include "test/field_trial.h"
#include "test/gmock.h"
@@ -1104,7 +1103,7 @@
int request_width = kWidth;
int request_height = kHeight;
- for (size_t i = 0; i < arraysize(kExpectedWidths); ++i) {
+ for (size_t i = 0; i < std::size(kExpectedWidths); ++i) {
// Adapt down one step.
adapter_.OnSinkWants(BuildSinkWants(std::nullopt,
request_width * request_height - 1,
@@ -1133,7 +1132,7 @@
int request_width = kWidth1080p;
int request_height = kHeight1080p;
- for (size_t i = 0; i < arraysize(kExpectedWidths); ++i) {
+ for (size_t i = 0; i < std::size(kExpectedWidths); ++i) {
// Adapt down one step.
adapter_.OnSinkWants(BuildSinkWants(std::nullopt,
request_width * request_height - 1,
@@ -1162,7 +1161,7 @@
int request_width = kWidth1080p4to3;
int request_height = kHeight1080p4to3;
- for (size_t i = 0; i < arraysize(kExpectedWidths); ++i) {
+ for (size_t i = 0; i < std::size(kExpectedWidths); ++i) {
// Adapt down one step.
adapter_.OnSinkWants(BuildSinkWants(std::nullopt,
request_width * request_height - 1,
diff --git a/media/base/video_common.cc b/media/base/video_common.cc
index bc18d85..c5abb9e 100644
--- a/media/base/video_common.cc
+++ b/media/base/video_common.cc
@@ -15,7 +15,6 @@
#include <string>
#include "api/array_view.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/strings/string_builder.h"
@@ -44,9 +43,9 @@
};
uint32_t CanonicalFourCC(uint32_t fourcc) {
- for (uint32_t i = 0; i < arraysize(kFourCCAliases); ++i) {
- if (kFourCCAliases[i].alias == fourcc) {
- return kFourCCAliases[i].canonical;
+ for (const FourCCAliasEntry& entry : kFourCCAliases) {
+ if (entry.alias == fourcc) {
+ return entry.canonical;
}
}
// Not an alias, so return it as-is.
diff --git a/media/engine/webrtc_video_engine_unittest.cc b/media/engine/webrtc_video_engine_unittest.cc
index ffedad5..31b9b4f 100644
--- a/media/engine/webrtc_video_engine_unittest.cc
+++ b/media/engine/webrtc_video_engine_unittest.cc
@@ -107,7 +107,6 @@
#include "modules/rtp_rtcp/source/rtp_packet.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
#include "modules/video_coding/svc/scalability_mode_util.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/async_packet_socket.h"
#include "rtc_base/checks.h"
#include "rtc_base/copy_on_write_buffer.h"
@@ -3325,21 +3324,21 @@
TEST_F(WebRtcVideoChannelTest, SetSendRtpHeaderExtensionsRejectsIncorrectIds) {
const int kIncorrectIds[] = {-2, -1, 0, 15, 16};
- for (size_t i = 0; i < arraysize(kIncorrectIds); ++i) {
+ for (int incorrect_id : kIncorrectIds) {
send_parameters_.extensions.push_back(
- RtpExtension(RtpExtension::kTimestampOffsetUri, kIncorrectIds[i]));
+ RtpExtension(RtpExtension::kTimestampOffsetUri, incorrect_id));
EXPECT_FALSE(send_channel_->SetSenderParameters(send_parameters_))
- << "Bad extension id '" << kIncorrectIds[i] << "' accepted.";
+ << "Bad extension id '" << incorrect_id << "' accepted.";
}
}
TEST_F(WebRtcVideoChannelTest, SetRecvRtpHeaderExtensionsRejectsIncorrectIds) {
const int kIncorrectIds[] = {-2, -1, 0, 15, 16};
- for (size_t i = 0; i < arraysize(kIncorrectIds); ++i) {
+ for (int incorrect_id : kIncorrectIds) {
recv_parameters_.extensions.push_back(
- RtpExtension(RtpExtension::kTimestampOffsetUri, kIncorrectIds[i]));
+ RtpExtension(RtpExtension::kTimestampOffsetUri, incorrect_id));
EXPECT_FALSE(receive_channel_->SetReceiverParameters(recv_parameters_))
- << "Bad extension id '" << kIncorrectIds[i] << "' accepted.";
+ << "Bad extension id '" << incorrect_id << "' accepted.";
}
}
@@ -5242,10 +5241,10 @@
static const int kIncorrectPayloads[] = {-2, -1, 128, 129};
VideoSenderParameters parameters;
parameters.codecs.push_back(GetEngineCodec("VP8"));
- for (size_t i = 0; i < arraysize(kIncorrectPayloads); ++i) {
- parameters.codecs[0].id = kIncorrectPayloads[i];
+ for (int incorrect_id : kIncorrectPayloads) {
+ parameters.codecs[0].id = incorrect_id;
EXPECT_FALSE(send_channel_->SetSenderParameters(parameters))
- << "Bad payload type '" << kIncorrectPayloads[i] << "' accepted.";
+ << "Bad payload type '" << incorrect_id << "' accepted.";
}
}
diff --git a/media/engine/webrtc_voice_engine_unittest.cc b/media/engine/webrtc_voice_engine_unittest.cc
index c6c4444..3bdd0f7 100644
--- a/media/engine/webrtc_voice_engine_unittest.cc
+++ b/media/engine/webrtc_voice_engine_unittest.cc
@@ -66,7 +66,6 @@
#include "modules/rtp_rtcp/include/rtp_header_extension_map.h"
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "modules/rtp_rtcp/source/rtp_packet_received.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/byte_order.h"
#include "rtc_base/checks.h"
#include "rtc_base/copy_on_write_buffer.h"
@@ -2458,7 +2457,7 @@
// Verify that we are in a sending state for all the created streams.
EXPECT_TRUE(GetSendStream(ssrc).IsSending());
}
- EXPECT_EQ(arraysize(kSsrcs4), call_.GetAudioSendStreams().size());
+ EXPECT_EQ(std::size(kSsrcs4), call_.GetAudioSendStreams().size());
// Delete the send streams.
for (uint32_t ssrc : kSsrcs4) {
@@ -2566,8 +2565,7 @@
&receive_info, /*get_and_clear_legacy_stats=*/true));
// We have added 4 send streams. We should see empty stats for all.
- EXPECT_EQ(static_cast<size_t>(arraysize(kSsrcs4)),
- send_info.senders.size());
+ EXPECT_EQ(std::size(kSsrcs4), send_info.senders.size());
for (const auto& sender : send_info.senders) {
VerifyVoiceSenderInfo(sender, false);
}
@@ -2587,8 +2585,7 @@
EXPECT_EQ(true, send_channel_->GetStats(&send_info));
EXPECT_EQ(true, receive_channel_->GetStats(
&receive_info, /*get_and_clear_legacy_stats=*/true));
- EXPECT_EQ(static_cast<size_t>(arraysize(kSsrcs4)),
- send_info.senders.size());
+ EXPECT_EQ(std::size(kSsrcs4), send_info.senders.size());
EXPECT_EQ(0u, receive_info.receivers.size());
}
@@ -2603,8 +2600,7 @@
EXPECT_EQ(true, send_channel_->GetStats(&send_info));
EXPECT_EQ(true, receive_channel_->GetStats(
&receive_info, /*get_and_clear_legacy_stats=*/true));
- EXPECT_EQ(static_cast<size_t>(arraysize(kSsrcs4)),
- send_info.senders.size());
+ EXPECT_EQ(std::size(kSsrcs4), send_info.senders.size());
EXPECT_EQ(1u, receive_info.receivers.size());
VerifyVoiceReceiverInfo(receive_info.receivers[0]);
VerifyVoiceSendRecvCodecs(send_info, receive_info);
@@ -2813,7 +2809,7 @@
EXPECT_TRUE(AddRecvStream(ssrc3));
// Create packets with the right SSRCs.
unsigned char packets[4][sizeof(kPcmuFrame)];
- for (size_t i = 0; i < arraysize(packets); ++i) {
+ for (size_t i = 0; i < std::size(packets); ++i) {
memcpy(packets[i], kPcmuFrame, sizeof(kPcmuFrame));
webrtc::SetBE32(packets[i] + 8, static_cast<uint32_t>(i));
}
