Cleanup arraysize usage in modules/rtp_rtcp and video
Bug: webrtc:407433458
Change-Id: I4fcc65c3884f5f9f4d196f4af2d28a3e629f7dc7
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/393562
Commit-Queue: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Ilya Nikolaevskiy <ilnik@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44766}
diff --git a/modules/rtp_rtcp/BUILD.gn b/modules/rtp_rtcp/BUILD.gn
index 2a680f5..5b7d5f4e 100644
--- a/modules/rtp_rtcp/BUILD.gn
+++ b/modules/rtp_rtcp/BUILD.gn
@@ -136,7 +136,6 @@
"../../rtc_base:divide_round",
"../../rtc_base:event_tracer",
"../../rtc_base:logging",
- "../../rtc_base:macromagic",
"../../rtc_base:safe_compare",
"../../rtc_base:safe_conversions",
"../../rtc_base:stringutils",
@@ -742,7 +741,6 @@
"../../rtc_base:checks",
"../../rtc_base:copy_on_write_buffer",
"../../rtc_base:logging",
- "../../rtc_base:macromagic",
"../../rtc_base:random",
"../../rtc_base:rate_limiter",
"../../rtc_base:rtc_base_tests_utils",
diff --git a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
index 31d218e..d9a777d 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
@@ -55,7 +55,6 @@
#include "modules/rtp_rtcp/source/rtcp_packet/tmmbr.h"
#include "modules/rtp_rtcp/source/rtcp_packet/transport_feedback.h"
#include "modules/rtp_rtcp/source/rtp_rtcp_interface.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/buffer.h"
#include "rtc_base/random.h"
#include "system_wrappers/include/clock.h"
@@ -1952,7 +1951,7 @@
const uint16_t kNackList1[] = {1, 2, 3, 5};
const uint16_t kNackList23[] = {5, 7, 30, 40, 41, 58, 59, 61, 63};
const size_t kNackListLength2 = 4;
- const size_t kNackListLength3 = arraysize(kNackList23) - kNackListLength2;
+ const size_t kNackListLength3 = std::size(kNackList23) - kNackListLength2;
std::set<uint16_t> nack_set;
nack_set.insert(std::begin(kNackList1), std::end(kNackList1));
nack_set.insert(std::begin(kNackList23), std::end(kNackList23));
@@ -1960,7 +1959,7 @@
auto nack1 = std::make_unique<rtcp::Nack>();
nack1->SetSenderSsrc(kSenderSsrc);
nack1->SetMediaSsrc(kReceiverMainSsrc);
- nack1->SetPacketIds(kNackList1, arraysize(kNackList1));
+ nack1->SetPacketIds(kNackList1, std::size(kNackList1));
EXPECT_CALL(mocks.rtp_rtcp_impl,
OnReceivedNack(ElementsAreArray(kNackList1)));
@@ -1968,9 +1967,9 @@
RtcpPacketTypesCounterUpdated(
kReceiverMainSsrc,
AllOf(Field(&RtcpPacketTypeCounter::nack_requests,
- arraysize(kNackList1)),
+ std::size(kNackList1)),
Field(&RtcpPacketTypeCounter::unique_nack_requests,
- arraysize(kNackList1)))));
+ std::size(kNackList1)))));
receiver.IncomingPacket(nack1->Build());
auto nack2 = std::make_unique<rtcp::Nack>();
@@ -1993,7 +1992,7 @@
RtcpPacketTypesCounterUpdated(
kReceiverMainSsrc,
AllOf(Field(&RtcpPacketTypeCounter::nack_requests,
- arraysize(kNackList1) + arraysize(kNackList23)),
+ std::size(kNackList1) + std::size(kNackList23)),
Field(&RtcpPacketTypeCounter::unique_nack_requests,
nack_set.size()))));
receiver.IncomingPacket(two_nacks.Build());
diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
index e1cbe26..e06698e 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -119,17 +119,12 @@
class RTCPSender::RtcpContext {
public:
RtcpContext(const FeedbackState& feedback_state,
- int32_t nack_size,
- const uint16_t* nack_list,
+ ArrayView<const uint16_t> nacks,
Timestamp now)
- : feedback_state_(feedback_state),
- nack_size_(nack_size),
- nack_list_(nack_list),
- now_(now) {}
+ : feedback_state_(feedback_state), nacks_(nacks), now_(now) {}
const FeedbackState& feedback_state_;
- const int32_t nack_size_;
- const uint16_t* nack_list_;
+ const ArrayView<const uint16_t> nacks_;
const Timestamp now_;
};
@@ -262,8 +257,7 @@
sender.emplace(callback, max_packet_size_);
auto result = ComputeCompoundRTCPPacket(
- feedback_state, RTCPPacketType::kRtcpLossNotification, 0, nullptr,
- *sender);
+ feedback_state, RTCPPacketType::kRtcpLossNotification, {}, *sender);
if (result) {
return *result;
}
@@ -538,11 +532,11 @@
rtcp::Nack nack;
nack.SetSenderSsrc(ssrc_);
nack.SetMediaSsrc(remote_ssrc_);
- nack.SetPacketIds(ctx.nack_list_, ctx.nack_size_);
+ nack.SetPacketIds(ctx.nacks_.data(), ctx.nacks_.size());
// Report stats.
- for (int idx = 0; idx < ctx.nack_size_; ++idx) {
- nack_stats_.ReportRequest(ctx.nack_list_[idx]);
+ for (uint16_t sequence_number : ctx.nacks_) {
+ nack_stats_.ReportRequest(sequence_number);
}
packet_type_counter_.nack_requests = nack_stats_.requests();
packet_type_counter_.unique_nack_requests = nack_stats_.unique_requests();
@@ -593,8 +587,7 @@
int32_t RTCPSender::SendRTCP(const FeedbackState& feedback_state,
RTCPPacketType packet_type,
- int32_t nack_size,
- const uint16_t* nack_list) {
+ ArrayView<const uint16_t> nacks) {
int32_t error_code = -1;
auto callback = [&](ArrayView<const uint8_t> packet) {
if (transport_->SendRtcp(packet, /*packet_options=*/{})) {
@@ -607,8 +600,8 @@
{
MutexLock lock(&mutex_rtcp_sender_);
sender.emplace(callback, max_packet_size_);
- auto result = ComputeCompoundRTCPPacket(feedback_state, packet_type,
- nack_size, nack_list, *sender);
+ auto result =
+ ComputeCompoundRTCPPacket(feedback_state, packet_type, nacks, *sender);
if (result) {
return *result;
}
@@ -621,8 +614,7 @@
std::optional<int32_t> RTCPSender::ComputeCompoundRTCPPacket(
const FeedbackState& feedback_state,
RTCPPacketType packet_type,
- int32_t nack_size,
- const uint16_t* nack_list,
+ ArrayView<const uint16_t> nacks,
PacketSender& sender) {
if (method_ == RtcpMode::kOff) {
RTC_LOG(LS_WARNING) << "Can't send RTCP if it is disabled.";
@@ -649,8 +641,7 @@
}
// We need to send our NTP even if we haven't received any reports.
- RtcpContext context(feedback_state, nack_size, nack_list,
- env_.clock().CurrentTime());
+ RtcpContext context(feedback_state, nacks, env_.clock().CurrentTime());
PrepareReport(feedback_state);
diff --git a/modules/rtp_rtcp/source/rtcp_sender.h b/modules/rtp_rtcp/source/rtcp_sender.h
index 3072281..fb9f18b 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.h
+++ b/modules/rtp_rtcp/source/rtcp_sender.h
@@ -22,6 +22,7 @@
#include <vector>
#include "absl/strings/string_view.h"
+#include "api/array_view.h"
#include "api/call/transport.h"
#include "api/environment/environment.h"
#include "api/rtp_headers.h"
@@ -147,8 +148,7 @@
int32_t SendRTCP(const FeedbackState& feedback_state,
RTCPPacketType packetType,
- int32_t nackSize = 0,
- const uint16_t* nackList = 0)
+ ArrayView<const uint16_t> nacks = {})
RTC_LOCKS_EXCLUDED(mutex_rtcp_sender_);
int32_t SendLossNotification(const FeedbackState& feedback_state,
@@ -189,8 +189,7 @@
std::optional<int32_t> ComputeCompoundRTCPPacket(
const FeedbackState& feedback_state,
RTCPPacketType packet_type,
- int32_t nack_size,
- const uint16_t* nack_list,
+ ArrayView<const uint16_t> nacks,
PacketSender& sender) RTC_EXCLUSIVE_LOCKS_REQUIRED(mutex_rtcp_sender_);
TimeDelta ComputeTimeUntilNextReport(DataRate send_bitrate)
diff --git a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
index e93b38e..4184f22 100644
--- a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
@@ -17,7 +17,6 @@
#include <utility>
#include <vector>
-#include "absl/base/macros.h"
#include "api/array_view.h"
#include "api/call/transport.h"
#include "api/environment/environment.h"
@@ -383,8 +382,7 @@
auto rtcp_sender = CreateRtcpSender(GetDefaultConfig());
rtcp_sender->SetRTCPStatus(RtcpMode::kReducedSize);
const uint16_t kList[] = {0, 1, 16};
- EXPECT_EQ(0, rtcp_sender->SendRTCP(feedback_state(), kRtcpNack,
- ABSL_ARRAYSIZE(kList), kList));
+ EXPECT_EQ(0, rtcp_sender->SendRTCP(feedback_state(), kRtcpNack, kList));
EXPECT_EQ(1, parser()->nack()->num_packets());
EXPECT_EQ(kSenderSsrc, parser()->nack()->sender_ssrc());
EXPECT_EQ(kRemoteSsrc, parser()->nack()->media_ssrc());
@@ -425,9 +423,7 @@
// Sending another messages triggers sending the LNTF messages as well.
const uint16_t kList[] = {0, 1, 16};
- EXPECT_EQ(rtcp_sender->SendRTCP(feedback_state(), kRtcpNack,
- ABSL_ARRAYSIZE(kList), kList),
- 0);
+ EXPECT_EQ(rtcp_sender->SendRTCP(feedback_state(), kRtcpNack, kList), 0);
// Exactly one packet was produced, and it contained both the buffered LNTF
// as well as the message that had triggered the packet.
diff --git a/modules/rtp_rtcp/source/rtp_header_extension_map.cc b/modules/rtp_rtcp/source/rtp_header_extension_map.cc
index ef28dba..2ceb5a1 100644
--- a/modules/rtp_rtcp/source/rtp_header_extension_map.cc
+++ b/modules/rtp_rtcp/source/rtp_header_extension_map.cc
@@ -21,7 +21,6 @@
#include "modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h"
#include "modules/rtp_rtcp/source/rtp_header_extensions.h"
#include "modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
@@ -64,7 +63,7 @@
// Because of kRtpExtensionNone, NumberOfExtension is 1 bigger than the actual
// number of known extensions.
-static_assert(arraysize(kExtensions) ==
+static_assert(std::ssize(kExtensions) ==
static_cast<int>(kRtpExtensionNumberOfExtensions) - 1,
"kExtensions expect to list all known extensions");
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index 5bd844f..77ecfb7 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -593,14 +593,14 @@
}
nack_last_seq_number_sent_ = nack_list[start_id + nack_length - 1];
- return rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpNack, nack_length,
- &nack_list[start_id]);
+ return rtcp_sender_.SendRTCP(
+ GetFeedbackState(), kRtcpNack,
+ MakeArrayView(&nack_list[start_id], nack_length));
}
void ModuleRtpRtcpImpl::SendNack(
const std::vector<uint16_t>& sequence_numbers) {
- rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpNack, sequence_numbers.size(),
- sequence_numbers.data());
+ rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpNack, sequence_numbers);
}
bool ModuleRtpRtcpImpl::TimeToSendFullNackList(int64_t now) const {
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
index f71ca3c1..c92c850 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
@@ -609,14 +609,14 @@
}
nack_last_seq_number_sent_ = nack_list[start_id + nack_length - 1];
- return rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpNack, nack_length,
- &nack_list[start_id]);
+ return rtcp_sender_.SendRTCP(
+ GetFeedbackState(), kRtcpNack,
+ MakeArrayView(&nack_list[start_id], nack_length));
}
void ModuleRtpRtcpImpl2::SendNack(
const std::vector<uint16_t>& sequence_numbers) {
- rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpNack, sequence_numbers.size(),
- sequence_numbers.data());
+ rtcp_sender_.SendRTCP(GetFeedbackState(), kRtcpNack, sequence_numbers);
}
bool ModuleRtpRtcpImpl2::TimeToSendFullNackList(int64_t now) const {
diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc
index 888e601..45d5dbf 100644
--- a/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/modules/rtp_rtcp/source/rtp_sender.cc
@@ -38,7 +38,6 @@
#include "modules/rtp_rtcp/source/rtp_packet_history.h"
#include "modules/rtp_rtcp/source/rtp_packet_to_send.h"
#include "modules/rtp_rtcp/source/rtp_rtcp_interface.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/numerics/safe_minmax.h"
@@ -200,16 +199,15 @@
}
ArrayView<const RtpExtensionSize> RTPSender::FecExtensionSizes() {
- return MakeArrayView(kFecOrPaddingExtensionSizes,
- arraysize(kFecOrPaddingExtensionSizes));
+ return kFecOrPaddingExtensionSizes;
}
ArrayView<const RtpExtensionSize> RTPSender::VideoExtensionSizes() {
- return MakeArrayView(kVideoExtensionSizes, arraysize(kVideoExtensionSizes));
+ return kVideoExtensionSizes;
}
ArrayView<const RtpExtensionSize> RTPSender::AudioExtensionSizes() {
- return MakeArrayView(kAudioExtensionSizes, arraysize(kAudioExtensionSizes));
+ return kAudioExtensionSizes;
}
void RTPSender::SetExtmapAllowMixed(bool extmap_allow_mixed) {
diff --git a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
index 79432a9..479527e 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
@@ -10,6 +10,7 @@
#include "modules/rtp_rtcp/source/rtp_sender_video.h"
+#include <array>
#include <cstddef>
#include <cstdint>
#include <memory>
@@ -65,7 +66,6 @@
#include "modules/video_coding/codecs/h264/include/h264_globals.h"
#include "modules/video_coding/codecs/vp8/include/vp8_globals.h"
#include "modules/video_coding/codecs/vp9/include/vp9_globals.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/rate_limiter.h"
#include "rtc_base/thread.h"
@@ -513,10 +513,10 @@
// Fill averaging window to prevent rounding errors.
constexpr int kNumRepetitions =
RTPSenderVideo::kTLRateWindowSize / kFrameInterval;
- constexpr int kPattern[] = {0, 2, 1, 2};
+ constexpr std::array kPattern = {0, 2, 1, 2};
auto& vp8_header = header.video_type_header.emplace<RTPVideoHeaderVP8>();
- for (size_t i = 0; i < arraysize(kPattern) * kNumRepetitions; ++i) {
- vp8_header.temporalIdx = kPattern[i % arraysize(kPattern)];
+ for (size_t i = 0; i < kPattern.size() * kNumRepetitions; ++i) {
+ vp8_header.temporalIdx = kPattern[i % kPattern.size()];
rtp_sender_video_->AllowRetransmission(header, kSettings, kRtt);
fake_clock_.AdvanceTime(kFrameInterval);
}
@@ -564,10 +564,10 @@
// Fill averaging window to prevent rounding errors.
constexpr int kNumRepetitions =
RTPSenderVideo::kTLRateWindowSize / kFrameInterval;
- constexpr int kPattern[] = {0, 2, 2, 2};
+ constexpr std::array kPattern = {0, 2, 2, 2};
auto& vp8_header = header.video_type_header.emplace<RTPVideoHeaderVP8>();
- for (size_t i = 0; i < arraysize(kPattern) * kNumRepetitions; ++i) {
- vp8_header.temporalIdx = kPattern[i % arraysize(kPattern)];
+ for (size_t i = 0; i < kPattern.size() * kNumRepetitions; ++i) {
+ vp8_header.temporalIdx = kPattern[i % kPattern.size()];
rtp_sender_video_->AllowRetransmission(header, kSettings, kRtt);
fake_clock_.AdvanceTime(kFrameInterval);
diff --git a/modules/video_capture/BUILD.gn b/modules/video_capture/BUILD.gn
index c3e0e5a..058b86b 100644
--- a/modules/video_capture/BUILD.gn
+++ b/modules/video_capture/BUILD.gn
@@ -59,16 +59,19 @@
"../../api:make_ref_counted",
"../../api:scoped_refptr",
"../../api:sequence_checker",
+ "../../common_video",
"../../media:video_common",
"../../rtc_base:checks",
"../../rtc_base:logging",
"../../rtc_base:macromagic",
"../../rtc_base:platform_thread",
+ "../../rtc_base:platform_thread_types",
"../../rtc_base:refcount",
"../../rtc_base:stringutils",
"../../rtc_base/synchronization:mutex",
"../../rtc_base/system:rtc_export",
"../../system_wrappers",
+ "//third_party/abseil-cpp/absl/strings",
]
sources = [
"video_capture_options.cc",
diff --git a/modules/video_capture/windows/sink_filter_ds.cc b/modules/video_capture/windows/sink_filter_ds.cc
index 33e7a26..027a9af 100644
--- a/modules/video_capture/windows/sink_filter_ds.cc
+++ b/modules/video_capture/windows/sink_filter_ds.cc
@@ -14,12 +14,24 @@
#include <initguid.h>
#include <algorithm>
+#include <atomic>
+#include <cstddef>
+#include <cstdlib>
+#include <cstring>
+#include <iterator>
#include <list>
+#include <vector>
-#include "rtc_base/arraysize.h"
+#include "absl/strings/str_cat.h"
+#include "api/scoped_refptr.h"
+#include "api/sequence_checker.h"
+#include "common_video/libyuv/include/webrtc_libyuv.h"
+#include "modules/video_capture/video_capture_defines.h"
+#include "modules/video_capture/video_capture_impl.h"
+#include "modules/video_capture/windows/help_functions_ds.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
-#include "rtc_base/platform_thread.h"
+#include "rtc_base/platform_thread_types.h"
#include "rtc_base/string_utils.h"
DEFINE_GUID(CLSID_SINKFILTER,
@@ -907,7 +919,7 @@
info_.achName[0] = L'\0';
if (name)
- lstrcpynW(info_.achName, name, arraysize(info_.achName));
+ lstrcpynW(info_.achName, name, std::size(info_.achName));
return S_OK;
}
diff --git a/modules/video_coding/BUILD.gn b/modules/video_coding/BUILD.gn
index 52c391d..270d57a 100644
--- a/modules/video_coding/BUILD.gn
+++ b/modules/video_coding/BUILD.gn
@@ -106,7 +106,6 @@
"../../rtc_base:checks",
"../../rtc_base:copy_on_write_buffer",
"../../rtc_base:logging",
- "../../rtc_base:macromagic",
"../../rtc_base:mod_ops",
"../../rtc_base:rtc_numerics",
"../rtp_rtcp:rtp_rtcp_format",
@@ -649,7 +648,6 @@
"../../common_video/generic_frame_descriptor",
"../../rtc_base:checks",
"../../rtc_base:logging",
- "../../rtc_base:macromagic",
"../../rtc_base:rate_statistics",
"../../rtc_base:rtc_numerics",
"../../rtc_base:timeutils",
diff --git a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
index 339a508..ea6c311 100644
--- a/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
+++ b/modules/video_coding/codecs/av1/libaom_av1_encoder.cc
@@ -19,7 +19,6 @@
#include <vector>
#include "absl/algorithm/container.h"
-#include "absl/base/macros.h"
#include "absl/base/nullability.h"
#include "absl/container/inlined_vector.h"
#include "api/environment/environment.h"
@@ -524,7 +523,7 @@
static constexpr int kAv1NumBuffers = 8;
aom_svc_ref_frame_config_t ref_frame_config = {};
- RTC_CHECK_LE(layer_frame.Buffers().size(), ABSL_ARRAYSIZE(kPreferedSlotName));
+ RTC_CHECK_LE(layer_frame.Buffers().size(), std::size(kPreferedSlotName));
for (size_t i = 0; i < layer_frame.Buffers().size(); ++i) {
const CodecBufferUsage& buffer = layer_frame.Buffers()[i];
int slot_name = kPreferedSlotName[i];
diff --git a/modules/video_coding/codecs/vp8/default_temporal_layers.cc b/modules/video_coding/codecs/vp8/default_temporal_layers.cc
index cd55e0f..4ba9031 100644
--- a/modules/video_coding/codecs/vp8/default_temporal_layers.cc
+++ b/modules/video_coding/codecs/vp8/default_temporal_layers.cc
@@ -31,7 +31,6 @@
#include "modules/video_coding/codecs/interface/common_constants.h"
#include "modules/video_coding/codecs/vp8/include/temporal_layers_checker.h"
#include "modules/video_coding/include/video_codec_interface.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
@@ -546,7 +545,7 @@
if (!is_keyframe &&
frame_config.References(static_cast<Vp8FrameConfig::Buffer>(i))) {
RTC_DCHECK_LT(vp8_info.referencedBuffersCount,
- arraysize(CodecSpecificInfoVP8::referencedBuffers));
+ std::size(vp8_info.referencedBuffers));
references = true;
vp8_info.referencedBuffers[vp8_info.referencedBuffersCount++] = i;
}
@@ -554,7 +553,7 @@
if (is_keyframe ||
frame_config.Updates(static_cast<Vp8FrameConfig::Buffer>(i))) {
RTC_DCHECK_LT(vp8_info.updatedBuffersCount,
- arraysize(CodecSpecificInfoVP8::updatedBuffers));
+ std::size(vp8_info.updatedBuffers));
updates = true;
vp8_info.updatedBuffers[vp8_info.updatedBuffersCount++] = i;
}
diff --git a/modules/video_coding/codecs/vp8/screenshare_layers.cc b/modules/video_coding/codecs/vp8/screenshare_layers.cc
index f89c736..885d44b 100644
--- a/modules/video_coding/codecs/vp8/screenshare_layers.cc
+++ b/modules/video_coding/codecs/vp8/screenshare_layers.cc
@@ -26,7 +26,6 @@
#include "modules/video_coding/codecs/interface/common_constants.h"
#include "modules/video_coding/codecs/vp8/include/temporal_layers_checker.h"
#include "modules/video_coding/include/video_codec_interface.h"
-#include "rtc_base/arraysize.h"
#include "rtc_base/checks.h"
#include "rtc_base/logging.h"
#include "rtc_base/time_utils.h"
@@ -376,7 +375,7 @@
if (!is_keyframe && dependency_info->frame_config.References(
static_cast<Vp8FrameConfig::Buffer>(i))) {
RTC_DCHECK_LT(vp8_info.referencedBuffersCount,
- arraysize(CodecSpecificInfoVP8::referencedBuffers));
+ std::size(vp8_info.referencedBuffers));
references = true;
vp8_info.referencedBuffers[vp8_info.referencedBuffersCount++] = i;
}
@@ -384,7 +383,7 @@
if (is_keyframe || dependency_info->frame_config.Updates(
static_cast<Vp8FrameConfig::Buffer>(i))) {
RTC_DCHECK_LT(vp8_info.updatedBuffersCount,
- arraysize(CodecSpecificInfoVP8::updatedBuffers));
+ std::size(vp8_info.updatedBuffers));
updates = true;
vp8_info.updatedBuffers[vp8_info.updatedBuffersCount++] = i;
}
diff --git a/video/video_send_stream_tests.cc b/video/video_send_stream_tests.cc
index 9b0b577..e9b31d3 100644
--- a/video/video_send_stream_tests.cc
+++ b/video/video_send_stream_tests.cc
@@ -1088,8 +1088,7 @@
RTCPSender::FeedbackState feedback_state;
EXPECT_EQ(0, rtcp_sender.SendRTCP(feedback_state, kRtcpNack,
- sequence_numbers.size(),
- sequence_numbers.data()));
+ sequence_numbers));
}
// Drop media packet, otherwise transport feeback may indirectly ack the
