Use webrtc name specifier instead of rtc/cricket in modules/rtp_rtcp
WebRTC has unified all namespaces to webrtc, and the rtc:: and cricket::
name specifiers need to be replaced with webrtc::. This was generated using
a combination of clang AST rewriting tools and sed.
This CL was uploaded by git cl split.
Bug: webrtc:42232595
Change-Id: Iec4090ea11a6e81b3d961ac4366ed50a1c7553a6
No-Iwyu: LSC
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/386662
Reviewed-by: Danil Chapovalov <danilchap@webrtc.org>
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Auto-Submit: Evan Shrubsole <eshr@webrtc.org>
Commit-Queue: Evan Shrubsole <eshr@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#44398}
diff --git a/modules/rtp_rtcp/include/flexfec_sender.h b/modules/rtp_rtcp/include/flexfec_sender.h
index 0f2e505..9df7c89 100644
--- a/modules/rtp_rtcp/include/flexfec_sender.h
+++ b/modules/rtp_rtcp/include/flexfec_sender.h
@@ -50,7 +50,7 @@
uint32_t protected_media_ssrc,
absl::string_view mid,
const std::vector<RtpExtension>& rtp_header_extensions,
- rtc::ArrayView<const RtpExtensionSize> extension_sizes,
+ ArrayView<const RtpExtensionSize> extension_sizes,
const RtpState* rtp_state);
~FlexfecSender();
diff --git a/modules/rtp_rtcp/include/rtp_header_extension_map.h b/modules/rtp_rtcp/include/rtp_header_extension_map.h
index 7f0b7e0..2975c4a 100644
--- a/modules/rtp_rtcp/include/rtp_header_extension_map.h
+++ b/modules/rtp_rtcp/include/rtp_header_extension_map.h
@@ -29,9 +29,9 @@
RtpHeaderExtensionMap();
explicit RtpHeaderExtensionMap(bool extmap_allow_mixed);
- explicit RtpHeaderExtensionMap(rtc::ArrayView<const RtpExtension> extensions);
+ explicit RtpHeaderExtensionMap(ArrayView<const RtpExtension> extensions);
- void Reset(rtc::ArrayView<const RtpExtension> extensions);
+ void Reset(ArrayView<const RtpExtension> extensions);
template <typename Extension>
bool Register(int id) {
diff --git a/modules/rtp_rtcp/include/rtp_rtcp_defines.h b/modules/rtp_rtcp/include/rtp_rtcp_defines.h
index 49a6d22..aae48bc 100644
--- a/modules/rtp_rtcp/include/rtp_rtcp_defines.h
+++ b/modules/rtp_rtcp/include/rtp_rtcp_defines.h
@@ -175,9 +175,8 @@
// Called on an RTCP packet with sender or receiver reports with non zero
// report blocks. Report blocks are combined from all reports into one array.
- virtual void OnReport(
- Timestamp /* receive_time */,
- rtc::ArrayView<const ReportBlockData> /* report_blocks */) {}
+ virtual void OnReport(Timestamp /* receive_time */,
+ ArrayView<const ReportBlockData> /* report_blocks */) {}
virtual void OnRttUpdate(Timestamp /* receive_time */, TimeDelta /* rtt */) {}
};
diff --git a/modules/rtp_rtcp/mocks/mock_network_link_rtcp_observer.h b/modules/rtp_rtcp/mocks/mock_network_link_rtcp_observer.h
index e346043..f2775b7 100644
--- a/modules/rtp_rtcp/mocks/mock_network_link_rtcp_observer.h
+++ b/modules/rtp_rtcp/mocks/mock_network_link_rtcp_observer.h
@@ -45,7 +45,7 @@
MOCK_METHOD(void,
OnReport,
(Timestamp receive_time,
- rtc::ArrayView<const ReportBlockData> report_blocks),
+ ArrayView<const ReportBlockData> report_blocks),
(override));
};
diff --git a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
index 8dac4f8..46163f7 100644
--- a/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
+++ b/modules/rtp_rtcp/mocks/mock_rtp_rtcp.h
@@ -38,7 +38,7 @@
public:
MOCK_METHOD(void,
IncomingRtcpPacket,
- (rtc::ArrayView<const uint8_t> packet),
+ (ArrayView<const uint8_t> packet),
(override));
MOCK_METHOD(void, SetRemoteSSRC, (uint32_t ssrc), (override));
MOCK_METHOD(void, SetLocalSsrc, (uint32_t ssrc), (override));
@@ -120,11 +120,11 @@
(override));
MOCK_METHOD(void,
OnAbortedRetransmissions,
- (rtc::ArrayView<const uint16_t>),
+ (ArrayView<const uint16_t>),
(override));
MOCK_METHOD(void,
OnPacketsAcknowledged,
- (rtc::ArrayView<const uint16_t>),
+ (ArrayView<const uint16_t>),
(override));
MOCK_METHOD(std::vector<std::unique_ptr<RtpPacketToSend>>,
GeneratePadding,
@@ -132,7 +132,7 @@
(override));
MOCK_METHOD(std::vector<RtpSequenceNumberMap::Info>,
GetSentRtpPacketInfos,
- (rtc::ArrayView<const uint16_t> sequence_numbers),
+ (ArrayView<const uint16_t> sequence_numbers),
(const, override));
MOCK_METHOD(size_t, ExpectedPerPacketOverhead, (), (const, override));
MOCK_METHOD(void, OnPacketSendingThreadSwitched, (), (override));
diff --git a/modules/rtp_rtcp/source/absolute_capture_time_interpolator.cc b/modules/rtp_rtcp/source/absolute_capture_time_interpolator.cc
index c884b76..ef7aa4e 100644
--- a/modules/rtp_rtcp/source/absolute_capture_time_interpolator.cc
+++ b/modules/rtp_rtcp/source/absolute_capture_time_interpolator.cc
@@ -31,7 +31,7 @@
uint32_t AbsoluteCaptureTimeInterpolator::GetSource(
uint32_t ssrc,
- rtc::ArrayView<const uint32_t> csrcs) {
+ ArrayView<const uint32_t> csrcs) {
if (csrcs.empty()) {
return ssrc;
}
diff --git a/modules/rtp_rtcp/source/absolute_capture_time_interpolator.h b/modules/rtp_rtcp/source/absolute_capture_time_interpolator.h
index 5b9f817..c6212a8 100644
--- a/modules/rtp_rtcp/source/absolute_capture_time_interpolator.h
+++ b/modules/rtp_rtcp/source/absolute_capture_time_interpolator.h
@@ -43,8 +43,7 @@
explicit AbsoluteCaptureTimeInterpolator(Clock* clock);
// Returns the source (i.e. SSRC or CSRC) of the capture system.
- static uint32_t GetSource(uint32_t ssrc,
- rtc::ArrayView<const uint32_t> csrcs);
+ static uint32_t GetSource(uint32_t ssrc, ArrayView<const uint32_t> csrcs);
// Returns a received header extension, an interpolated header extension, or
// `std::nullopt` if it's not possible to interpolate a header extension.
diff --git a/modules/rtp_rtcp/source/absolute_capture_time_sender.cc b/modules/rtp_rtcp/source/absolute_capture_time_sender.cc
index dc4a59d..61e321f 100644
--- a/modules/rtp_rtcp/source/absolute_capture_time_sender.cc
+++ b/modules/rtp_rtcp/source/absolute_capture_time_sender.cc
@@ -31,9 +31,8 @@
AbsoluteCaptureTimeSender::AbsoluteCaptureTimeSender(Clock* clock)
: clock_(clock) {}
-uint32_t AbsoluteCaptureTimeSender::GetSource(
- uint32_t ssrc,
- rtc::ArrayView<const uint32_t> csrcs) {
+uint32_t AbsoluteCaptureTimeSender::GetSource(uint32_t ssrc,
+ ArrayView<const uint32_t> csrcs) {
return AbsoluteCaptureTimeInterpolator::GetSource(ssrc, csrcs);
}
diff --git a/modules/rtp_rtcp/source/absolute_capture_time_sender.h b/modules/rtp_rtcp/source/absolute_capture_time_sender.h
index f004800..352754c 100644
--- a/modules/rtp_rtcp/source/absolute_capture_time_sender.h
+++ b/modules/rtp_rtcp/source/absolute_capture_time_sender.h
@@ -48,8 +48,7 @@
explicit AbsoluteCaptureTimeSender(Clock* clock);
// Returns the source (i.e. SSRC or CSRC) of the capture system.
- static uint32_t GetSource(uint32_t ssrc,
- rtc::ArrayView<const uint32_t> csrcs);
+ static uint32_t GetSource(uint32_t ssrc, ArrayView<const uint32_t> csrcs);
// Returns value to write into AbsoluteCaptureTime RTP header extension to be
// sent, or `std::nullopt` if the header extension shouldn't be attached to
diff --git a/modules/rtp_rtcp/source/active_decode_targets_helper.cc b/modules/rtp_rtcp/source/active_decode_targets_helper.cc
index 90c74aa..d158532 100644
--- a/modules/rtp_rtcp/source/active_decode_targets_helper.cc
+++ b/modules/rtp_rtcp/source/active_decode_targets_helper.cc
@@ -27,7 +27,7 @@
// missing. That assumptions allows a simple detection when previous frame is
// part of a chain.
std::bitset<32> LastSendOnChain(int frame_diff,
- rtc::ArrayView<const int> chain_diffs) {
+ ArrayView<const int> chain_diffs) {
std::bitset<32> bitmask = 0;
for (size_t i = 0; i < chain_diffs.size(); ++i) {
if (frame_diff == chain_diffs[i]) {
@@ -45,7 +45,7 @@
// Returns bitmask of chains that protect at least one active decode target.
std::bitset<32> ActiveChains(
- rtc::ArrayView<const int> decode_target_protected_by_chain,
+ ArrayView<const int> decode_target_protected_by_chain,
int num_chains,
std::bitset<32> active_decode_targets) {
std::bitset<32> active_chains = 0;
@@ -63,11 +63,11 @@
} // namespace
void ActiveDecodeTargetsHelper::OnFrame(
- rtc::ArrayView<const int> decode_target_protected_by_chain,
+ ArrayView<const int> decode_target_protected_by_chain,
std::bitset<32> active_decode_targets,
bool is_keyframe,
int64_t frame_id,
- rtc::ArrayView<const int> chain_diffs) {
+ ArrayView<const int> chain_diffs) {
const int num_chains = chain_diffs.size();
if (num_chains == 0) {
// Avoid printing the warning
diff --git a/modules/rtp_rtcp/source/active_decode_targets_helper.h b/modules/rtp_rtcp/source/active_decode_targets_helper.h
index 319fcd6..293abaf 100644
--- a/modules/rtp_rtcp/source/active_decode_targets_helper.h
+++ b/modules/rtp_rtcp/source/active_decode_targets_helper.h
@@ -34,11 +34,11 @@
// Decides if active decode target bitmask should be attached to the frame
// that is about to be sent.
- void OnFrame(rtc::ArrayView<const int> decode_target_protected_by_chain,
+ void OnFrame(ArrayView<const int> decode_target_protected_by_chain,
std::bitset<32> active_decode_targets,
bool is_keyframe,
int64_t frame_id,
- rtc::ArrayView<const int> chain_diffs);
+ ArrayView<const int> chain_diffs);
// Returns active decode target to attach to the dependency descriptor.
std::optional<uint32_t> ActiveDecodeTargetsBitmask() const {
diff --git a/modules/rtp_rtcp/source/active_decode_targets_helper_unittest.cc b/modules/rtp_rtcp/source/active_decode_targets_helper_unittest.cc
index c2722ef..e87ae17 100644
--- a/modules/rtp_rtcp/source/active_decode_targets_helper_unittest.cc
+++ b/modules/rtp_rtcp/source/active_decode_targets_helper_unittest.cc
@@ -228,8 +228,8 @@
}
TEST(ActiveDecodeTargetsHelperTest, ReturnsNulloptWhenChainsAreNotUsed) {
- const rtc::ArrayView<const int> kDecodeTargetProtectedByChain;
- const rtc::ArrayView<const int> kNoChainDiffs;
+ const ArrayView<const int> kDecodeTargetProtectedByChain;
+ const ArrayView<const int> kNoChainDiffs;
ActiveDecodeTargetsHelper helper;
helper.OnFrame(kDecodeTargetProtectedByChain, /*active_decode_targets=*/kAll,
diff --git a/modules/rtp_rtcp/source/corruption_detection_extension.cc b/modules/rtp_rtcp/source/corruption_detection_extension.cc
index 4cc42da..934fb2c 100644
--- a/modules/rtp_rtcp/source/corruption_detection_extension.cc
+++ b/modules/rtp_rtcp/source/corruption_detection_extension.cc
@@ -30,7 +30,7 @@
// A description of the extension can be found at
// http://www.webrtc.org/experiments/rtp-hdrext/corruption-detection
-bool CorruptionDetectionExtension::Parse(rtc::ArrayView<const uint8_t> data,
+bool CorruptionDetectionExtension::Parse(ArrayView<const uint8_t> data,
CorruptionDetectionMessage* message) {
if (message == nullptr) {
return false;
@@ -55,7 +55,7 @@
}
bool CorruptionDetectionExtension::Write(
- rtc::ArrayView<uint8_t> data,
+ ArrayView<uint8_t> data,
const CorruptionDetectionMessage& message) {
if (data.size() != ValueSize(message) || data.size() > kMaxValueSizeBytes) {
return false;
@@ -72,7 +72,7 @@
std::round(message.std_dev() / kMaxValueForStdDev * 255.0));
data[2] = (message.luma_error_threshold() << 4) |
(message.chroma_error_threshold() & 0xF);
- rtc::ArrayView<uint8_t> sample_values = data.subview(kConfigurationBytes);
+ ArrayView<uint8_t> sample_values = data.subview(kConfigurationBytes);
for (size_t i = 0; i < message.sample_values().size(); ++i) {
sample_values[i] = std::floor(message.sample_values()[i]);
}
diff --git a/modules/rtp_rtcp/source/corruption_detection_extension.h b/modules/rtp_rtcp/source/corruption_detection_extension.h
index a72a581..4dc6c55 100644
--- a/modules/rtp_rtcp/source/corruption_detection_extension.h
+++ b/modules/rtp_rtcp/source/corruption_detection_extension.h
@@ -38,9 +38,9 @@
static constexpr absl::string_view Uri() {
return RtpExtension::kCorruptionDetectionUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
CorruptionDetectionMessage* message);
- static bool Write(rtc::ArrayView<uint8_t> data,
+ static bool Write(ArrayView<uint8_t> data,
const CorruptionDetectionMessage& message);
// Size of the header extension in bytes.
static size_t ValueSize(const CorruptionDetectionMessage& message);
diff --git a/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc b/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc
index 25a4f14..b6cf0d6 100644
--- a/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc
+++ b/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.cc
@@ -251,7 +251,7 @@
std::vector<RtpSequenceNumberMap::Info>
DEPRECATED_RtpSenderEgress::GetSentRtpPacketInfos(
- rtc::ArrayView<const uint16_t> sequence_numbers) const {
+ ArrayView<const uint16_t> sequence_numbers) const {
RTC_DCHECK(!sequence_numbers.empty());
if (!need_rtp_packet_infos_) {
return std::vector<RtpSequenceNumberMap::Info>();
diff --git a/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.h b/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.h
index 6fdbc4f..4a3e1f8 100644
--- a/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.h
+++ b/modules/rtp_rtcp/source/deprecated/deprecated_rtp_sender_egress.h
@@ -82,7 +82,7 @@
// recalled, return a vector with all of them (in corresponding order).
// If any could not be recalled, return an empty vector.
std::vector<RtpSequenceNumberMap::Info> GetSentRtpPacketInfos(
- rtc::ArrayView<const uint16_t> sequence_numbers) const
+ ArrayView<const uint16_t> sequence_numbers) const
RTC_LOCKS_EXCLUDED(lock_);
private:
diff --git a/modules/rtp_rtcp/source/fec_private_tables_bursty_unittest.cc b/modules/rtp_rtcp/source/fec_private_tables_bursty_unittest.cc
index f4532d4..69fbde03 100644
--- a/modules/rtp_rtcp/source/fec_private_tables_bursty_unittest.cc
+++ b/modules/rtp_rtcp/source/fec_private_tables_bursty_unittest.cc
@@ -30,7 +30,7 @@
using internal::LookUpInFecTable;
TEST(FecTable, TestBurstyLookup) {
- rtc::ArrayView<const uint8_t> result;
+ ArrayView<const uint8_t> result;
result = LookUpInFecTable(&kPacketMaskBurstyTbl[0], 0, 0);
// Should match kMaskBursty1_1.
EXPECT_EQ(2u, result.size());
@@ -56,7 +56,7 @@
}
TEST(FecTable, TestRandomLookup) {
- rtc::ArrayView<const uint8_t> result;
+ ArrayView<const uint8_t> result;
result = LookUpInFecTable(&kPacketMaskRandomTbl[0], 0, 0);
EXPECT_EQ(2u, result.size());
EXPECT_EQ(0x80u, result[0]);
@@ -75,7 +75,7 @@
int num_fec_packets = 6;
size_t mask_size = sizeof(kMaskRandom15_6) / sizeof(uint8_t);
internal::PacketMaskTable mask_table(fec_mask_type, num_media_packets);
- rtc::ArrayView<const uint8_t> mask =
+ ArrayView<const uint8_t> mask =
mask_table.LookUp(num_media_packets, num_fec_packets);
EXPECT_EQ(mask.size(), mask_size);
for (size_t i = 0; i < mask_size; ++i) {
diff --git a/modules/rtp_rtcp/source/fec_test_helper.cc b/modules/rtp_rtcp/source/fec_test_helper.cc
index 30db971..3186a47 100644
--- a/modules/rtp_rtcp/source/fec_test_helper.cc
+++ b/modules/rtp_rtcp/source/fec_test_helper.cc
@@ -194,7 +194,7 @@
const AugmentedPacket& packet,
bool is_recovered) {
// Create a temporary buffer used to wrap the media packet in RED.
- rtc::CopyOnWriteBuffer red_buffer;
+ CopyOnWriteBuffer red_buffer;
const size_t kHeaderLength = packet.header.headerLength;
// Append header.
red_buffer.SetData(packet.data.data(), kHeaderLength);
diff --git a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.cc b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.cc
index 85a2dd2..3ecbec9 100644
--- a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.cc
+++ b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.cc
@@ -250,7 +250,7 @@
// FecHeaderSize(), so in this function we can be sure that we are
// writing in space that is intended for the header.
void Flexfec03HeaderWriter::FinalizeFecHeader(
- rtc::ArrayView<const ProtectedStream> protected_streams,
+ ArrayView<const ProtectedStream> protected_streams,
ForwardErrorCorrection::Packet& fec_packet) const {
RTC_CHECK_EQ(protected_streams.size(), 1);
uint32_t media_ssrc = protected_streams[0].ssrc;
diff --git a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.h b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.h
index 6cec17b..04dcf31 100644
--- a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.h
+++ b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer.h
@@ -77,7 +77,7 @@
size_t FecHeaderSize(size_t packet_mask_row_size) const override;
void FinalizeFecHeader(
- rtc::ArrayView<const ProtectedStream> protected_streams,
+ ArrayView<const ProtectedStream> protected_streams,
ForwardErrorCorrection::Packet& fec_packet) const override;
};
diff --git a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc
index 1a0b9d3..80b4ba3 100644
--- a/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_03_header_reader_writer_unittest.cc
@@ -76,10 +76,10 @@
packet_mask[index / 8] |= (1 << (7 - index % 8));
}
-rtc::scoped_refptr<Packet> WriteHeader(const uint8_t* packet_mask,
- size_t packet_mask_size) {
+scoped_refptr<Packet> WriteHeader(const uint8_t* packet_mask,
+ size_t packet_mask_size) {
Flexfec03HeaderWriter writer;
- rtc::scoped_refptr<Packet> written_packet(new Packet());
+ scoped_refptr<Packet> written_packet(new Packet());
written_packet->data.SetSize(kMediaPacketLength);
uint8_t* data = written_packet->data.MutableData();
for (size_t i = 0; i < written_packet->data.size(); ++i) {
@@ -97,7 +97,7 @@
Flexfec03HeaderReader reader;
std::unique_ptr<ReceivedFecPacket> read_packet(new ReceivedFecPacket());
read_packet->ssrc = kFlexfecSsrc;
- read_packet->pkt = rtc::scoped_refptr<Packet>(new Packet());
+ read_packet->pkt = scoped_refptr<Packet>(new Packet());
read_packet->pkt->data = written_packet.data;
EXPECT_TRUE(reader.ReadFecHeader(read_packet.get()));
return read_packet;
@@ -188,7 +188,7 @@
kPayloadBits, kPayloadBits, kPayloadBits, kPayloadBits};
const size_t packet_length = sizeof(kPacketData);
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::scoped_refptr<Packet>(new Packet());
+ read_packet.pkt = scoped_refptr<Packet>(new Packet());
read_packet.pkt->data.SetData(kPacketData, packet_length);
Flexfec03HeaderReader reader;
@@ -219,7 +219,7 @@
kPayloadBits, kPayloadBits, kPayloadBits, kPayloadBits};
const size_t packet_length = sizeof(kPacketData);
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::scoped_refptr<Packet>(new Packet());
+ read_packet.pkt = scoped_refptr<Packet>(new Packet());
read_packet.pkt->data.SetData(kPacketData, packet_length);
Flexfec03HeaderReader reader;
@@ -257,7 +257,7 @@
kPayloadBits, kPayloadBits, kPayloadBits, kPayloadBits};
const size_t packet_length = sizeof(kPacketData);
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::scoped_refptr<Packet>(new Packet());
+ read_packet.pkt = scoped_refptr<Packet>(new Packet());
read_packet.pkt->data.SetData(kPacketData, packet_length);
Flexfec03HeaderReader reader;
diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc
index 4306898..d1e0b99 100644
--- a/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc
+++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer.cc
@@ -251,7 +251,7 @@
// TODO(brandtr): Update this function when we support offset-based masks
// and retransmissions.
void FlexfecHeaderWriter::FinalizeFecHeader(
- rtc::ArrayView<const ProtectedStream> protected_streams,
+ ArrayView<const ProtectedStream> protected_streams,
ForwardErrorCorrection::Packet& fec_packet) const {
uint8_t* data = fec_packet.data.MutableData();
*data &= 0x7f; // Clear R bit.
diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer.h b/modules/rtp_rtcp/source/flexfec_header_reader_writer.h
index 296c52d..1f5202c 100644
--- a/modules/rtp_rtcp/source/flexfec_header_reader_writer.h
+++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer.h
@@ -59,7 +59,7 @@
size_t FecHeaderSize(size_t packet_mask_row_size) const override;
void FinalizeFecHeader(
- rtc::ArrayView<const ProtectedStream> protected_streams,
+ ArrayView<const ProtectedStream> protected_streams,
ForwardErrorCorrection::Packet& fec_packet) const override;
};
diff --git a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
index bf9abf6..241675a 100644
--- a/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/flexfec_header_reader_writer_unittest.cc
@@ -55,13 +55,13 @@
struct FecPacketStreamReadProperties {
ProtectedStream stream;
- rtc::ArrayView<const uint8_t> mask;
+ ArrayView<const uint8_t> mask;
};
struct FecPacketStreamWriteProperties {
size_t byte_index;
uint16_t seq_num_base;
- rtc::ArrayView<const uint8_t> mask;
+ ArrayView<const uint8_t> mask;
};
Packet WritePacket(
@@ -94,9 +94,9 @@
EXPECT_EQ(protected_stream.packet_mask_size,
expected[i].stream.packet_mask_size);
// Ensure that the K-bits are removed and the packet mask has been packed.
- EXPECT_THAT(rtc::MakeArrayView(read_packet.pkt->data.cdata() +
- protected_stream.packet_mask_offset,
- protected_stream.packet_mask_size),
+ EXPECT_THAT(MakeArrayView(read_packet.pkt->data.cdata() +
+ protected_stream.packet_mask_offset,
+ protected_stream.packet_mask_size),
ElementsAreArray(expected[i].mask));
}
EXPECT_EQ(read_packet.pkt->data.size() - expected_fec_header_size,
@@ -116,8 +116,8 @@
ByteReader<uint16_t>::ReadBigEndian(packet + expected[i].byte_index),
expected[i].seq_num_base);
// Verify mask.
- EXPECT_THAT(rtc::MakeArrayView(packet + expected[i].byte_index + 2,
- expected[i].mask.size()),
+ EXPECT_THAT(MakeArrayView(packet + expected[i].byte_index + 2,
+ expected[i].mask.size()),
ElementsAreArray(expected[i].mask));
}
}
@@ -130,7 +130,7 @@
// Read FEC Header using written data.
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
read_packet.pkt->data = written_packet.data;
for (const FecHeaderWriter::ProtectedStream& stream :
write_protected_streams) {
@@ -163,20 +163,19 @@
read_packet.pkt->data.cdata() +
read_packet.protected_streams[i].packet_mask_offset;
// Verify actual mask bits.
- EXPECT_THAT(rtc::MakeArrayView(read_mask_ptr, mask_write_size),
+ EXPECT_THAT(MakeArrayView(read_mask_ptr, mask_write_size),
ElementsAreArray(write_protected_streams[i].packet_mask));
// If read mask size is larger than written mask size, verify all other bits
// are 0.
- EXPECT_THAT(rtc::MakeArrayView(read_mask_ptr + mask_write_size,
- expected_mask_read_size - mask_write_size),
+ EXPECT_THAT(MakeArrayView(read_mask_ptr + mask_write_size,
+ expected_mask_read_size - mask_write_size),
Each(0));
}
// Verify that the call to ReadFecHeader did not tamper with the payload.
EXPECT_THAT(
- rtc::MakeArrayView(
- read_packet.pkt->data.cdata() + read_packet.fec_header_size,
- read_packet.pkt->data.size() - read_packet.fec_header_size),
+ MakeArrayView(read_packet.pkt->data.cdata() + read_packet.fec_header_size,
+ read_packet.pkt->data.size() - read_packet.fec_header_size),
ElementsAreArray(written_packet.data.cdata() + expected_header_size,
written_packet.data.size() - expected_header_size));
}
@@ -194,7 +193,7 @@
kSnBase >> 8, kSnBase & 0xFF, kFlexfecPktMask[0], kFlexfecPktMask[1],
kPayloadBits, kPayloadBits, kPayloadBits, kPayloadBits};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
read_packet.pkt->data.SetData(kPacketData);
read_packet.protected_streams = {{.ssrc = 0x01}};
@@ -227,7 +226,7 @@
kFlexfecPktMask[5], kPayloadBits, kPayloadBits,
kPayloadBits, kPayloadBits};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
read_packet.pkt->data.SetData(kPacketData);
read_packet.protected_streams = {{.ssrc = 0x01}};
@@ -284,7 +283,7 @@
kPayloadBits,
kPayloadBits};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
read_packet.pkt->data.SetData(kPacketData);
read_packet.protected_streams = {{.ssrc = 0x01}};
@@ -317,7 +316,7 @@
kSnBase1 >> 8, kSnBase1 & 0xFF, kFlexfecPktMask2[0], kFlexfecPktMask2[1],
kPayloadBits, kPayloadBits, kPayloadBits, kPayloadBits};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
read_packet.pkt->data.SetData(kPacketData);
read_packet.protected_streams = {{.ssrc = 0x01}, {.ssrc = 0x02}};
@@ -364,7 +363,7 @@
kPayloadBits, kPayloadBits, kPayloadBits,
kPayloadBits};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
read_packet.pkt->data.SetData(kPacketData);
read_packet.protected_streams = {{.ssrc = 0x01}, {.ssrc = 0x02}};
@@ -453,7 +452,7 @@
kPayloadBits,
kPayloadBits};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
read_packet.pkt->data.SetData(kPacketData);
read_packet.protected_streams = {{.ssrc = 0x01}, {.ssrc = 0x02}};
@@ -549,7 +548,7 @@
kPayloadBits,
kPayloadBits};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
read_packet.pkt->data.SetData(kPacketData);
read_packet.protected_streams = {
{.ssrc = 0x01}, {.ssrc = 0x02}, {.ssrc = 0x03}, {.ssrc = 0x04}};
@@ -588,7 +587,7 @@
kFlexible, kPtRecovery, kLengthRecovery[0], kLengthRecovery[1],
kTsRecovery[0], kTsRecovery[1], kTsRecovery[2], kTsRecovery[3]};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
read_packet.pkt->data.SetData(kPacketData);
// No protected ssrcs.
read_packet.protected_streams = {};
@@ -603,7 +602,7 @@
kFlexible, kPtRecovery, kLengthRecovery[0], kLengthRecovery[1],
kTsRecovery[0], kTsRecovery[1], kTsRecovery[2], kTsRecovery[3]};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
read_packet.pkt->data.SetData(kPacketData);
read_packet.protected_streams = {{.ssrc = 0x01}};
@@ -618,7 +617,7 @@
kTsRecovery[0], kTsRecovery[1], kTsRecovery[2], kTsRecovery[3],
kSnBases[0][0], kSnBases[0][1], kMask0[0], kMask0[1]};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
// Expected to have 2 bytes of mask but length of packet misses 1 byte.
read_packet.pkt->data.SetData(kPacketData, sizeof(kPacketData) - 1);
read_packet.protected_streams = {{.ssrc = 0x01}};
@@ -635,7 +634,7 @@
kSnBases[0][0], kSnBases[0][1], kMask1[0], kMask1[1],
kMask1[2], kMask1[3], kMask1[4], kMask1[5]};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
// Expected to have 6 bytes of mask but length of packet misses 2 bytes.
read_packet.pkt->data.SetData(kPacketData, sizeof(kPacketData) - 2);
read_packet.protected_streams = {{.ssrc = 0x01}};
@@ -654,7 +653,7 @@
kMask2[6], kMask2[7], kMask2[8], kMask2[9],
kMask2[10], kMask2[11], kMask2[12], kMask2[13]};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
// Expected to have 14 bytes of mask but length of packet misses 2 bytes.
read_packet.pkt->data.SetData(kPacketData, sizeof(kPacketData) - 2);
read_packet.protected_streams = {{.ssrc = 0x01}};
@@ -674,7 +673,7 @@
kMask2[6], kMask2[7], kMask2[8], kMask2[9],
kMask2[10], kMask2[11], kMask2[12], kMask2[13]};
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::make_ref_counted<Packet>();
+ read_packet.pkt = make_ref_counted<Packet>();
// Subtract 2 bytes from length, so the read will fail on parsing second
read_packet.pkt->data.SetData(kPacketData, sizeof(kPacketData) - 2);
read_packet.protected_streams = {{.ssrc = 0x01}, {.ssrc = 0x02}};
diff --git a/modules/rtp_rtcp/source/flexfec_receiver.cc b/modules/rtp_rtcp/source/flexfec_receiver.cc
index 3643f01..c6465fb 100644
--- a/modules/rtp_rtcp/source/flexfec_receiver.cc
+++ b/modules/rtp_rtcp/source/flexfec_receiver.cc
@@ -117,7 +117,7 @@
++packet_counter_.num_fec_packets;
// Insert packet payload into erasure code.
- received_packet->pkt = rtc::scoped_refptr<ForwardErrorCorrection::Packet>(
+ received_packet->pkt = scoped_refptr<ForwardErrorCorrection::Packet>(
new ForwardErrorCorrection::Packet());
received_packet->pkt->data =
packet.Buffer().Slice(packet.headers_size(), packet.payload_size());
@@ -131,7 +131,7 @@
// Insert entire packet into erasure code.
// Create a copy and fill with zeros all mutable extensions.
- received_packet->pkt = rtc::scoped_refptr<ForwardErrorCorrection::Packet>(
+ received_packet->pkt = scoped_refptr<ForwardErrorCorrection::Packet>(
new ForwardErrorCorrection::Packet());
RtpPacketReceived packet_copy(packet);
packet_copy.ZeroMutableExtensions();
@@ -191,8 +191,7 @@
bool should_log_periodically =
now - last_recovered_packet_ > kPacketLogInterval;
if (RTC_LOG_CHECK_LEVEL(LS_VERBOSE) || should_log_periodically) {
- rtc::LoggingSeverity level =
- should_log_periodically ? rtc::LS_INFO : rtc::LS_VERBOSE;
+ LoggingSeverity level = should_log_periodically ? LS_INFO : LS_VERBOSE;
RTC_LOG_V(level) << "Recovered media packet with SSRC: "
<< parsed_packet.Ssrc() << " seq "
<< parsed_packet.SequenceNumber() << " recovered length "
diff --git a/modules/rtp_rtcp/source/flexfec_sender.cc b/modules/rtp_rtcp/source/flexfec_sender.cc
index fabc919..9b5ceac 100644
--- a/modules/rtp_rtcp/source/flexfec_sender.cc
+++ b/modules/rtp_rtcp/source/flexfec_sender.cc
@@ -90,7 +90,7 @@
uint32_t protected_media_ssrc,
absl::string_view mid,
const std::vector<RtpExtension>& rtp_header_extensions,
- rtc::ArrayView<const RtpExtensionSize> extension_sizes,
+ ArrayView<const RtpExtensionSize> extension_sizes,
const RtpState* rtp_state)
: env_(env),
random_(env_.clock().TimeInMicroseconds()),
diff --git a/modules/rtp_rtcp/source/forward_error_correction.h b/modules/rtp_rtcp/source/forward_error_correction.h
index e440175..b4e1a50 100644
--- a/modules/rtp_rtcp/source/forward_error_correction.h
+++ b/modules/rtp_rtcp/source/forward_error_correction.h
@@ -55,7 +55,7 @@
// reaches zero.
virtual int32_t Release();
- rtc::CopyOnWriteBuffer data; // Packet data.
+ CopyOnWriteBuffer data; // Packet data.
private:
int32_t ref_count_; // Counts the number of references to a packet.
@@ -86,7 +86,7 @@
// otherwise.
bool is_recovered;
RtpHeaderExtensionMap extensions;
- rtc::scoped_refptr<Packet> pkt; // Pointer to the packet storage.
+ scoped_refptr<Packet> pkt; // Pointer to the packet storage.
};
// The recovered list parameter of DecodeFec() references structs of
@@ -102,7 +102,7 @@
// through the received packet list.
bool returned; // True when the packet already has been returned to the
// caller through the callback.
- rtc::scoped_refptr<Packet> pkt; // Pointer to the packet storage.
+ scoped_refptr<Packet> pkt; // Pointer to the packet storage.
};
// Used to link media packets to their protecting FEC packets.
@@ -113,7 +113,7 @@
ProtectedPacket();
~ProtectedPacket();
- rtc::scoped_refptr<ForwardErrorCorrection::Packet> pkt;
+ scoped_refptr<ForwardErrorCorrection::Packet> pkt;
};
using ProtectedPacketList = std::list<std::unique_ptr<ProtectedPacket>>;
@@ -148,7 +148,7 @@
protected_streams;
size_t protection_length;
// Raw data.
- rtc::scoped_refptr<ForwardErrorCorrection::Packet> pkt;
+ scoped_refptr<ForwardErrorCorrection::Packet> pkt;
};
using PacketList = std::list<std::unique_ptr<Packet>>;
@@ -398,7 +398,7 @@
struct ProtectedStream {
uint32_t ssrc = 0;
uint16_t seq_num_base = 0;
- rtc::ArrayView<const uint8_t> packet_mask;
+ ArrayView<const uint8_t> packet_mask;
};
virtual ~FecHeaderWriter();
@@ -424,7 +424,7 @@
// Writes FEC header.
virtual void FinalizeFecHeader(
- rtc::ArrayView<const ProtectedStream> protected_streams,
+ ArrayView<const ProtectedStream> protected_streams,
ForwardErrorCorrection::Packet& fec_packet) const = 0;
protected:
diff --git a/modules/rtp_rtcp/source/forward_error_correction_internal.cc b/modules/rtp_rtcp/source/forward_error_correction_internal.cc
index 607948f..98aa2b3 100644
--- a/modules/rtp_rtcp/source/forward_error_correction_internal.cc
+++ b/modules/rtp_rtcp/source/forward_error_correction_internal.cc
@@ -151,8 +151,8 @@
PacketMaskTable::~PacketMaskTable() = default;
-rtc::ArrayView<const uint8_t> PacketMaskTable::LookUp(int num_media_packets,
- int num_fec_packets) {
+ArrayView<const uint8_t> PacketMaskTable::LookUp(int num_media_packets,
+ int num_fec_packets) {
RTC_DCHECK_GT(num_media_packets, 0);
RTC_DCHECK_GT(num_fec_packets, 0);
RTC_DCHECK_LE(num_media_packets, kUlpfecMaxMediaPackets);
@@ -247,7 +247,7 @@
PacketMaskSize(num_media_packets - num_fec_for_imp_packets);
auto end_row = (num_fec_for_imp_packets + num_fec_remaining);
- rtc::ArrayView<const uint8_t> packet_mask_sub_21 = mask_table->LookUp(
+ ArrayView<const uint8_t> packet_mask_sub_21 = mask_table->LookUp(
num_media_packets - num_fec_for_imp_packets, num_fec_remaining);
ShiftFitSubMask(num_mask_bytes, res_mask_bytes, num_fec_for_imp_packets,
@@ -255,7 +255,7 @@
} else if (mode == kModeOverlap || mode == kModeBiasFirstPacket) {
// sub_mask22
- rtc::ArrayView<const uint8_t> packet_mask_sub_22 =
+ ArrayView<const uint8_t> packet_mask_sub_22 =
mask_table->LookUp(num_media_packets, num_fec_remaining);
FitSubMask(num_mask_bytes, num_mask_bytes, num_fec_remaining,
@@ -282,7 +282,7 @@
const int num_imp_mask_bytes = PacketMaskSize(num_imp_packets);
// Get sub_mask1 from table
- rtc::ArrayView<const uint8_t> packet_mask_sub_1 =
+ ArrayView<const uint8_t> packet_mask_sub_1 =
mask_table->LookUp(num_imp_packets, num_fec_for_imp_packets);
FitSubMask(num_mask_bytes, num_imp_mask_bytes, num_fec_for_imp_packets,
@@ -411,9 +411,9 @@
// * For all entries: 2 * fec index (1 based)
// * Size for kPacketMaskBurstyTbl: 2 bytes.
// * For all entries: 2 * fec index (1 based)
-rtc::ArrayView<const uint8_t> LookUpInFecTable(const uint8_t* table,
- int media_packet_index,
- int fec_index) {
+ArrayView<const uint8_t> LookUpInFecTable(const uint8_t* table,
+ int media_packet_index,
+ int fec_index) {
RTC_DCHECK_LT(media_packet_index, table[0]);
// Skip over the table size.
@@ -467,7 +467,7 @@
// Retrieve corresponding mask table directly:for equal-protection case.
// Mask = (k,n-k), with protection factor = (n-k)/k,
// where k = num_media_packets, n=total#packets, (n-k)=num_fec_packets.
- rtc::ArrayView<const uint8_t> mask =
+ ArrayView<const uint8_t> mask =
mask_table->LookUp(num_media_packets, num_fec_packets);
memcpy(packet_mask, &mask[0], mask.size());
} else { // UEP case
diff --git a/modules/rtp_rtcp/source/forward_error_correction_internal.h b/modules/rtp_rtcp/source/forward_error_correction_internal.h
index 31acf73..e02ba49 100644
--- a/modules/rtp_rtcp/source/forward_error_correction_internal.h
+++ b/modules/rtp_rtcp/source/forward_error_correction_internal.h
@@ -43,8 +43,7 @@
PacketMaskTable(FecMaskType fec_mask_type, int num_media_packets);
~PacketMaskTable();
- rtc::ArrayView<const uint8_t> LookUp(int num_media_packets,
- int num_fec_packets);
+ ArrayView<const uint8_t> LookUp(int num_media_packets, int num_fec_packets);
private:
static const uint8_t* PickTable(FecMaskType fec_mask_type,
@@ -53,9 +52,9 @@
uint8_t fec_packet_mask_[kFECPacketMaskMaxSize];
};
-rtc::ArrayView<const uint8_t> LookUpInFecTable(const uint8_t* table,
- int media_packet_index,
- int fec_index);
+ArrayView<const uint8_t> LookUpInFecTable(const uint8_t* table,
+ int media_packet_index,
+ int fec_index);
// Returns an array of packet masks. The mask of a single FEC packet
// corresponds to a number of mask bytes. The mask indicates which
diff --git a/modules/rtp_rtcp/source/frame_object.cc b/modules/rtp_rtcp/source/frame_object.cc
index c1c4f5a..d1ae7b9 100644
--- a/modules/rtp_rtcp/source/frame_object.cc
+++ b/modules/rtp_rtcp/source/frame_object.cc
@@ -49,7 +49,7 @@
std::variant<FrameInstrumentationSyncData, FrameInstrumentationData>>&
frame_instrumentation_data,
RtpPacketInfos packet_infos,
- rtc::scoped_refptr<EncodedImageBuffer> image_buffer)
+ scoped_refptr<EncodedImageBuffer> image_buffer)
: image_buffer_(image_buffer),
first_seq_num_(first_seq_num),
last_seq_num_(last_seq_num),
diff --git a/modules/rtp_rtcp/source/frame_object.h b/modules/rtp_rtcp/source/frame_object.h
index 48bdf2a..44bbf6e 100644
--- a/modules/rtp_rtcp/source/frame_object.h
+++ b/modules/rtp_rtcp/source/frame_object.h
@@ -53,7 +53,7 @@
FrameInstrumentationData>>&
frame_instrumentation_data,
RtpPacketInfos packet_infos,
- rtc::scoped_refptr<EncodedImageBuffer> image_buffer);
+ scoped_refptr<EncodedImageBuffer> image_buffer);
~RtpFrameObject() override;
uint16_t first_seq_num() const;
@@ -78,7 +78,7 @@
private:
// Reference for mutable access.
- rtc::scoped_refptr<EncodedImageBuffer> image_buffer_;
+ scoped_refptr<EncodedImageBuffer> image_buffer_;
RTPVideoHeader rtp_video_header_;
VideoCodecType codec_type_;
uint16_t first_seq_num_;
diff --git a/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc b/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc
index 71a6ca1..312bdcb 100644
--- a/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc
+++ b/modules/rtp_rtcp/source/frame_transformer_factory_unittest.cc
@@ -35,7 +35,7 @@
NiceMock<MockTransformableAudioFrame> original_frame;
uint8_t data[10];
std::fill_n(data, 10, 5);
- rtc::ArrayView<uint8_t> data_view(data);
+ ArrayView<uint8_t> data_view(data);
ON_CALL(original_frame, GetData()).WillByDefault(Return(data_view));
auto cloned_frame = CloneAudioFrame(&original_frame);
@@ -46,7 +46,7 @@
NiceMock<MockTransformableVideoFrame> original_frame;
uint8_t data[10];
std::fill_n(data, 10, 5);
- rtc::ArrayView<uint8_t> data_view(data);
+ ArrayView<uint8_t> data_view(data);
EXPECT_CALL(original_frame, GetData()).WillRepeatedly(Return(data_view));
webrtc::VideoFrameMetadata metadata;
std::vector<uint32_t> csrcs{123, 321};
diff --git a/modules/rtp_rtcp/source/leb128_unittest.cc b/modules/rtp_rtcp/source/leb128_unittest.cc
index dbabcb3..c58b8bc 100644
--- a/modules/rtp_rtcp/source/leb128_unittest.cc
+++ b/modules/rtp_rtcp/source/leb128_unittest.cc
@@ -122,7 +122,7 @@
uint8_t buffer[16];
EXPECT_EQ(WriteLeb128(0x7fff'ffff'ffff'ffff, buffer), 9);
EXPECT_THAT(
- rtc::MakeArrayView(buffer, 9),
+ MakeArrayView(buffer, 9),
ElementsAre(0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x7f));
}
@@ -130,7 +130,7 @@
uint8_t buffer[16];
EXPECT_EQ(WriteLeb128(0xffff'ffff'ffff'ffff, buffer), 10);
EXPECT_THAT(
- rtc::MakeArrayView(buffer, 10),
+ MakeArrayView(buffer, 10),
ElementsAre(0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0x01));
}
diff --git a/modules/rtp_rtcp/source/nack_rtx_unittest.cc b/modules/rtp_rtcp/source/nack_rtx_unittest.cc
index 71d2ac3..28b75a7 100644
--- a/modules/rtp_rtcp/source/nack_rtx_unittest.cc
+++ b/modules/rtp_rtcp/source/nack_rtx_unittest.cc
@@ -90,7 +90,7 @@
packet_loss_ = 0;
}
- bool SendRtp(rtc::ArrayView<const uint8_t> data,
+ bool SendRtp(ArrayView<const uint8_t> data,
const PacketOptions& /* options */) override {
count_++;
RtpPacketReceived packet;
@@ -115,7 +115,7 @@
return true;
}
- bool SendRtcp(rtc::ArrayView<const uint8_t> data) override {
+ bool SendRtcp(ArrayView<const uint8_t> data) override {
module_->IncomingRtcpPacket(data);
return true;
}
diff --git a/modules/rtp_rtcp/source/rtcp_packet.cc b/modules/rtp_rtcp/source/rtcp_packet.cc
index ae7c29d..5af4ccb 100644
--- a/modules/rtp_rtcp/source/rtcp_packet.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet.cc
@@ -21,8 +21,8 @@
namespace webrtc {
namespace rtcp {
-rtc::Buffer RtcpPacket::Build() const {
- rtc::Buffer packet(BlockLength());
+Buffer RtcpPacket::Build() const {
+ Buffer packet(BlockLength());
size_t length = 0;
bool created = Create(packet.data(), &length, packet.capacity(), nullptr);
@@ -48,7 +48,7 @@
if (*index == 0)
return false;
RTC_DCHECK(callback) << "Fragmentation not supported.";
- callback(rtc::ArrayView<const uint8_t>(packet, *index));
+ callback(ArrayView<const uint8_t>(packet, *index));
*index = 0;
return true;
}
diff --git a/modules/rtp_rtcp/source/rtcp_packet.h b/modules/rtp_rtcp/source/rtcp_packet.h
index 164173f..0794146 100644
--- a/modules/rtp_rtcp/source/rtcp_packet.h
+++ b/modules/rtp_rtcp/source/rtcp_packet.h
@@ -39,13 +39,13 @@
// uint8_t packet[kPacketSize]; // with sequence number 56.
// fir.Build(packet, &length, kPacketSize);
//
-// rtc::Buffer packet = fir.Build(); // Returns a RawPacket holding
-// // the built rtcp packet.
+// Buffer packet = fir.Build(); // Returns a RawPacket holding
+// // the built rtcp packet.
//
-// CompoundPacket compound; // Builds a compound RTCP packet with
-// compound.Append(&rr); // a receiver report, report block
-// compound.Append(&fir); // and fir message.
-// rtc::Buffer packet = compound.Build();
+// CompoundPacket compound; // Builds a compound RTCP packet with
+// compound.Append(&rr); // a receiver report, report block
+// compound.Append(&fir); // and fir message.
+// Buffer packet = compound.Build();
class RtcpPacket {
public:
@@ -54,7 +54,7 @@
// max_length bytes, it will be fragmented and multiple calls to this
// callback will be made.
using PacketReadyCallback =
- FunctionView<void(rtc::ArrayView<const uint8_t> packet)>;
+ FunctionView<void(ArrayView<const uint8_t> packet)>;
virtual ~RtcpPacket() = default;
@@ -63,7 +63,7 @@
// Convenience method mostly used for test. Creates packet without
// fragmentation using BlockLength() to allocate big enough buffer.
- rtc::Buffer Build() const;
+ Buffer Build() const;
// Returns true if call to Create succeeded.
bool Build(size_t max_length, PacketReadyCallback callback) const;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/app.h b/modules/rtp_rtcp/source/rtcp_packet/app.h
index 4518792..c27a384 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/app.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/app.h
@@ -59,7 +59,7 @@
uint8_t sub_type_;
uint32_t name_;
- rtc::Buffer data_;
+ Buffer data_;
};
} // namespace rtcp
diff --git a/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc
index 0d3987c..4448f34 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/app_unittest.cc
@@ -60,7 +60,7 @@
app.SetSubType(kSubtype);
app.SetName(kName);
- rtc::Buffer raw = app.Build();
+ Buffer raw = app.Build();
EXPECT_THAT(make_tuple(raw.data(), raw.size()),
ElementsAreArray(kPacketWithoutData));
@@ -83,7 +83,7 @@
app.SetName(kName);
app.SetData(kData, sizeof(kData));
- rtc::Buffer raw = app.Build();
+ Buffer raw = app.Build();
EXPECT_THAT(make_tuple(raw.data(), raw.size()),
ElementsAreArray(kPacketWithData));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
index b08c9d6..af47d67 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/bye_unittest.cc
@@ -34,7 +34,7 @@
Bye bye;
bye.SetSenderSsrc(kSenderSsrc);
- rtc::Buffer raw = bye.Build();
+ Buffer raw = bye.Build();
Bye parsed_bye;
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed_bye));
@@ -49,7 +49,7 @@
EXPECT_TRUE(bye.SetCsrcs({kCsrc1, kCsrc2}));
EXPECT_TRUE(bye.reason().empty());
- rtc::Buffer raw = bye.Build();
+ Buffer raw = bye.Build();
Bye parsed_bye;
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed_bye));
@@ -66,7 +66,7 @@
EXPECT_TRUE(bye.SetCsrcs({kCsrc1, kCsrc2}));
bye.SetReason(kReason);
- rtc::Buffer raw = bye.Build();
+ Buffer raw = bye.Build();
Bye parsed_bye;
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed_bye));
@@ -90,7 +90,7 @@
bye.SetSenderSsrc(kSenderSsrc);
bye.SetReason(kReason);
- rtc::Buffer raw = bye.Build();
+ Buffer raw = bye.Build();
Bye parsed_bye;
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed_bye));
@@ -108,7 +108,7 @@
bye.SetSenderSsrc(kSenderSsrc);
bye.SetReason(kReason);
- rtc::Buffer raw = bye.Build();
+ Buffer raw = bye.Build();
Bye parsed_bye;
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed_bye));
@@ -129,7 +129,7 @@
Bye bye;
bye.SetSenderSsrc(kSenderSsrc);
- rtc::Buffer raw = bye.Build();
+ Buffer raw = bye.Build();
raw[0]++; // Damage the packet: increase ssrc count by one.
Bye parsed_bye;
@@ -141,7 +141,7 @@
bye.SetSenderSsrc(kSenderSsrc);
bye.SetReason("18 characters long");
- rtc::Buffer raw = bye.Build();
+ Buffer raw = bye.Build();
// Damage the packet: decrease payload size by 4 bytes
raw[3]--;
raw.SetSize(raw.size() - 4);
diff --git a/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
index 056b9cd..7645c26 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/compound_packet_unittest.cc
@@ -55,7 +55,7 @@
compound.Append(std::move(rr));
compound.Append(std::move(fir));
- rtc::Buffer packet = compound.Build();
+ Buffer packet = compound.Build();
RtcpPacketParser parser;
parser.Parse(packet);
EXPECT_EQ(1, parser.receiver_report()->num_packets());
@@ -83,7 +83,7 @@
root.Append(std::move(bye));
root.Append(std::move(leaf));
- rtc::Buffer packet = root.Build();
+ Buffer packet = root.Build();
RtcpPacketParser parser;
parser.Parse(packet);
EXPECT_EQ(1, parser.sender_report()->num_packets());
@@ -109,9 +109,9 @@
const size_t kFirLength = 20;
const size_t kBufferSize = kRrLength + kReportBlockLength + kFirLength;
- MockFunction<void(rtc::ArrayView<const uint8_t>)> callback;
+ MockFunction<void(ArrayView<const uint8_t>)> callback;
EXPECT_CALL(callback, Call(_))
- .WillOnce(Invoke([&](rtc::ArrayView<const uint8_t> packet) {
+ .WillOnce(Invoke([&](ArrayView<const uint8_t> packet) {
RtcpPacketParser parser;
parser.Parse(packet);
EXPECT_EQ(1, parser.receiver_report()->num_packets());
@@ -137,16 +137,16 @@
const size_t kReportBlockLength = 24;
const size_t kBufferSize = kRrLength + kReportBlockLength;
- MockFunction<void(rtc::ArrayView<const uint8_t>)> callback;
+ MockFunction<void(ArrayView<const uint8_t>)> callback;
EXPECT_CALL(callback, Call(_))
- .WillOnce(Invoke([&](rtc::ArrayView<const uint8_t> packet) {
+ .WillOnce(Invoke([&](ArrayView<const uint8_t> packet) {
RtcpPacketParser parser;
parser.Parse(packet);
EXPECT_EQ(1, parser.receiver_report()->num_packets());
EXPECT_EQ(1U, parser.receiver_report()->report_blocks().size());
EXPECT_EQ(0, parser.fir()->num_packets());
}))
- .WillOnce(Invoke([&](rtc::ArrayView<const uint8_t> packet) {
+ .WillOnce(Invoke([&](ArrayView<const uint8_t> packet) {
RtcpPacketParser parser;
parser.Parse(packet);
EXPECT_EQ(0, parser.receiver_report()->num_packets());
diff --git a/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.cc b/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.cc
index 7dfcaa0..ff37b00 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.cc
@@ -102,31 +102,31 @@
return TimeDelta::Seconds(ato) / 1024;
}
-uint16_t To2BitEcn(rtc::EcnMarking ecn_marking) {
+uint16_t To2BitEcn(EcnMarking ecn_marking) {
switch (ecn_marking) {
- case rtc::EcnMarking::kNotEct:
+ case EcnMarking::kNotEct:
return 0;
- case rtc::EcnMarking::kEct1:
+ case EcnMarking::kEct1:
return kEcnEct1 << 13;
- case rtc::EcnMarking::kEct0:
+ case EcnMarking::kEct0:
return kEcnEct0 << 13;
- case rtc::EcnMarking::kCe:
+ case EcnMarking::kCe:
return kEcnCe << 13;
}
}
-rtc::EcnMarking ToEcnMarking(uint16_t receive_info) {
+EcnMarking ToEcnMarking(uint16_t receive_info) {
const uint16_t ecn = (receive_info >> 13) & 0b11;
if (ecn == kEcnEct1) {
- return rtc::EcnMarking::kEct1;
+ return EcnMarking::kEct1;
}
if (ecn == kEcnEct0) {
- return rtc::EcnMarking::kEct0;
+ return EcnMarking::kEct0;
}
if (ecn == kEcnCe) {
- return rtc::EcnMarking::kCe;
+ return EcnMarking::kCe;
}
- return rtc::EcnMarking::kNotEct;
+ return EcnMarking::kNotEct;
}
} // namespace
@@ -166,7 +166,7 @@
// |R|ECN| Arrival time offset | ... .
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// . .
- auto write_report_for_ssrc = [&](rtc::ArrayView<const PacketInfo> packets) {
+ auto write_report_for_ssrc = [&](ArrayView<const PacketInfo> packets) {
// SSRC of nth RTP stream.
ByteWriter<uint32_t>::WriteBigEndian(&buffer[*position], packets[0].ssrc);
*position += 4;
@@ -211,7 +211,7 @@
}
};
- rtc::ArrayView<const PacketInfo> remaining(packets_);
+ ArrayView<const PacketInfo> remaining(packets_);
while (!remaining.empty()) {
int number_of_packets_for_ssrc = 0;
uint32_t ssrc = remaining[0].ssrc;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h b/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h
index 3de579c..137c3d1 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback.h
@@ -33,7 +33,7 @@
// Time offset from report timestamp. Minus infinity if the packet has not
// been received.
TimeDelta arrival_time_offset = TimeDelta::MinusInfinity();
- rtc::EcnMarking ecn = rtc::EcnMarking::kNotEct;
+ EcnMarking ecn = EcnMarking::kNotEct;
};
static constexpr uint8_t kFeedbackMessageType = 11;
@@ -47,7 +47,7 @@
bool Parse(const CommonHeader& packet);
- rtc::ArrayView<const PacketInfo> packets() const { return packets_; }
+ ArrayView<const PacketInfo> packets() const { return packets_; }
uint32_t report_timestamp_compact_ntp() const {
return report_timestamp_compact_ntp_;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback_unittest.cc
index 0830560..55e4aae 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/congestion_control_feedback_unittest.cc
@@ -129,9 +129,9 @@
.arrival_time_offset = TimeDelta::Millis(2)}};
CongestionControlFeedback fb(std::move(packets), /*compact_ntp_timestamp=*/1);
- rtc::Buffer buf(fb.BlockLength());
+ Buffer buf(fb.BlockLength());
size_t position = 0;
- FunctionView<void(rtc::ArrayView<const uint8_t> packet)> callback;
+ FunctionView<void(ArrayView<const uint8_t> packet)> callback;
EXPECT_TRUE(fb.Create(buf.data(), &position, buf.capacity(), callback));
}
@@ -140,7 +140,7 @@
uint32_t kCompactNtp = 1234;
CongestionControlFeedback fb(kPackets, kCompactNtp);
- rtc::Buffer buffer = fb.Build();
+ Buffer buffer = fb.Build();
CongestionControlFeedback parsed_fb;
CommonHeader header;
EXPECT_TRUE(header.Parse(buffer.data(), buffer.size()));
@@ -162,7 +162,7 @@
uint32_t kCompactNtp = 1234;
CongestionControlFeedback fb(kPackets, kCompactNtp);
- rtc::Buffer buffer = fb.Build();
+ Buffer buffer = fb.Build();
CongestionControlFeedback parsed_fb;
CommonHeader header;
EXPECT_TRUE(header.Parse(buffer.data(), buffer.size()));
@@ -179,11 +179,11 @@
{.ssrc = 1,
.sequence_number = 1,
.arrival_time_offset = TimeDelta::Millis(1),
- .ecn = rtc::EcnMarking::kCe}};
+ .ecn = EcnMarking::kCe}};
uint32_t kCompactNtp = 1234;
CongestionControlFeedback fb(kPackets, kCompactNtp);
- rtc::Buffer buffer = fb.Build();
+ Buffer buffer = fb.Build();
CongestionControlFeedback parsed_fb;
CommonHeader header;
EXPECT_TRUE(header.Parse(buffer.data(), buffer.size()));
@@ -196,11 +196,11 @@
{.ssrc = 1,
.sequence_number = 1,
.arrival_time_offset = TimeDelta::Millis(1),
- .ecn = rtc::EcnMarking::kEct1}};
+ .ecn = EcnMarking::kEct1}};
uint32_t kCompactNtp = 1234;
CongestionControlFeedback fb(kPackets, kCompactNtp);
- rtc::Buffer buffer = fb.Build();
+ Buffer buffer = fb.Build();
CongestionControlFeedback parsed_fb;
CommonHeader header;
EXPECT_TRUE(header.Parse(buffer.data(), buffer.size()));
@@ -227,7 +227,7 @@
uint32_t kCompactNtp = 1234;
CongestionControlFeedback fb(kPackets, kCompactNtp);
- rtc::Buffer buffer = fb.Build();
+ Buffer buffer = fb.Build();
CongestionControlFeedback parsed_fb;
CommonHeader header;
EXPECT_TRUE(header.Parse(buffer.data(), buffer.size()));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
index 967bfe3..0161e40 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/extended_reports_unittest.cc
@@ -77,7 +77,7 @@
ExtendedReports xr;
xr.SetSenderSsrc(kSenderSsrc);
- rtc::Buffer packet = xr.Build();
+ Buffer packet = xr.Build();
EXPECT_THAT(make_tuple(packet.data(), packet.size()),
ElementsAreArray(kEmptyPacket));
@@ -96,7 +96,7 @@
ExtendedReports xr;
xr.SetSenderSsrc(kSenderSsrc);
xr.SetRrtr(kRrtr);
- rtc::Buffer packet = xr.Build();
+ Buffer packet = xr.Build();
ExtendedReports mparsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
@@ -112,7 +112,7 @@
xr.SetSenderSsrc(kSenderSsrc);
xr.AddDlrrItem(kTimeInfo);
- rtc::Buffer packet = xr.Build();
+ Buffer packet = xr.Build();
ExtendedReports mparsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
@@ -130,7 +130,7 @@
xr.AddDlrrItem(kTimeInfo1);
xr.AddDlrrItem(kTimeInfo2);
- rtc::Buffer packet = xr.Build();
+ Buffer packet = xr.Build();
ExtendedReports mparsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
@@ -161,7 +161,7 @@
for (size_t i = 0; i < ExtendedReports::kMaxNumberOfDlrrItems; ++i)
xr.AddDlrrItem(Rand<ReceiveTimeInfo>());
- rtc::Buffer packet = xr.Build();
+ Buffer packet = xr.Build();
ExtendedReports mparsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &mparsed));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
index 62d3c7f..fe3e70f 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/fir_unittest.cc
@@ -53,7 +53,7 @@
fir.SetSenderSsrc(kSenderSsrc);
fir.AddRequestTo(kRemoteSsrc, kSeqNr);
- rtc::Buffer packet = fir.Build();
+ Buffer packet = fir.Build();
EXPECT_THAT(make_tuple(packet.data(), packet.size()),
ElementsAreArray(kPacket));
@@ -65,7 +65,7 @@
fir.AddRequestTo(kRemoteSsrc, kSeqNr);
fir.AddRequestTo(kRemoteSsrc + 1, kSeqNr + 1);
- rtc::Buffer packet = fir.Build();
+ Buffer packet = fir.Build();
Fir parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/loss_notification_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/loss_notification_unittest.cc
index d74e547..b7b9c54 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/loss_notification_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/loss_notification_unittest.cc
@@ -63,7 +63,7 @@
ASSERT_TRUE(
loss_notification.Set(kLastDecoded, kLastReceived, kDecodabilityFlag));
- rtc::Buffer packet = loss_notification.Build();
+ Buffer packet = loss_notification.Build();
EXPECT_THAT(make_tuple(packet.data(), packet.size()),
ElementsAreArray(kPacket));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/nack.cc b/modules/rtp_rtcp/source/rtcp_packet/nack.cc
index b268539..e796622 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/nack.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/nack.cc
@@ -103,8 +103,7 @@
size_t payload_size_bytes =
kCommonFeedbackLength + (num_nack_fields * kNackItemLength);
- size_t payload_size_32bits =
- rtc::CheckedDivExact<size_t>(payload_size_bytes, 4);
+ size_t payload_size_32bits = CheckedDivExact<size_t>(payload_size_bytes, 4);
CreateHeader(kFeedbackMessageType, kPacketType, payload_size_32bits, packet,
index);
diff --git a/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
index 1bf2b8d..de7b942 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/nack_unittest.cc
@@ -68,7 +68,7 @@
nack.SetMediaSsrc(kRemoteSsrc);
nack.SetPacketIds(kList, std::size(kList));
- rtc::Buffer packet = nack.Build();
+ Buffer packet = nack.Build();
EXPECT_THAT(make_tuple(packet.data(), packet.size()),
ElementsAreArray(kPacket));
@@ -90,7 +90,7 @@
nack.SetMediaSsrc(kRemoteSsrc);
nack.SetPacketIds(kWrapList, kWrapListLength);
- rtc::Buffer packet = nack.Build();
+ Buffer packet = nack.Build();
EXPECT_THAT(make_tuple(packet.data(), packet.size()),
ElementsAreArray(kWrapPacket));
@@ -115,7 +115,7 @@
nack.SetMediaSsrc(kRemoteSsrc);
nack.SetPacketIds(kUnorderedList, kUnorderedListLength);
- rtc::Buffer packet = nack.Build();
+ Buffer packet = nack.Build();
Nack parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
@@ -134,16 +134,16 @@
const size_t kBufferSize = 12 + (3 * 4); // Fits common header + 3 nack items
- MockFunction<void(rtc::ArrayView<const uint8_t>)> callback;
+ MockFunction<void(ArrayView<const uint8_t>)> callback;
EXPECT_CALL(callback, Call(_))
- .WillOnce(Invoke([&](rtc::ArrayView<const uint8_t> packet) {
+ .WillOnce(Invoke([&](ArrayView<const uint8_t> packet) {
Nack nack;
EXPECT_TRUE(test::ParseSinglePacket(packet, &nack));
EXPECT_EQ(kSenderSsrc, nack.sender_ssrc());
EXPECT_EQ(kRemoteSsrc, nack.media_ssrc());
EXPECT_THAT(nack.packet_ids(), ElementsAre(1, 100, 200));
}))
- .WillOnce(Invoke([&](rtc::ArrayView<const uint8_t> packet) {
+ .WillOnce(Invoke([&](ArrayView<const uint8_t> packet) {
Nack nack;
EXPECT_TRUE(test::ParseSinglePacket(packet, &nack));
EXPECT_EQ(kSenderSsrc, nack.sender_ssrc());
@@ -162,7 +162,7 @@
nack.SetMediaSsrc(kRemoteSsrc);
nack.SetPacketIds(kSmallList, std::size(kSmallList));
- MockFunction<void(rtc::ArrayView<const uint8_t>)> callback;
+ MockFunction<void(ArrayView<const uint8_t>)> callback;
EXPECT_CALL(callback, Call(_)).Times(0);
EXPECT_FALSE(nack.Build(kMinNackBlockSize - 1, callback.AsStdFunction()));
}
diff --git a/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
index 52be3bb..64d799e 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/pli_unittest.cc
@@ -44,7 +44,7 @@
pli.SetSenderSsrc(kSenderSsrc);
pli.SetMediaSsrc(kRemoteSsrc);
- rtc::Buffer packet = pli.Build();
+ Buffer packet = pli.Build();
EXPECT_THAT(make_tuple(packet.data(), packet.size()),
ElementsAreArray(kPacket));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc
index 85d5c0d..450b7cd 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/rapid_resync_request_unittest.cc
@@ -44,7 +44,7 @@
rrr.SetSenderSsrc(kSenderSsrc);
rrr.SetMediaSsrc(kRemoteSsrc);
- rtc::Buffer packet = rrr.Build();
+ Buffer packet = rrr.Build();
EXPECT_THAT(make_tuple(packet.data(), packet.size()),
ElementsAreArray(kPacket));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc
index aa02063..98ff4d2 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/receiver_report_unittest.cc
@@ -64,7 +64,7 @@
}
TEST(RtcpPacketReceiverReportTest, ParseFailsOnIncorrectSize) {
- rtc::Buffer damaged_packet(kPacket);
+ Buffer damaged_packet(kPacket);
damaged_packet[0]++; // Damage the packet: increase count field.
ReceiverReport rr;
EXPECT_FALSE(test::ParseSinglePacket(damaged_packet, &rr));
@@ -83,7 +83,7 @@
rb.SetDelayLastSr(kDelayLastSr);
rr.AddReportBlock(rb);
- rtc::Buffer raw = rr.Build();
+ Buffer raw = rr.Build();
EXPECT_THAT(make_tuple(raw.data(), raw.size()), ElementsAreArray(kPacket));
}
@@ -92,7 +92,7 @@
ReceiverReport rr;
rr.SetSenderSsrc(kSenderSsrc);
- rtc::Buffer raw = rr.Build();
+ Buffer raw = rr.Build();
ReceiverReport parsed;
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed));
@@ -111,7 +111,7 @@
EXPECT_TRUE(rr.AddReportBlock(rb1));
EXPECT_TRUE(rr.AddReportBlock(rb2));
- rtc::Buffer raw = rr.Build();
+ Buffer raw = rr.Build();
ReceiverReport parsed;
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
index af5dd8c..34fe54c 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/remb_unittest.cc
@@ -46,7 +46,7 @@
std::vector<uint32_t>(std::begin(kRemoteSsrcs), std::end(kRemoteSsrcs)));
remb.SetBitrateBps(kBitrateBps);
- rtc::Buffer packet = remb.Build();
+ Buffer packet = remb.Build();
EXPECT_THAT(make_tuple(packet.data(), packet.size()),
ElementsAreArray(kPacket));
@@ -66,7 +66,7 @@
Remb remb;
remb.SetSenderSsrc(kSenderSsrc);
remb.SetBitrateBps(kBitrateBps);
- rtc::Buffer packet = remb.Build();
+ Buffer packet = remb.Build();
Remb parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
@@ -78,7 +78,7 @@
TEST(RtcpPacketRembTest, CreateAndParse64bitBitrate) {
Remb remb;
remb.SetBitrateBps(kBitrateBps64bit);
- rtc::Buffer packet = remb.Build();
+ Buffer packet = remb.Build();
Remb parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.cc b/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.cc
index 30b224a..30c02cf 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.cc
@@ -84,10 +84,10 @@
explicit RemoteEstimateSerializerImpl(std::vector<DataRateSerializer> fields)
: fields_(fields) {}
- rtc::Buffer Serialize(const NetworkStateEstimate& src) const override {
+ Buffer Serialize(const NetworkStateEstimate& src) const override {
size_t max_size = fields_.size() * kFieldSize;
size_t size = 0;
- rtc::Buffer buf(max_size);
+ Buffer buf(max_size);
for (const auto& field : fields_) {
if (field.Write(src, buf.data() + size)) {
size += kFieldSize;
@@ -97,7 +97,7 @@
return buf;
}
- bool Parse(rtc::ArrayView<const uint8_t> src,
+ bool Parse(ArrayView<const uint8_t> src,
NetworkStateEstimate* target) const override {
if (src.size() % kFieldSize != 0)
return false;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.h b/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.h
index 2e1253a..4c8c294 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.h
+++ b/modules/rtp_rtcp/source/rtcp_packet/remote_estimate.h
@@ -24,9 +24,9 @@
class CommonHeader;
class RemoteEstimateSerializer {
public:
- virtual bool Parse(rtc::ArrayView<const uint8_t> src,
+ virtual bool Parse(ArrayView<const uint8_t> src,
NetworkStateEstimate* target) const = 0;
- virtual rtc::Buffer Serialize(const NetworkStateEstimate& src) const = 0;
+ virtual Buffer Serialize(const NetworkStateEstimate& src) const = 0;
virtual ~RemoteEstimateSerializer() = default;
};
diff --git a/modules/rtp_rtcp/source/rtcp_packet/remote_estimate_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/remote_estimate_unittest.cc
index d28395a..52b57b4 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/remote_estimate_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/remote_estimate_unittest.cc
@@ -20,7 +20,7 @@
NetworkStateEstimate src;
src.link_capacity_lower = DataRate::KilobitsPerSec(10);
src.link_capacity_upper = DataRate::KilobitsPerSec(1000000);
- rtc::Buffer data = GetRemoteEstimateSerializer()->Serialize(src);
+ Buffer data = GetRemoteEstimateSerializer()->Serialize(src);
NetworkStateEstimate dst;
EXPECT_TRUE(GetRemoteEstimateSerializer()->Parse(data, &dst));
EXPECT_EQ(src.link_capacity_lower, dst.link_capacity_lower);
@@ -33,7 +33,7 @@
// with kbps resolution. We expected it be represented as plus infinity.
src.link_capacity_lower = DataRate::KilobitsPerSec(2 << 24);
src.link_capacity_upper = DataRate::PlusInfinity();
- rtc::Buffer data = GetRemoteEstimateSerializer()->Serialize(src);
+ Buffer data = GetRemoteEstimateSerializer()->Serialize(src);
NetworkStateEstimate dst;
EXPECT_TRUE(GetRemoteEstimateSerializer()->Parse(data, &dst));
@@ -45,7 +45,7 @@
NetworkStateEstimate src;
src.link_capacity_lower = DataRate::MinusInfinity();
src.link_capacity_upper = DataRate::MinusInfinity();
- rtc::Buffer data = GetRemoteEstimateSerializer()->Serialize(src);
+ Buffer data = GetRemoteEstimateSerializer()->Serialize(src);
// Since MinusInfinity can't be represented, the buffer should be empty.
EXPECT_EQ(data.size(), 0u);
NetworkStateEstimate dst;
diff --git a/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc
index f4c6f7f..df1a7b4 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/sdes_unittest.cc
@@ -34,7 +34,7 @@
TEST(RtcpPacketSdesTest, CreateAndParseWithoutChunks) {
Sdes sdes;
- rtc::Buffer packet = sdes.Build();
+ Buffer packet = sdes.Build();
Sdes parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
@@ -47,7 +47,7 @@
Sdes sdes;
EXPECT_TRUE(sdes.AddCName(kSenderSsrc, kCname));
- rtc::Buffer packet = sdes.Build();
+ Buffer packet = sdes.Build();
Sdes sdes_parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &sdes_parsed));
const Sdes& parsed = sdes_parsed; // Ensure accessors are const.
@@ -66,7 +66,7 @@
EXPECT_TRUE(sdes.AddCName(kSenderSsrc + 4, "abcde"));
EXPECT_TRUE(sdes.AddCName(kSenderSsrc + 5, "abcdef"));
- rtc::Buffer packet = sdes.Build();
+ Buffer packet = sdes.Build();
Sdes parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
@@ -91,7 +91,7 @@
Sdes sdes;
EXPECT_TRUE(sdes.AddCName(kSenderSsrc, ""));
- rtc::Buffer packet = sdes.Build();
+ Buffer packet = sdes.Build();
Sdes parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
@@ -226,7 +226,7 @@
const std::string kBob = "bob@host";
source.AddCName(kSenderSsrc, kAlice);
- rtc::Buffer packet1 = source.Build();
+ Buffer packet1 = source.Build();
Sdes middle;
test::ParseSinglePacket(packet1, &middle);
@@ -234,7 +234,7 @@
middle.AddCName(kSenderSsrc + 1, kBob);
- rtc::Buffer packet2 = middle.Build();
+ Buffer packet2 = middle.Build();
Sdes destination;
test::ParseSinglePacket(packet2, &destination);
diff --git a/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
index 08fac99..f7d2478 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/sender_report_unittest.cc
@@ -49,7 +49,7 @@
sr.SetPacketCount(kPacketCount);
sr.SetOctetCount(kOctetCount);
- rtc::Buffer raw = sr.Build();
+ Buffer raw = sr.Build();
EXPECT_THAT(make_tuple(raw.data(), raw.size()), ElementsAreArray(kPacket));
}
@@ -73,7 +73,7 @@
sr.SetSenderSsrc(kSenderSsrc);
EXPECT_TRUE(sr.AddReportBlock(rb));
- rtc::Buffer raw = sr.Build();
+ Buffer raw = sr.Build();
SenderReport parsed;
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed));
@@ -93,7 +93,7 @@
EXPECT_TRUE(sr.AddReportBlock(rb1));
EXPECT_TRUE(sr.AddReportBlock(rb2));
- rtc::Buffer raw = sr.Build();
+ Buffer raw = sr.Build();
SenderReport parsed;
EXPECT_TRUE(test::ParseSinglePacket(raw, &parsed));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc
index 1aa770f..ce1544c 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbn_unittest.cc
@@ -40,7 +40,7 @@
tmmbn.SetSenderSsrc(kSenderSsrc);
tmmbn.AddTmmbr(TmmbItem(kRemoteSsrc, kBitrateBps, kOverhead));
- rtc::Buffer packet = tmmbn.Build();
+ Buffer packet = tmmbn.Build();
EXPECT_THAT(make_tuple(packet.data(), packet.size()),
ElementsAreArray(kPacket));
@@ -63,7 +63,7 @@
Tmmbn tmmbn;
tmmbn.SetSenderSsrc(kSenderSsrc);
- rtc::Buffer packet = tmmbn.Build();
+ Buffer packet = tmmbn.Build();
Tmmbn parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
@@ -77,7 +77,7 @@
tmmbn.AddTmmbr(TmmbItem(kRemoteSsrc, kBitrateBps, kOverhead));
tmmbn.AddTmmbr(TmmbItem(kRemoteSsrc + 1, 4 * kBitrateBps, 40));
- rtc::Buffer packet = tmmbn.Build();
+ Buffer packet = tmmbn.Build();
Tmmbn parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
index 9adc907..4f45577 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/tmmbr_unittest.cc
@@ -39,7 +39,7 @@
tmmbr.SetSenderSsrc(kSenderSsrc);
tmmbr.AddTmmbr(TmmbItem(kRemoteSsrc, kBitrateBps, kOverhead));
- rtc::Buffer packet = tmmbr.Build();
+ Buffer packet = tmmbr.Build();
EXPECT_THAT(make_tuple(packet.data(), packet.size()),
ElementsAreArray(kPacket));
@@ -63,7 +63,7 @@
tmmbr.AddTmmbr(TmmbItem(kRemoteSsrc, kBitrateBps, kOverhead));
tmmbr.AddTmmbr(TmmbItem(kRemoteSsrc + 1, 4 * kBitrateBps, kOverhead + 1));
- rtc::Buffer packet = tmmbr.Build();
+ Buffer packet = tmmbr.Build();
Tmmbr parsed;
EXPECT_TRUE(test::ParseSinglePacket(packet, &parsed));
diff --git a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
index 1689bf0..91a9450 100644
--- a/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet/transport_feedback_unittest.cc
@@ -65,7 +65,7 @@
feedback.Parse(rtcp_header);
}
-TransportFeedback Parse(rtc::ArrayView<const uint8_t> buffer) {
+TransportFeedback Parse(ArrayView<const uint8_t> buffer) {
rtcp::CommonHeader header;
EXPECT_TRUE(header.Parse(buffer.data(), buffer.size()));
EXPECT_EQ(header.type(), TransportFeedback::kPacketType);
@@ -89,8 +89,8 @@
void WithDefaultDelta(TimeDelta delta) { default_delta_ = delta; }
- void WithInput(rtc::ArrayView<const uint16_t> received_seq,
- rtc::ArrayView<const Timestamp> received_ts = {}) {
+ void WithInput(ArrayView<const uint16_t> received_seq,
+ ArrayView<const Timestamp> received_ts = {}) {
std::vector<Timestamp> temp_timestamps;
if (received_ts.empty()) {
temp_timestamps = GenerateReceiveTimestamps(received_seq);
@@ -156,7 +156,7 @@
}
std::vector<Timestamp> GenerateReceiveTimestamps(
- rtc::ArrayView<const uint16_t> seq_nums) {
+ ArrayView<const uint16_t> seq_nums) {
RTC_CHECK(!seq_nums.empty());
uint16_t last_seq = seq_nums[0];
Timestamp time = Timestamp::Zero();
@@ -177,7 +177,7 @@
size_t expected_size_;
TimeDelta default_delta_;
std::optional<TransportFeedback> feedback_;
- rtc::Buffer serialized_;
+ Buffer serialized_;
bool include_timestamps_;
};
@@ -526,7 +526,7 @@
feedback.SetBase(0, Timestamp::Zero());
EXPECT_TRUE(feedback.AddReceivedPacket(0, Timestamp::Zero()));
- rtc::Buffer packet = feedback.Build();
+ Buffer packet = feedback.Build();
EXPECT_EQ(kExpectedSizeWords * 4, packet.size());
ASSERT_GT(kExpectedSizeWords * 4, kExpectedSizeBytes);
for (size_t i = kExpectedSizeBytes; i < (kExpectedSizeWords * 4 - 1); ++i)
@@ -565,7 +565,7 @@
feedback.SetBase(0, Timestamp::Zero());
EXPECT_TRUE(feedback.AddReceivedPacket(0, Timestamp::Zero()));
- rtc::Buffer packet = feedback.Build();
+ Buffer packet = feedback.Build();
EXPECT_EQ(kExpectedSizeWords * 4, packet.size());
ASSERT_GT(kExpectedSizeWords * 4, kExpectedSizeBytes);
for (size_t i = kExpectedSizeBytes; i < (kExpectedSizeWords * 4 - 1); ++i)
diff --git a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
index 47cda3d..2a87759 100644
--- a/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_packet_unittest.cc
@@ -38,7 +38,7 @@
const size_t kReportBlockLength = 24;
// No packet.
- MockFunction<void(rtc::ArrayView<const uint8_t>)> callback;
+ MockFunction<void(webrtc::ArrayView<const uint8_t>)> callback;
EXPECT_CALL(callback, Call(_)).Times(0);
const size_t kBufferSize = kRrLength + kReportBlockLength - 1;
EXPECT_FALSE(rr.Build(kBufferSize, callback.AsStdFunction()));
diff --git a/modules/rtp_rtcp/source/rtcp_receiver.cc b/modules/rtp_rtcp/source/rtcp_receiver.cc
index d45f3e4..cf9975e 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver.cc
+++ b/modules/rtp_rtcp/source/rtcp_receiver.cc
@@ -231,7 +231,7 @@
RTCPReceiver::~RTCPReceiver() {}
-void RTCPReceiver::IncomingPacket(rtc::ArrayView<const uint8_t> packet) {
+void RTCPReceiver::IncomingPacket(ArrayView<const uint8_t> packet) {
if (packet.empty()) {
RTC_LOG(LS_WARNING) << "Incoming empty RTCP packet";
return;
@@ -394,7 +394,7 @@
return result;
}
-bool RTCPReceiver::ParseCompoundPacket(rtc::ArrayView<const uint8_t> packet,
+bool RTCPReceiver::ParseCompoundPacket(ArrayView<const uint8_t> packet,
PacketInformation* packet_information) {
MutexLock lock(&rtcp_receiver_lock_);
diff --git a/modules/rtp_rtcp/source/rtcp_receiver.h b/modules/rtp_rtcp/source/rtcp_receiver.h
index 766a808..1dab65f 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver.h
+++ b/modules/rtp_rtcp/source/rtcp_receiver.h
@@ -60,7 +60,7 @@
virtual void OnReceivedNack(
const std::vector<uint16_t>& nack_sequence_numbers) = 0;
virtual void OnReceivedRtcpReportBlocks(
- rtc::ArrayView<const ReportBlockData> report_blocks) = 0;
+ ArrayView<const ReportBlockData> report_blocks) = 0;
protected:
virtual ~ModuleRtpRtcp() = default;
@@ -105,7 +105,7 @@
~RTCPReceiver();
- void IncomingPacket(rtc::ArrayView<const uint8_t> packet);
+ void IncomingPacket(ArrayView<const uint8_t> packet);
int64_t LastReceivedReportBlockMs() const;
@@ -261,7 +261,7 @@
size_t num_rtts_ = 0;
};
- bool ParseCompoundPacket(rtc::ArrayView<const uint8_t> packet,
+ bool ParseCompoundPacket(ArrayView<const uint8_t> packet,
PacketInformation* packet_information);
void TriggerCallbacksFromRtcpPacket(
diff --git a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
index 2fcdce0..4da2dce 100644
--- a/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_receiver_unittest.cc
@@ -127,7 +127,7 @@
MOCK_METHOD(void, OnReceivedNack, (const std::vector<uint16_t>&), (override));
MOCK_METHOD(void,
OnReceivedRtcpReportBlocks,
- (rtc::ArrayView<const ReportBlockData>),
+ (ArrayView<const ReportBlockData>),
(override));
};
@@ -896,7 +896,7 @@
xr.SetRrtr(rrtr);
xr.AddDlrrItem(ReceiveTimeInfo(kReceiverMainSsrc, 0x12345, 0x67890));
- rtc::Buffer packet = xr.Build();
+ Buffer packet = xr.Build();
// Modify the DLRR block to have an unsupported block type, from 5 to 6.
ASSERT_EQ(5, packet.data()[20]);
packet.data()[20] = 6;
@@ -1852,7 +1852,7 @@
}},
/*report_timestamp_compact_ntp=*/324);
packet.SetSenderSsrc(kSenderSsrc);
- rtc::Buffer built_packet = packet.Build();
+ Buffer built_packet = packet.Build();
// Modify the CongestionControlFeedback packet so that it is invalid.
const size_t kNumReportsOffset = 14;
ByteWriter<uint16_t>::WriteBigEndian(&built_packet.data()[kNumReportsOffset],
@@ -1929,7 +1929,7 @@
rtcp::CompoundPacket compound;
compound.Append(std::move(packet));
compound.Append(std::move(remb));
- rtc::Buffer built_packet = compound.Build();
+ Buffer built_packet = compound.Build();
// Modify the TransportFeedback packet so that it is invalid.
const size_t kStatusCountOffset = 14;
diff --git a/modules/rtp_rtcp/source/rtcp_sender.cc b/modules/rtp_rtcp/source/rtcp_sender.cc
index d7ba03d..c08fd08 100644
--- a/modules/rtp_rtcp/source/rtcp_sender.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender.cc
@@ -90,7 +90,7 @@
// Sends pending rtcp packet.
void Send() {
if (index_ > 0) {
- callback_(rtc::ArrayView<const uint8_t>(buffer_, index_));
+ callback_(ArrayView<const uint8_t>(buffer_, index_));
index_ = 0;
}
}
@@ -237,7 +237,7 @@
bool decodability_flag,
bool buffering_allowed) {
int32_t error_code = -1;
- auto callback = [&](rtc::ArrayView<const uint8_t> packet) {
+ auto callback = [&](ArrayView<const uint8_t> packet) {
transport_->SendRtcp(packet);
error_code = 0;
env_.event_log().Log(std::make_unique<RtcEventRtcpPacketOutgoing>(packet));
@@ -595,7 +595,7 @@
int32_t nack_size,
const uint16_t* nack_list) {
int32_t error_code = -1;
- auto callback = [&](rtc::ArrayView<const uint8_t> packet) {
+ auto callback = [&](ArrayView<const uint8_t> packet) {
if (transport_->SendRtcp(packet)) {
error_code = 0;
env_.event_log().Log(
@@ -893,7 +893,7 @@
ssrc = ssrc_;
}
RTC_DCHECK_LE(max_packet_size, IP_PACKET_SIZE);
- auto callback = [&](rtc::ArrayView<const uint8_t> packet) {
+ auto callback = [&](ArrayView<const uint8_t> packet) {
if (transport_->SendRtcp(packet)) {
env_.event_log().Log(
std::make_unique<RtcEventRtcpPacketOutgoing>(packet));
diff --git a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
index b7466fc..ffba6d7 100644
--- a/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_sender_unittest.cc
@@ -77,11 +77,11 @@
public:
TestTransport() {}
- bool SendRtp(rtc::ArrayView<const uint8_t> /*data*/,
+ bool SendRtp(ArrayView<const uint8_t> /*data*/,
const PacketOptions& /* options */) override {
return false;
}
- bool SendRtcp(rtc::ArrayView<const uint8_t> data) override {
+ bool SendRtcp(ArrayView<const uint8_t> data) override {
parser_.Parse(data);
return true;
}
@@ -681,7 +681,7 @@
TEST_F(RtcpSenderTest, ByeMustBeLast) {
MockTransport mock_transport;
EXPECT_CALL(mock_transport, SendRtcp(_))
- .WillOnce(Invoke([](rtc::ArrayView<const uint8_t> data) {
+ .WillOnce(Invoke([](ArrayView<const uint8_t> data) {
const uint8_t* next_packet = data.data();
const uint8_t* const packet_end = data.data() + data.size();
rtcp::CommonHeader packet;
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.cc b/modules/rtp_rtcp/source/rtcp_transceiver.cc
index 4a77837..9b0ed57 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver.cc
@@ -83,7 +83,7 @@
task_queue_->PostTask([ptr, ready] { ptr->SetReadyToSend(ready); });
}
-void RtcpTransceiver::ReceivePacket(rtc::CopyOnWriteBuffer packet) {
+void RtcpTransceiver::ReceivePacket(CopyOnWriteBuffer packet) {
RTC_CHECK(rtcp_transceiver_);
RtcpTransceiverImpl* ptr = rtcp_transceiver_.get();
Timestamp now = clock_->CurrentTime();
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver.h b/modules/rtp_rtcp/source/rtcp_transceiver.h
index d2037f4..c1ff78b 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver.h
+++ b/modules/rtp_rtcp/source/rtcp_transceiver.h
@@ -65,7 +65,7 @@
void SetReadyToSend(bool ready);
// Handles incoming rtcp packets.
- void ReceivePacket(rtc::CopyOnWriteBuffer packet);
+ void ReceivePacket(CopyOnWriteBuffer packet);
// Sends RTCP packets starting with a sender or receiver report.
void SendCompoundPacket();
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_config.h b/modules/rtp_rtcp/source/rtcp_transceiver_config.h
index 684cedf..37500fb 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_config.h
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_config.h
@@ -81,7 +81,7 @@
virtual RtpStats SentStats() = 0;
virtual void OnNack(uint32_t /* sender_ssrc */,
- rtc::ArrayView<const uint16_t> /* sequence_numbers */) {}
+ ArrayView<const uint16_t> /* sequence_numbers */) {}
virtual void OnFir(uint32_t /* sender_ssrc */) {}
virtual void OnPli(uint32_t /* sender_ssrc */) {}
@@ -117,7 +117,7 @@
Clock* clock = nullptr;
// Transport to send RTCP packets to.
- std::function<void(rtc::ArrayView<const uint8_t>)> rtcp_transport;
+ std::function<void(ArrayView<const uint8_t>)> rtcp_transport;
// Queue for scheduling delayed tasks, e.g. sending periodic compound packets.
TaskQueueBase* task_queue = nullptr;
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
index 38f77ed..a8b3f2f 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.cc
@@ -70,7 +70,7 @@
NtpTime remote_sent_time;
};
-std::function<void(rtc::ArrayView<const uint8_t>)> GetRtcpTransport(
+std::function<void(ArrayView<const uint8_t>)> GetRtcpTransport(
const RtcpTransceiverConfig& config) {
if (config.rtcp_transport != nullptr) {
return config.rtcp_transport;
@@ -78,8 +78,7 @@
bool first = true;
std::string log_prefix = config.debug_id;
- return [first,
- log_prefix](rtc::ArrayView<const uint8_t> /* packet */) mutable {
+ return [first, log_prefix](ArrayView<const uint8_t> /* packet */) mutable {
if (first) {
RTC_LOG(LS_ERROR) << log_prefix << "Sending RTCP packets is disabled.";
first = false;
@@ -127,7 +126,7 @@
// Sends pending rtcp compound packet.
void Send() {
if (index_ > 0) {
- callback_(rtc::ArrayView<const uint8_t>(buffer_, index_));
+ callback_(ArrayView<const uint8_t>(buffer_, index_));
index_ = 0;
}
}
@@ -216,7 +215,7 @@
ready_to_send_ = ready;
}
-void RtcpTransceiverImpl::ReceivePacket(rtc::ArrayView<const uint8_t> packet,
+void RtcpTransceiverImpl::ReceivePacket(ArrayView<const uint8_t> packet,
Timestamp now) {
// Report blocks may be spread across multiple sender and receiver reports.
std::vector<ReportBlockData> report_blocks;
@@ -289,9 +288,8 @@
SendImmediateFeedback(pli);
}
-void RtcpTransceiverImpl::SendFullIntraRequest(
- rtc::ArrayView<const uint32_t> ssrcs,
- bool new_request) {
+void RtcpTransceiverImpl::SendFullIntraRequest(ArrayView<const uint32_t> ssrcs,
+ bool new_request) {
RTC_DCHECK(!ssrcs.empty());
if (!ready_to_send_)
return;
@@ -378,7 +376,7 @@
void RtcpTransceiverImpl::HandleReportBlocks(
uint32_t sender_ssrc,
Timestamp now,
- rtc::ArrayView<const rtcp::ReportBlock> rtcp_report_blocks,
+ ArrayView<const rtcp::ReportBlock> rtcp_report_blocks,
std::vector<ReportBlockData>& report_blocks) {
if (rtcp_report_blocks.empty()) {
return;
@@ -576,7 +574,7 @@
void RtcpTransceiverImpl::ProcessReportBlocks(
Timestamp now,
- rtc::ArrayView<const ReportBlockData> report_blocks) {
+ ArrayView<const ReportBlockData> report_blocks) {
RTC_DCHECK(!report_blocks.empty());
if (config_.network_link_observer == nullptr) {
return;
@@ -838,7 +836,7 @@
sender.AppendPacket(xr_with_rrtr);
}
if (xr_with_dlrr.has_value()) {
- rtc::ArrayView<const uint32_t> ssrcs(&sender_ssrc, 1);
+ ArrayView<const uint32_t> ssrcs(&sender_ssrc, 1);
if (config_.reply_to_non_sender_rtt_mesaurments_on_all_ssrcs &&
!sender_ssrcs.empty()) {
ssrcs = sender_ssrcs;
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl.h b/modules/rtp_rtcp/source/rtcp_transceiver_impl.h
index 662565c..adc9cc5 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_impl.h
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl.h
@@ -59,7 +59,7 @@
void SetReadyToSend(bool ready);
- void ReceivePacket(rtc::ArrayView<const uint8_t> packet, Timestamp now);
+ void ReceivePacket(ArrayView<const uint8_t> packet, Timestamp now);
void SendCompoundPacket();
@@ -71,8 +71,7 @@
void SendPictureLossIndication(uint32_t ssrc);
// If new_request is true then requested sequence no. will increase for each
// requested ssrc.
- void SendFullIntraRequest(rtc::ArrayView<const uint32_t> ssrcs,
- bool new_request);
+ void SendFullIntraRequest(ArrayView<const uint32_t> ssrcs, bool new_request);
// SendCombinedRtcpPacket ignores rtcp mode and does not send a compound
// message. https://tools.ietf.org/html/rfc4585#section-3.1
@@ -102,11 +101,10 @@
void HandleReceiverReport(const rtcp::CommonHeader& rtcp_packet_header,
Timestamp now,
std::vector<ReportBlockData>& report_blocks);
- void HandleReportBlocks(
- uint32_t sender_ssrc,
- Timestamp now,
- rtc::ArrayView<const rtcp::ReportBlock> rtcp_report_blocks,
- std::vector<ReportBlockData>& report_blocks);
+ void HandleReportBlocks(uint32_t sender_ssrc,
+ Timestamp now,
+ ArrayView<const rtcp::ReportBlock> rtcp_report_blocks,
+ std::vector<ReportBlockData>& report_blocks);
void HandlePayloadSpecificFeedback(
const rtcp::CommonHeader& rtcp_packet_header,
Timestamp now);
@@ -128,7 +126,7 @@
void HandleTargetBitrate(const rtcp::TargetBitrate& target_bitrate,
uint32_t remote_ssrc);
void ProcessReportBlocks(Timestamp now,
- rtc::ArrayView<const ReportBlockData> report_blocks);
+ ArrayView<const ReportBlockData> report_blocks);
void ReschedulePeriodicCompoundPackets();
void SchedulePeriodicCompoundPackets(TimeDelta delay);
@@ -158,7 +156,7 @@
size_t num_max_blocks);
const RtcpTransceiverConfig config_;
- std::function<void(rtc::ArrayView<const uint8_t>)> rtcp_transport_;
+ std::function<void(ArrayView<const uint8_t>)> rtcp_transport_;
bool ready_to_send_;
std::optional<rtcp::Remb> remb_;
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc b/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc
index 2d0bc55..3a10304 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_impl_unittest.cc
@@ -108,7 +108,7 @@
MOCK_METHOD(RtpStats, SentStats, (), (override));
MOCK_METHOD(void,
OnNack,
- (uint32_t, rtc::ArrayView<const uint16_t>),
+ (uint32_t, ArrayView<const uint16_t>),
(override));
MOCK_METHOD(void, OnFir, (uint32_t), (override));
MOCK_METHOD(void, OnPli, (uint32_t), (override));
@@ -131,8 +131,8 @@
public:
explicit FakeRtcpTransport(TimeController& time) : time_(time) {}
- std::function<void(rtc::ArrayView<const uint8_t>)> AsStdFunction() {
- return [this](rtc::ArrayView<const uint8_t>) { sent_rtcp_ = true; };
+ std::function<void(ArrayView<const uint8_t>)> AsStdFunction() {
+ return [this](ArrayView<const uint8_t>) { sent_rtcp_ = true; };
}
// Returns true when packet was received by the transport.
@@ -148,9 +148,9 @@
bool sent_rtcp_ = false;
};
-std::function<void(rtc::ArrayView<const uint8_t>)> RtcpParserTransport(
+std::function<void(ArrayView<const uint8_t>)> RtcpParserTransport(
RtcpPacketParser& parser) {
- return [&parser](rtc::ArrayView<const uint8_t> packet) {
+ return [&parser](ArrayView<const uint8_t> packet) {
return parser.Parse(packet);
};
}
@@ -343,7 +343,7 @@
}
TEST_F(RtcpTransceiverImplTest, SendsNoRtcpWhenNetworkStateIsDown) {
- MockFunction<void(rtc::ArrayView<const uint8_t>)> mock_transport;
+ MockFunction<void(ArrayView<const uint8_t>)> mock_transport;
RtcpTransceiverConfig config = DefaultTestConfig();
config.initial_ready_to_send = false;
config.rtcp_transport = mock_transport.AsStdFunction();
@@ -360,7 +360,7 @@
}
TEST_F(RtcpTransceiverImplTest, SendsRtcpWhenNetworkStateIsUp) {
- MockFunction<void(rtc::ArrayView<const uint8_t>)> mock_transport;
+ MockFunction<void(ArrayView<const uint8_t>)> mock_transport;
RtcpTransceiverConfig config = DefaultTestConfig();
config.initial_ready_to_send = false;
config.rtcp_transport = mock_transport.AsStdFunction();
@@ -426,7 +426,7 @@
}
TEST_F(RtcpTransceiverImplTest, AvoidsEmptyPacketsInReducedMode) {
- MockFunction<void(rtc::ArrayView<const uint8_t>)> transport;
+ MockFunction<void(ArrayView<const uint8_t>)> transport;
EXPECT_CALL(transport, Call).Times(0);
NiceMock<MockReceiveStatisticsProvider> receive_statistics;
@@ -1632,10 +1632,10 @@
rtcp_receiver.AddMediaReceiverRtcpObserver(kSenderSsrc[i], &receiver[i]);
}
- MockFunction<void(rtc::ArrayView<const uint8_t>)> transport;
+ MockFunction<void(ArrayView<const uint8_t>)> transport;
EXPECT_CALL(transport, Call)
.Times(kNumSenders)
- .WillRepeatedly([&](rtc::ArrayView<const uint8_t> packet) {
+ .WillRepeatedly([&](ArrayView<const uint8_t> packet) {
rtcp_receiver.ReceivePacket(packet, CurrentTime());
return true;
});
diff --git a/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc b/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
index d748e15..6219a7b 100644
--- a/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
+++ b/modules/rtp_rtcp/source/rtcp_transceiver_unittest.cc
@@ -72,7 +72,7 @@
TEST(RtcpTransceiverTest, SendsRtcpOnTaskQueueWhenCreatedOffTaskQueue) {
SimulatedClock clock(0);
- MockFunction<void(rtc::ArrayView<const uint8_t>)> outgoing_transport;
+ MockFunction<void(webrtc::ArrayView<const uint8_t>)> outgoing_transport;
TaskQueueForTest queue("rtcp");
RtcpTransceiverConfig config;
config.clock = &clock;
@@ -90,7 +90,7 @@
TEST(RtcpTransceiverTest, SendsRtcpOnTaskQueueWhenCreatedOnTaskQueue) {
SimulatedClock clock(0);
- MockFunction<void(rtc::ArrayView<const uint8_t>)> outgoing_transport;
+ MockFunction<void(webrtc::ArrayView<const uint8_t>)> outgoing_transport;
TaskQueueForTest queue("rtcp");
RtcpTransceiverConfig config;
config.clock = &clock;
@@ -111,7 +111,7 @@
TEST(RtcpTransceiverTest, CanBeDestroyedOnTaskQueue) {
SimulatedClock clock(0);
- MockFunction<void(rtc::ArrayView<const uint8_t>)> outgoing_transport;
+ MockFunction<void(webrtc::ArrayView<const uint8_t>)> outgoing_transport;
TaskQueueForTest queue("rtcp");
RtcpTransceiverConfig config;
config.clock = &clock;
@@ -151,7 +151,7 @@
TEST(RtcpTransceiverTest, MaySendPacketsAfterDestructor) { // i.e. Be careful!
SimulatedClock clock(0);
// Must outlive queue below.
- NiceMock<MockFunction<void(rtc::ArrayView<const uint8_t>)>> transport;
+ NiceMock<MockFunction<void(webrtc::ArrayView<const uint8_t>)>> transport;
TaskQueueForTest queue("rtcp");
RtcpTransceiverConfig config;
config.clock = &clock;
@@ -171,14 +171,14 @@
}
// Use rtp timestamp to distinguish different incoming sender reports.
-rtc::CopyOnWriteBuffer CreateSenderReport(uint32_t ssrc, uint32_t rtp_time) {
+webrtc::CopyOnWriteBuffer CreateSenderReport(uint32_t ssrc, uint32_t rtp_time) {
webrtc::rtcp::SenderReport sr;
sr.SetSenderSsrc(ssrc);
sr.SetRtpTimestamp(rtp_time);
- rtc::Buffer buffer = sr.Build();
+ webrtc::Buffer buffer = sr.Build();
// Switch to an efficient way creating CopyOnWriteBuffer from RtcpPacket when
// there is one. Until then do not worry about extra memcpy in test.
- return rtc::CopyOnWriteBuffer(buffer.data(), buffer.size());
+ return webrtc::CopyOnWriteBuffer(buffer.data(), buffer.size());
}
TEST(RtcpTransceiverTest, DoesntPostToRtcpObserverAfterCallToRemove) {
@@ -235,7 +235,7 @@
TEST(RtcpTransceiverTest, CanCallSendCompoundPacketFromAnyThread) {
SimulatedClock clock(0);
- MockFunction<void(rtc::ArrayView<const uint8_t>)> outgoing_transport;
+ MockFunction<void(webrtc::ArrayView<const uint8_t>)> outgoing_transport;
TaskQueueForTest queue("rtcp");
RtcpTransceiverConfig config;
config.clock = &clock;
@@ -266,7 +266,7 @@
TEST(RtcpTransceiverTest, DoesntSendPacketsAfterStopCallback) {
SimulatedClock clock(0);
- NiceMock<MockFunction<void(rtc::ArrayView<const uint8_t>)>>
+ NiceMock<MockFunction<void(webrtc::ArrayView<const uint8_t>)>>
outgoing_transport;
TaskQueueForTest queue("rtcp");
RtcpTransceiverConfig config;
@@ -290,7 +290,7 @@
static constexpr uint32_t kSenderSsrc = 12345;
SimulatedClock clock(0);
- MockFunction<void(rtc::ArrayView<const uint8_t>)> outgoing_transport;
+ MockFunction<void(webrtc::ArrayView<const uint8_t>)> outgoing_transport;
TaskQueueForTest queue("rtcp");
RtcpTransceiverConfig config;
config.clock = &clock;
@@ -301,7 +301,7 @@
RtcpTransceiver rtcp_transceiver(config);
EXPECT_CALL(outgoing_transport, Call)
- .WillOnce([&](rtc::ArrayView<const uint8_t> buffer) {
+ .WillOnce([&](webrtc::ArrayView<const uint8_t> buffer) {
EXPECT_TRUE(queue.IsCurrent());
RtcpPacketParser rtcp_parser;
rtcp_parser.Parse(buffer);
@@ -329,7 +329,7 @@
static constexpr uint32_t kSenderSsrc = 12345;
SimulatedClock clock(0);
- MockFunction<void(rtc::ArrayView<const uint8_t>)> outgoing_transport;
+ MockFunction<void(webrtc::ArrayView<const uint8_t>)> outgoing_transport;
TaskQueueForTest queue("rtcp");
RtcpTransceiverConfig config;
config.clock = &clock;
@@ -341,7 +341,7 @@
uint8_t first_seq_nr;
EXPECT_CALL(outgoing_transport, Call)
- .WillOnce([&](rtc::ArrayView<const uint8_t> buffer) {
+ .WillOnce([&](webrtc::ArrayView<const uint8_t> buffer) {
EXPECT_TRUE(queue.IsCurrent());
RtcpPacketParser rtcp_parser;
rtcp_parser.Parse(buffer);
@@ -349,7 +349,7 @@
first_seq_nr = rtcp_parser.fir()->requests()[0].seq_nr;
return true;
})
- .WillOnce([&](rtc::ArrayView<const uint8_t> buffer) {
+ .WillOnce([&](webrtc::ArrayView<const uint8_t> buffer) {
EXPECT_TRUE(queue.IsCurrent());
RtcpPacketParser rtcp_parser;
rtcp_parser.Parse(buffer);
diff --git a/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.cc b/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.cc
index 14956af..7a8b25d 100644
--- a/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.cc
+++ b/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.cc
@@ -23,7 +23,7 @@
namespace webrtc {
bool RtpDependencyDescriptorExtension::Parse(
- rtc::ArrayView<const uint8_t> data,
+ ArrayView<const uint8_t> data,
const FrameDependencyStructure* structure,
DependencyDescriptor* descriptor) {
RtpDependencyDescriptorReader reader(data, structure, descriptor);
@@ -40,7 +40,7 @@
}
bool RtpDependencyDescriptorExtension::Write(
- rtc::ArrayView<uint8_t> data,
+ ArrayView<uint8_t> data,
const FrameDependencyStructure& structure,
std::bitset<32> active_chains,
const DependencyDescriptor& descriptor) {
@@ -50,7 +50,7 @@
}
bool RtpDependencyDescriptorExtension::Parse(
- rtc::ArrayView<const uint8_t> data,
+ ArrayView<const uint8_t> data,
DependencyDescriptorMandatory* descriptor) {
if (data.size() < 3) {
return false;
diff --git a/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h b/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h
index 2cb9269..97d421e 100644
--- a/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h
+++ b/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension.h
@@ -30,13 +30,13 @@
return RtpExtension::kDependencyDescriptorUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
const FrameDependencyStructure* structure,
DependencyDescriptor* descriptor);
// Reads the mandatory part of the descriptor.
// Such read is stateless, i.e., doesn't require `FrameDependencyStructure`.
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
DependencyDescriptorMandatory* descriptor);
static size_t ValueSize(const FrameDependencyStructure& structure,
@@ -46,12 +46,12 @@
static size_t ValueSize(const FrameDependencyStructure& structure,
std::bitset<32> active_chains,
const DependencyDescriptor& descriptor);
- static bool Write(rtc::ArrayView<uint8_t> data,
+ static bool Write(ArrayView<uint8_t> data,
const FrameDependencyStructure& structure,
const DependencyDescriptor& descriptor) {
return Write(data, structure, kAllChainsAreActive, descriptor);
}
- static bool Write(rtc::ArrayView<uint8_t> data,
+ static bool Write(ArrayView<uint8_t> data,
const FrameDependencyStructure& structure,
std::bitset<32> active_chains,
const DependencyDescriptor& descriptor);
diff --git a/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension_unittest.cc b/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension_unittest.cc
index 14310d1..ec64e81 100644
--- a/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_dependency_descriptor_extension_unittest.cc
@@ -64,7 +64,7 @@
const uint8_t* unused_bytes = buffer + value_size;
size_t num_unused_bytes = buffer + sizeof(buffer) - unused_bytes;
// Check remaining bytes are zeroed.
- EXPECT_THAT(rtc::MakeArrayView(unused_bytes, num_unused_bytes), Each(0));
+ EXPECT_THAT(MakeArrayView(unused_bytes, num_unused_bytes), Each(0));
}
// In practice chain diff for inactive chain will grow uboundly because no
diff --git a/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.cc b/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.cc
index f9c4525..2d1f06d 100644
--- a/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.cc
+++ b/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.cc
@@ -24,7 +24,7 @@
namespace webrtc {
RtpDependencyDescriptorReader::RtpDependencyDescriptorReader(
- rtc::ArrayView<const uint8_t> raw_data,
+ ArrayView<const uint8_t> raw_data,
const FrameDependencyStructure* structure,
DependencyDescriptor* descriptor)
: descriptor_(descriptor), buffer_(raw_data) {
diff --git a/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.h b/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.h
index aa42e5b..a350428 100644
--- a/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.h
+++ b/modules/rtp_rtcp/source/rtp_dependency_descriptor_reader.h
@@ -21,7 +21,7 @@
class RtpDependencyDescriptorReader {
public:
// Parses the dependency descriptor.
- RtpDependencyDescriptorReader(rtc::ArrayView<const uint8_t> raw_data,
+ RtpDependencyDescriptorReader(ArrayView<const uint8_t> raw_data,
const FrameDependencyStructure* structure,
DependencyDescriptor* descriptor);
RtpDependencyDescriptorReader(const RtpDependencyDescriptorReader&) = delete;
diff --git a/modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.cc b/modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.cc
index 67ef5c6..dd27525 100644
--- a/modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.cc
+++ b/modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.cc
@@ -57,7 +57,7 @@
} // namespace
RtpDependencyDescriptorWriter::RtpDependencyDescriptorWriter(
- rtc::ArrayView<uint8_t> data,
+ ArrayView<uint8_t> data,
const FrameDependencyStructure& structure,
std::bitset<32> active_chains,
const DependencyDescriptor& descriptor)
@@ -65,14 +65,13 @@
structure_(structure),
active_chains_(active_chains),
bit_writer_(data.data(), data.size()) {
- if (rtc::SafeNe(descriptor.frame_dependencies.chain_diffs.size(),
- structure_.num_chains)) {
+ if (SafeNe(descriptor.frame_dependencies.chain_diffs.size(),
+ structure_.num_chains)) {
build_failed_ = true;
return;
}
- if (rtc::SafeNe(
- descriptor.frame_dependencies.decode_target_indications.size(),
- structure_.num_decode_targets)) {
+ if (SafeNe(descriptor.frame_dependencies.decode_target_indications.size(),
+ structure_.num_decode_targets)) {
build_failed_ = true;
return;
}
diff --git a/modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.h b/modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.h
index 3a8f3bb..4a6b362 100644
--- a/modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.h
+++ b/modules/rtp_rtcp/source/rtp_dependency_descriptor_writer.h
@@ -24,7 +24,7 @@
public:
// Assumes `structure` and `descriptor` are valid and
// `descriptor` matches the `structure`.
- RtpDependencyDescriptorWriter(rtc::ArrayView<uint8_t> data,
+ RtpDependencyDescriptorWriter(ArrayView<uint8_t> data,
const FrameDependencyStructure& structure,
std::bitset<32> active_chains,
const DependencyDescriptor& descriptor);
diff --git a/modules/rtp_rtcp/source/rtp_format.cc b/modules/rtp_rtcp/source/rtp_format.cc
index d23cccb..010ac6e 100644
--- a/modules/rtp_rtcp/source/rtp_format.cc
+++ b/modules/rtp_rtcp/source/rtp_format.cc
@@ -34,7 +34,7 @@
std::unique_ptr<RtpPacketizer> RtpPacketizer::Create(
std::optional<VideoCodecType> type,
- rtc::ArrayView<const uint8_t> payload,
+ ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
// Codec-specific details.
const RTPVideoHeader& rtp_video_header) {
diff --git a/modules/rtp_rtcp/source/rtp_format.h b/modules/rtp_rtcp/source/rtp_format.h
index d7be989..05be298 100644
--- a/modules/rtp_rtcp/source/rtp_format.h
+++ b/modules/rtp_rtcp/source/rtp_format.h
@@ -39,7 +39,7 @@
// If type is not set, returns a raw packetizer.
static std::unique_ptr<RtpPacketizer> Create(
std::optional<VideoCodecType> type,
- rtc::ArrayView<const uint8_t> payload,
+ ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
// Codec-specific details.
const RTPVideoHeader& rtp_video_header);
diff --git a/modules/rtp_rtcp/source/rtp_format_h264.cc b/modules/rtp_rtcp/source/rtp_format_h264.cc
index f24ddd8..fd501a2 100644
--- a/modules/rtp_rtcp/source/rtp_format_h264.cc
+++ b/modules/rtp_rtcp/source/rtp_format_h264.cc
@@ -34,7 +34,7 @@
} // namespace
-RtpPacketizerH264::RtpPacketizerH264(rtc::ArrayView<const uint8_t> payload,
+RtpPacketizerH264::RtpPacketizerH264(ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
H264PacketizationMode packetization_mode)
: limits_(limits), num_packets_left_(0) {
@@ -47,9 +47,8 @@
payload.subview(nalu.payload_start_offset, nalu.payload_size));
}
bool has_empty_fragments = absl::c_any_of(
- input_fragments_, [](const rtc::ArrayView<const uint8_t> fragment) {
- return fragment.empty();
- });
+ input_fragments_,
+ [](const ArrayView<const uint8_t> fragment) { return fragment.empty(); });
if (has_empty_fragments || !GeneratePackets(packetization_mode)) {
// If empty fragments were found or we failed to generate all the packets,
// discard already generated packets in case the caller would ignore the
@@ -102,7 +101,7 @@
bool RtpPacketizerH264::PacketizeFuA(size_t fragment_index) {
// Fragment payload into packets (FU-A).
- rtc::ArrayView<const uint8_t> fragment = input_fragments_[fragment_index];
+ ArrayView<const uint8_t> fragment = input_fragments_[fragment_index];
PayloadSizeLimits limits = limits_;
// Leave room for the FU-A header.
@@ -153,7 +152,7 @@
size_t payload_size_left = limits_.max_payload_len;
int aggregated_fragments = 0;
size_t fragment_headers_length = 0;
- rtc::ArrayView<const uint8_t> fragment = input_fragments_[fragment_index];
+ ArrayView<const uint8_t> fragment = input_fragments_[fragment_index];
RTC_CHECK_GE(payload_size_left, fragment.size());
++num_packets_left_;
@@ -207,7 +206,7 @@
payload_size_left -= limits_.first_packet_reduction_len;
else if (fragment_index + 1 == input_fragments_.size())
payload_size_left -= limits_.last_packet_reduction_len;
- rtc::ArrayView<const uint8_t> fragment = input_fragments_[fragment_index];
+ ArrayView<const uint8_t> fragment = input_fragments_[fragment_index];
if (payload_size_left < fragment.size()) {
RTC_LOG(LS_ERROR) << "Failed to fit a fragment to packet in SingleNalu "
"packetization mode. Payload size left "
@@ -261,7 +260,7 @@
size_t index = kNalHeaderSize;
bool is_last_fragment = packet->last_fragment;
while (packet->aggregated) {
- rtc::ArrayView<const uint8_t> fragment = packet->source_fragment;
+ ArrayView<const uint8_t> fragment = packet->source_fragment;
RTC_CHECK_LE(index + kLengthFieldSize + fragment.size(), payload_capacity);
// Add NAL unit length field.
ByteWriter<uint16_t>::WriteBigEndian(&buffer[index], fragment.size());
@@ -294,7 +293,7 @@
fu_header |= (packet->last_fragment ? kH264EBit : 0);
uint8_t type = packet->header & kH264TypeMask;
fu_header |= type;
- rtc::ArrayView<const uint8_t> fragment = packet->source_fragment;
+ ArrayView<const uint8_t> fragment = packet->source_fragment;
uint8_t* buffer =
rtp_packet->AllocatePayload(kFuAHeaderSize + fragment.size());
buffer[0] = fu_indicator;
diff --git a/modules/rtp_rtcp/source/rtp_format_h264.h b/modules/rtp_rtcp/source/rtp_format_h264.h
index 2597e9c..def175a 100644
--- a/modules/rtp_rtcp/source/rtp_format_h264.h
+++ b/modules/rtp_rtcp/source/rtp_format_h264.h
@@ -38,7 +38,7 @@
public:
// Initialize with payload from encoder.
// The payload_data must be exactly one encoded H264 frame.
- RtpPacketizerH264(rtc::ArrayView<const uint8_t> payload,
+ RtpPacketizerH264(ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
H264PacketizationMode packetization_mode);
@@ -62,7 +62,7 @@
// packet unit may represent a single NAL unit or a STAP-A packet, of which
// there may be multiple in a single RTP packet (if so, aggregated = true).
struct PacketUnit {
- PacketUnit(rtc::ArrayView<const uint8_t> source_fragment,
+ PacketUnit(ArrayView<const uint8_t> source_fragment,
bool first_fragment,
bool last_fragment,
bool aggregated,
@@ -73,7 +73,7 @@
aggregated(aggregated),
header(header) {}
- rtc::ArrayView<const uint8_t> source_fragment;
+ ArrayView<const uint8_t> source_fragment;
bool first_fragment;
bool last_fragment;
bool aggregated;
@@ -90,7 +90,7 @@
const PayloadSizeLimits limits_;
size_t num_packets_left_;
- std::deque<rtc::ArrayView<const uint8_t>> input_fragments_;
+ std::deque<ArrayView<const uint8_t>> input_fragments_;
std::queue<PacketUnit> packets_;
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
index 73c211d..b4288b1 100644
--- a/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_h264_unittest.cc
@@ -55,9 +55,9 @@
constexpr size_t kFuAHeaderSize = 2;
// Creates Buffer that looks like nal unit of given size.
-rtc::Buffer GenerateNalUnit(size_t size) {
+Buffer GenerateNalUnit(size_t size) {
RTC_CHECK_GT(size, 0);
- rtc::Buffer buffer(size);
+ Buffer buffer(size);
// Set some valid header.
buffer[0] = kSlice;
for (size_t i = 1; i < size; ++i) {
@@ -70,10 +70,10 @@
}
// Create frame consisting of nalus of given size.
-rtc::Buffer CreateFrame(std::initializer_list<size_t> nalu_sizes) {
+Buffer CreateFrame(std::initializer_list<size_t> nalu_sizes) {
static constexpr int kStartCodeSize = 3;
- rtc::Buffer frame(absl::c_accumulate(nalu_sizes, size_t{0}) +
- kStartCodeSize * nalu_sizes.size());
+ Buffer frame(absl::c_accumulate(nalu_sizes, size_t{0}) +
+ kStartCodeSize * nalu_sizes.size());
size_t offset = 0;
for (size_t nalu_size : nalu_sizes) {
EXPECT_GE(nalu_size, 1u);
@@ -93,15 +93,15 @@
}
// Create frame consisting of given nalus.
-rtc::Buffer CreateFrame(rtc::ArrayView<const rtc::Buffer> nalus) {
+Buffer CreateFrame(ArrayView<const Buffer> nalus) {
static constexpr int kStartCodeSize = 3;
int frame_size = 0;
- for (const rtc::Buffer& nalu : nalus) {
+ for (const Buffer& nalu : nalus) {
frame_size += (kStartCodeSize + nalu.size());
}
- rtc::Buffer frame(frame_size);
+ Buffer frame(frame_size);
size_t offset = 0;
- for (const rtc::Buffer& nalu : nalus) {
+ for (const Buffer& nalu : nalus) {
// Insert nalu start code
frame[offset] = 0;
frame[offset + 1] = 0;
@@ -144,9 +144,8 @@
TEST_P(RtpPacketizerH264ModeTest, SingleNaluTwoPackets) {
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = kMaxPayloadSize;
- rtc::Buffer nalus[] = {GenerateNalUnit(kMaxPayloadSize),
- GenerateNalUnit(100)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit(kMaxPayloadSize), GenerateNalUnit(100)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH264 packetizer(frame, limits, GetParam());
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -161,10 +160,10 @@
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 200;
limits.first_packet_reduction_len = 5;
- rtc::Buffer nalus[] = {GenerateNalUnit(/*size=*/195),
- GenerateNalUnit(/*size=*/200),
- GenerateNalUnit(/*size=*/200)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit(/*size=*/195),
+ GenerateNalUnit(/*size=*/200),
+ GenerateNalUnit(/*size=*/200)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH264 packetizer(frame, limits, GetParam());
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -180,10 +179,10 @@
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 200;
limits.last_packet_reduction_len = 5;
- rtc::Buffer nalus[] = {GenerateNalUnit(/*size=*/200),
- GenerateNalUnit(/*size=*/200),
- GenerateNalUnit(/*size=*/195)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit(/*size=*/200),
+ GenerateNalUnit(/*size=*/200),
+ GenerateNalUnit(/*size=*/195)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH264 packetizer(frame, limits, GetParam());
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -200,7 +199,7 @@
limits.max_payload_len = 200;
limits.first_packet_reduction_len = 20;
limits.last_packet_reduction_len = 30;
- rtc::Buffer frame = CreateFrame({150});
+ Buffer frame = CreateFrame({150});
RtpPacketizerH264 packetizer(frame, limits, GetParam());
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -216,10 +215,9 @@
// Aggregation tests.
TEST(RtpPacketizerH264Test, StapA) {
- rtc::Buffer nalus[] = {GenerateNalUnit(/*size=*/2),
- GenerateNalUnit(/*size=*/2),
- GenerateNalUnit(/*size=*/0x123)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit(/*size=*/2), GenerateNalUnit(/*size=*/2),
+ GenerateNalUnit(/*size=*/0x123)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH264 packetizer(frame, kNoLimits,
H264PacketizationMode::NonInterleaved);
@@ -252,7 +250,7 @@
TEST(RtpPacketizerH264Test, SingleNalUnitModeHasNoStapA) {
// This is the same setup as for the StapA test.
- rtc::Buffer frame = CreateFrame({2, 2, 0x123});
+ Buffer frame = CreateFrame({2, 2, 0x123});
RtpPacketizerH264 packetizer(frame, kNoLimits,
H264PacketizationMode::SingleNalUnit);
@@ -271,10 +269,9 @@
limits.first_packet_reduction_len = 100;
const size_t kFirstFragmentSize =
limits.max_payload_len - limits.first_packet_reduction_len;
- rtc::Buffer nalus[] = {GenerateNalUnit(/*size=*/kFirstFragmentSize),
- GenerateNalUnit(/*size=*/2),
- GenerateNalUnit(/*size=*/2)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit(/*size=*/kFirstFragmentSize),
+ GenerateNalUnit(/*size=*/2), GenerateNalUnit(/*size=*/2)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH264 packetizer(frame, limits,
H264PacketizationMode::NonInterleaved);
@@ -301,10 +298,10 @@
limits.single_packet_reduction_len = 8;
// 3 fragments of sizes 2 + 2 + 981, plus 7 bytes of headers, is expected to
// be packetized to single packet of size 992.
- rtc::Buffer first_nalus[] = {GenerateNalUnit(/*size=*/2),
- GenerateNalUnit(/*size=*/2),
- GenerateNalUnit(/*size=*/981)};
- rtc::Buffer first_frame = CreateFrame(first_nalus);
+ Buffer first_nalus[] = {GenerateNalUnit(/*size=*/2),
+ GenerateNalUnit(/*size=*/2),
+ GenerateNalUnit(/*size=*/981)};
+ Buffer first_frame = CreateFrame(first_nalus);
RtpPacketizerH264 first_packetizer(first_frame, limits,
H264PacketizationMode::NonInterleaved);
@@ -316,10 +313,10 @@
// Increasing the last fragment size by one exceeds
// single_packet_reduction_len and produces two packets.
- rtc::Buffer second_nalus[] = {GenerateNalUnit(/*size=*/2),
- GenerateNalUnit(/*size=*/2),
- GenerateNalUnit(/*size=*/982)};
- rtc::Buffer second_frame = CreateFrame(second_nalus);
+ Buffer second_nalus[] = {GenerateNalUnit(/*size=*/2),
+ GenerateNalUnit(/*size=*/2),
+ GenerateNalUnit(/*size=*/982)};
+ Buffer second_frame = CreateFrame(second_nalus);
RtpPacketizerH264 second_packetizer(second_frame, limits,
H264PacketizationMode::NonInterleaved);
packets = FetchAllPackets(&second_packetizer);
@@ -333,9 +330,9 @@
const size_t kFirstFragmentSize = 1000;
const size_t kLastFragmentSize =
limits.max_payload_len - limits.last_packet_reduction_len + 1;
- rtc::Buffer nalus[] = {GenerateNalUnit(/*size=*/kFirstFragmentSize),
- GenerateNalUnit(/*size=*/kLastFragmentSize)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit(/*size=*/kFirstFragmentSize),
+ GenerateNalUnit(/*size=*/kLastFragmentSize)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH264 packetizer(frame, limits,
H264PacketizationMode::NonInterleaved);
@@ -355,10 +352,9 @@
limits.max_payload_len = 1000;
const size_t kLastFragmentSize =
limits.max_payload_len - 3 * kLengthFieldLength - 4;
- rtc::Buffer nalus[] = {GenerateNalUnit(/*size=*/2),
- GenerateNalUnit(/*size=*/2),
- GenerateNalUnit(/*size=*/kLastFragmentSize)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit(/*size=*/2), GenerateNalUnit(/*size=*/2),
+ GenerateNalUnit(/*size=*/kLastFragmentSize)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH264 packetizer(frame, limits,
H264PacketizationMode::NonInterleaved);
@@ -381,10 +377,10 @@
const size_t kFuaPayloadSize = 70;
const size_t kFuaNaluSize = kNalHeaderSize + 2 * kFuaPayloadSize;
const size_t kStapANaluSize = 20;
- rtc::Buffer nalus[] = {GenerateNalUnit(kFuaNaluSize),
- GenerateNalUnit(kStapANaluSize),
- GenerateNalUnit(kStapANaluSize)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit(kFuaNaluSize),
+ GenerateNalUnit(kStapANaluSize),
+ GenerateNalUnit(kStapANaluSize)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH264 packetizer(frame, limits,
H264PacketizationMode::NonInterleaved);
@@ -425,7 +421,7 @@
limits.last_packet_reduction_len = 20;
limits.single_packet_reduction_len = 20;
// Actual sizes, which triggered this bug.
- rtc::Buffer frame = CreateFrame({20, 8, 18, 1161});
+ Buffer frame = CreateFrame({20, 8, 18, 1161});
RtpPacketizerH264 packetizer(frame, limits,
H264PacketizationMode::NonInterleaved);
@@ -442,8 +438,8 @@
// Returns sizes of the payloads excluding fua headers.
std::vector<int> TestFua(size_t frame_payload_size,
const RtpPacketizer::PayloadSizeLimits& limits) {
- rtc::Buffer nalu[] = {GenerateNalUnit(kNalHeaderSize + frame_payload_size)};
- rtc::Buffer frame = CreateFrame(nalu);
+ Buffer nalu[] = {GenerateNalUnit(kNalHeaderSize + frame_payload_size)};
+ Buffer frame = CreateFrame(nalu);
RtpPacketizerH264 packetizer(frame, limits,
H264PacketizationMode::NonInterleaved);
@@ -524,7 +520,7 @@
TEST(RtpPacketizerH264Test, RejectsOverlongDataInPacketizationMode0) {
RtpPacketizer::PayloadSizeLimits limits;
- rtc::Buffer frame = CreateFrame({kMaxPayloadSize + 1});
+ Buffer frame = CreateFrame({kMaxPayloadSize + 1});
RtpPacketizerH264 packetizer(frame, limits,
H264PacketizationMode::SingleNalUnit);
diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.cc b/modules/rtp_rtcp/source/rtp_format_video_generic.cc
index cc9c0cb..db64feb 100644
--- a/modules/rtp_rtcp/source/rtp_format_video_generic.cc
+++ b/modules/rtp_rtcp/source/rtp_format_video_generic.cc
@@ -30,7 +30,7 @@
} // namespace
RtpPacketizerGeneric::RtpPacketizerGeneric(
- rtc::ArrayView<const uint8_t> payload,
+ ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
const RTPVideoHeader& rtp_video_header)
: remaining_payload_(payload) {
@@ -41,9 +41,8 @@
current_packet_ = payload_sizes_.begin();
}
-RtpPacketizerGeneric::RtpPacketizerGeneric(
- rtc::ArrayView<const uint8_t> payload,
- PayloadSizeLimits limits)
+RtpPacketizerGeneric::RtpPacketizerGeneric(ArrayView<const uint8_t> payload,
+ PayloadSizeLimits limits)
: header_size_(0), remaining_payload_(payload) {
payload_sizes_ = SplitAboutEqually(payload.size(), limits);
current_packet_ = payload_sizes_.begin();
diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic.h b/modules/rtp_rtcp/source/rtp_format_video_generic.h
index fc76ca8..3e0c1e3 100644
--- a/modules/rtp_rtcp/source/rtp_format_video_generic.h
+++ b/modules/rtp_rtcp/source/rtp_format_video_generic.h
@@ -36,14 +36,14 @@
// Initialize with payload from encoder.
// The payload_data must be exactly one encoded generic frame.
// Packets returned by `NextPacket` will contain the generic payload header.
- RtpPacketizerGeneric(rtc::ArrayView<const uint8_t> payload,
+ RtpPacketizerGeneric(ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
const RTPVideoHeader& rtp_video_header);
// Initialize with payload from encoder.
// The payload_data must be exactly one encoded generic frame.
// Packets returned by `NextPacket` will contain raw payload without the
// generic payload header.
- RtpPacketizerGeneric(rtc::ArrayView<const uint8_t> payload,
+ RtpPacketizerGeneric(ArrayView<const uint8_t> payload,
PayloadSizeLimits limits);
~RtpPacketizerGeneric() override;
@@ -64,7 +64,7 @@
uint8_t header_[3];
size_t header_size_;
- rtc::ArrayView<const uint8_t> remaining_payload_;
+ ArrayView<const uint8_t> remaining_payload_;
std::vector<int> payload_sizes_;
std::vector<int>::const_iterator current_packet_;
};
diff --git a/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc b/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc
index 3ada9af..e927038 100644
--- a/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_video_generic_unittest.cc
@@ -82,7 +82,7 @@
RtpPacketToSend packet(nullptr);
ASSERT_TRUE(packetizer.NextPacket(&packet));
- rtc::ArrayView<const uint8_t> payload = packet.payload();
+ ArrayView<const uint8_t> payload = packet.payload();
EXPECT_EQ(payload.size(), 3 + kPayloadSize);
EXPECT_TRUE(payload[0] & 0x04); // Extended header bit is set.
// Frame id is 37.
@@ -136,7 +136,7 @@
RtpPacketToSend packet(nullptr);
ASSERT_TRUE(packetizer.NextPacket(&packet));
- rtc::ArrayView<const uint8_t> payload = packet.payload();
+ ArrayView<const uint8_t> payload = packet.payload();
EXPECT_TRUE(payload[0] & 0x04); // Extended header bit is set.
// Frame id is 0x137.
EXPECT_EQ(0x01u, payload[1]);
@@ -152,7 +152,7 @@
RtpPacketToSend packet(nullptr);
ASSERT_TRUE(packetizer.NextPacket(&packet));
- rtc::ArrayView<const uint8_t> payload = packet.payload();
+ ArrayView<const uint8_t> payload = packet.payload();
EXPECT_FALSE(payload[0] & 0x04);
}
@@ -164,7 +164,7 @@
RtpPacketToSend packet(nullptr);
ASSERT_TRUE(packetizer.NextPacket(&packet));
- rtc::ArrayView<const uint8_t> payload = packet.payload();
+ ArrayView<const uint8_t> payload = packet.payload();
EXPECT_THAT(payload, ElementsAreArray(kPayload));
}
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.cc b/modules/rtp_rtcp/source/rtp_format_vp8.cc
index b0dc8e0..5550f48 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp8.cc
@@ -58,7 +58,7 @@
} // namespace
-RtpPacketizerVp8::RtpPacketizerVp8(rtc::ArrayView<const uint8_t> payload,
+RtpPacketizerVp8::RtpPacketizerVp8(ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
const RTPVideoHeaderVP8& hdr_info)
: hdr_(BuildHeader(hdr_info)), remaining_payload_(payload) {
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8.h b/modules/rtp_rtcp/source/rtp_format_vp8.h
index d1f569a..36f4b8b 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8.h
+++ b/modules/rtp_rtcp/source/rtp_format_vp8.h
@@ -43,7 +43,7 @@
public:
// Initialize with payload from encoder.
// The payload_data must be exactly one encoded VP8 frame.
- RtpPacketizerVp8(rtc::ArrayView<const uint8_t> payload,
+ RtpPacketizerVp8(ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
const RTPVideoHeaderVP8& hdr_info);
@@ -65,7 +65,7 @@
static RawHeader BuildHeader(const RTPVideoHeaderVP8& header);
RawHeader hdr_;
- rtc::ArrayView<const uint8_t> remaining_payload_;
+ ArrayView<const uint8_t> remaining_payload_;
std::vector<int> payload_sizes_;
std::vector<int>::const_iterator current_packet_;
};
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc
index 108c0d3..8dabcd8 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.cc
@@ -64,7 +64,7 @@
void RtpFormatVp8TestHelper::GetAllPacketsAndCheck(
RtpPacketizerVp8* packetizer,
- rtc::ArrayView<const size_t> expected_sizes) {
+ ArrayView<const size_t> expected_sizes) {
EXPECT_EQ(packetizer->NumPackets(), expected_sizes.size());
const uint8_t* data_ptr = payload_.begin();
RtpPacketToSend packet(kNoExtensions);
@@ -84,7 +84,7 @@
EXPECT_EQ(payload_.end() - data_ptr, 0);
}
-int RtpFormatVp8TestHelper::CheckHeader(rtc::ArrayView<const uint8_t> buffer,
+int RtpFormatVp8TestHelper::CheckHeader(ArrayView<const uint8_t> buffer,
bool first) {
int x_bit = Bit(buffer[0], 7);
EXPECT_EQ(Bit(buffer[0], 6), 0); // Reserved.
@@ -111,9 +111,8 @@
// Verify that the I bit and the PictureID field are both set in accordance
// with the information in hdr_info_->pictureId.
-void RtpFormatVp8TestHelper::CheckPictureID(
- rtc::ArrayView<const uint8_t> buffer,
- int* offset) {
+void RtpFormatVp8TestHelper::CheckPictureID(ArrayView<const uint8_t> buffer,
+ int* offset) {
int i_bit = Bit(buffer[1], 7);
if (hdr_info_->pictureId != kNoPictureId) {
EXPECT_EQ(i_bit, 1);
@@ -129,9 +128,8 @@
// Verify that the L bit and the TL0PICIDX field are both set in accordance
// with the information in hdr_info_->tl0PicIdx.
-void RtpFormatVp8TestHelper::CheckTl0PicIdx(
- rtc::ArrayView<const uint8_t> buffer,
- int* offset) {
+void RtpFormatVp8TestHelper::CheckTl0PicIdx(ArrayView<const uint8_t> buffer,
+ int* offset) {
int l_bit = Bit(buffer[1], 6);
if (hdr_info_->tl0PicIdx != kNoTl0PicIdx) {
EXPECT_EQ(l_bit, 1);
@@ -145,9 +143,8 @@
// Verify that the T bit and the TL0PICIDX field, and the K bit and KEYIDX
// field are all set in accordance with the information in
// hdr_info_->temporalIdx and hdr_info_->keyIdx, respectively.
-void RtpFormatVp8TestHelper::CheckTIDAndKeyIdx(
- rtc::ArrayView<const uint8_t> buffer,
- int* offset) {
+void RtpFormatVp8TestHelper::CheckTIDAndKeyIdx(ArrayView<const uint8_t> buffer,
+ int* offset) {
int t_bit = Bit(buffer[1], 5);
int k_bit = Bit(buffer[1], 4);
if (hdr_info_->temporalIdx == kNoTemporalIdx &&
diff --git a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h
index 3e35b98..a364df0 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h
+++ b/modules/rtp_rtcp/source/rtp_format_vp8_test_helper.h
@@ -36,22 +36,21 @@
RtpFormatVp8TestHelper& operator=(const RtpFormatVp8TestHelper&) = delete;
void GetAllPacketsAndCheck(RtpPacketizerVp8* packetizer,
- rtc::ArrayView<const size_t> expected_sizes);
+ ArrayView<const size_t> expected_sizes);
- rtc::ArrayView<const uint8_t> payload() const { return payload_; }
+ ArrayView<const uint8_t> payload() const { return payload_; }
size_t payload_size() const { return payload_.size(); }
private:
// Returns header size, i.e. payload offset.
- int CheckHeader(rtc::ArrayView<const uint8_t> rtp_payload, bool first);
- void CheckPictureID(rtc::ArrayView<const uint8_t> rtp_payload, int* offset);
- void CheckTl0PicIdx(rtc::ArrayView<const uint8_t> rtp_payload, int* offset);
- void CheckTIDAndKeyIdx(rtc::ArrayView<const uint8_t> rtp_payload,
- int* offset);
+ int CheckHeader(ArrayView<const uint8_t> rtp_payload, bool first);
+ void CheckPictureID(ArrayView<const uint8_t> rtp_payload, int* offset);
+ void CheckTl0PicIdx(ArrayView<const uint8_t> rtp_payload, int* offset);
+ void CheckTIDAndKeyIdx(ArrayView<const uint8_t> rtp_payload, int* offset);
void CheckPayload(const uint8_t* data_ptr);
const RTPVideoHeaderVP8* const hdr_info_;
- rtc::Buffer payload_;
+ Buffer payload_;
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.cc b/modules/rtp_rtcp/source/rtp_format_vp9.cc
index b0fe7ff..4e8237e 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp9.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp9.cc
@@ -308,7 +308,7 @@
}
} // namespace
-RtpPacketizerVp9::RtpPacketizerVp9(rtc::ArrayView<const uint8_t> payload,
+RtpPacketizerVp9::RtpPacketizerVp9(ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
const RTPVideoHeaderVP9& hdr)
: hdr_(RemoveInactiveSpatialLayers(hdr)),
@@ -350,8 +350,7 @@
uint8_t* buffer = packet->AllocatePayload(header_size + packet_payload_len);
RTC_CHECK(buffer);
- if (!WriteHeader(layer_begin, layer_end,
- rtc::MakeArrayView(buffer, header_size)))
+ if (!WriteHeader(layer_begin, layer_end, MakeArrayView(buffer, header_size)))
return false;
memcpy(buffer + header_size, remaining_payload_.data(), packet_payload_len);
@@ -403,7 +402,7 @@
// +-+-+-+-+-+-+-+-+
bool RtpPacketizerVp9::WriteHeader(bool layer_begin,
bool layer_end,
- rtc::ArrayView<uint8_t> buffer) const {
+ ArrayView<uint8_t> buffer) const {
// Required payload descriptor byte.
bool i_bit = PictureIdPresent(hdr_);
bool p_bit = hdr_.inter_pic_predicted;
diff --git a/modules/rtp_rtcp/source/rtp_format_vp9.h b/modules/rtp_rtcp/source/rtp_format_vp9.h
index 3cf4dd5..80c43f3 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp9.h
+++ b/modules/rtp_rtcp/source/rtp_format_vp9.h
@@ -36,7 +36,7 @@
class RtpPacketizerVp9 : public RtpPacketizer {
public:
// The `payload` must be one encoded VP9 layer frame.
- RtpPacketizerVp9(rtc::ArrayView<const uint8_t> payload,
+ RtpPacketizerVp9(ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
const RTPVideoHeaderVP9& hdr);
@@ -58,12 +58,12 @@
// the layer frame. Returns false on failure.
bool WriteHeader(bool layer_begin,
bool layer_end,
- rtc::ArrayView<uint8_t> rtp_payload) const;
+ ArrayView<uint8_t> rtp_payload) const;
const RTPVideoHeaderVP9 hdr_;
const int header_size_;
const int first_packet_extra_header_size_;
- rtc::ArrayView<const uint8_t> remaining_payload_;
+ ArrayView<const uint8_t> remaining_payload_;
std::vector<int> payload_sizes_;
std::vector<int>::const_iterator current_packet_;
};
diff --git a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
index 59e9b49..58789da 100644
--- a/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_format_vp9_unittest.cc
@@ -78,7 +78,7 @@
size_t expected_length) {
RTPVideoHeader video_header;
EXPECT_EQ(VideoRtpDepacketizerVp9::ParseRtpPayload(
- rtc::MakeArrayView(packet, expected_length), &video_header),
+ MakeArrayView(packet, expected_length), &video_header),
expected_hdr_length);
EXPECT_EQ(kVideoCodecVP9, video_header.codec);
auto& vp9_header =
@@ -154,9 +154,8 @@
EXPECT_EQ(last, payload_pos_ == payload_.size());
}
- void CreateParseAndCheckPackets(
- rtc::ArrayView<const size_t> expected_hdr_sizes,
- rtc::ArrayView<const size_t> expected_sizes) {
+ void CreateParseAndCheckPackets(ArrayView<const size_t> expected_hdr_sizes,
+ ArrayView<const size_t> expected_sizes) {
ASSERT_EQ(expected_hdr_sizes.size(), expected_sizes.size());
ASSERT_TRUE(packetizer_ != nullptr);
EXPECT_EQ(expected_sizes.size(), num_packets_);
diff --git a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.cc b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.cc
index 788dfe1..9bb8898 100644
--- a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.cc
+++ b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.cc
@@ -75,10 +75,10 @@
frame_id_ = frame_id;
}
-rtc::ArrayView<const uint16_t>
-RtpGenericFrameDescriptor::FrameDependenciesDiffs() const {
+ArrayView<const uint16_t> RtpGenericFrameDescriptor::FrameDependenciesDiffs()
+ const {
RTC_DCHECK(FirstPacketInSubFrame());
- return rtc::MakeArrayView(frame_deps_id_diffs_, num_frame_deps_);
+ return MakeArrayView(frame_deps_id_diffs_, num_frame_deps_);
}
bool RtpGenericFrameDescriptor::AddFrameDependencyDiff(uint16_t fdiff) {
diff --git a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h
index f795f03..7ecdb2a 100644
--- a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h
+++ b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor.h
@@ -54,7 +54,7 @@
uint16_t FrameId() const;
void SetFrameId(uint16_t frame_id);
- rtc::ArrayView<const uint16_t> FrameDependenciesDiffs() const;
+ ArrayView<const uint16_t> FrameDependenciesDiffs() const;
void ClearFrameDependencies() { num_frame_deps_ = 0; }
// Returns false on failure, i.e. number of dependencies is too large.
bool AddFrameDependencyDiff(uint16_t fdiff);
diff --git a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.cc b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.cc
index 9c41ba4..e8ca3dd 100644
--- a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.cc
+++ b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.cc
@@ -63,7 +63,7 @@
// +-+-+-+-+-+-+-+-+
bool RtpGenericFrameDescriptorExtension00::Parse(
- rtc::ArrayView<const uint8_t> data,
+ ArrayView<const uint8_t> data,
RtpGenericFrameDescriptor* descriptor) {
if (data.empty()) {
return false;
@@ -131,7 +131,7 @@
}
bool RtpGenericFrameDescriptorExtension00::Write(
- rtc::ArrayView<uint8_t> data,
+ ArrayView<uint8_t> data,
const RtpGenericFrameDescriptor& descriptor) {
RTC_CHECK_EQ(data.size(), ValueSize(descriptor));
uint8_t base_header =
@@ -152,7 +152,7 @@
uint16_t frame_id = descriptor.FrameId();
data[2] = frame_id & 0xff;
data[3] = frame_id >> 8;
- rtc::ArrayView<const uint16_t> fdiffs = descriptor.FrameDependenciesDiffs();
+ ArrayView<const uint16_t> fdiffs = descriptor.FrameDependenciesDiffs();
size_t offset = 4;
if (descriptor.FirstPacketInSubFrame() && fdiffs.empty() &&
descriptor.Width() > 0 && descriptor.Height() > 0) {
diff --git a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h
index b4f6865..8c65555 100644
--- a/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h
+++ b/modules/rtp_rtcp/source/rtp_generic_frame_descriptor_extension.h
@@ -33,10 +33,10 @@
}
static constexpr int kMaxSizeBytes = 16;
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
RtpGenericFrameDescriptor* descriptor);
static size_t ValueSize(const RtpGenericFrameDescriptor& descriptor);
- static bool Write(rtc::ArrayView<uint8_t> data,
+ static bool Write(ArrayView<uint8_t> data,
const RtpGenericFrameDescriptor& descriptor);
};
diff --git a/modules/rtp_rtcp/source/rtp_header_extension_map.cc b/modules/rtp_rtcp/source/rtp_header_extension_map.cc
index dc9ae41..ef28dba 100644
--- a/modules/rtp_rtcp/source/rtp_header_extension_map.cc
+++ b/modules/rtp_rtcp/source/rtp_header_extension_map.cc
@@ -79,14 +79,13 @@
}
RtpHeaderExtensionMap::RtpHeaderExtensionMap(
- rtc::ArrayView<const RtpExtension> extensions)
+ ArrayView<const RtpExtension> extensions)
: RtpHeaderExtensionMap(false) {
for (const RtpExtension& extension : extensions)
RegisterByUri(extension.id, extension.uri);
}
-void RtpHeaderExtensionMap::Reset(
- rtc::ArrayView<const RtpExtension> extensions) {
+void RtpHeaderExtensionMap::Reset(ArrayView<const RtpExtension> extensions) {
for (auto& id : ids_)
id = kInvalidId;
for (const RtpExtension& extension : extensions)
diff --git a/modules/rtp_rtcp/source/rtp_header_extension_size.cc b/modules/rtp_rtcp/source/rtp_header_extension_size.cc
index d0db33e..b9016de 100644
--- a/modules/rtp_rtcp/source/rtp_header_extension_size.cc
+++ b/modules/rtp_rtcp/source/rtp_header_extension_size.cc
@@ -16,7 +16,7 @@
namespace webrtc {
-int RtpHeaderExtensionSize(rtc::ArrayView<const RtpExtensionSize> extensions,
+int RtpHeaderExtensionSize(ArrayView<const RtpExtensionSize> extensions,
const RtpHeaderExtensionMap& registered_extensions) {
// RFC3550 Section 5.3.1
static constexpr int kExtensionBlockHeaderSize = 4;
diff --git a/modules/rtp_rtcp/source/rtp_header_extension_size.h b/modules/rtp_rtcp/source/rtp_header_extension_size.h
index 1fb2eb2..b7fd960 100644
--- a/modules/rtp_rtcp/source/rtp_header_extension_size.h
+++ b/modules/rtp_rtcp/source/rtp_header_extension_size.h
@@ -24,7 +24,7 @@
// Calculates rtp header extension size in bytes assuming packet contain
// all `extensions` with provided `value_size`.
// Counts only extensions present among `registered_extensions`.
-int RtpHeaderExtensionSize(rtc::ArrayView<const RtpExtensionSize> extensions,
+int RtpHeaderExtensionSize(ArrayView<const RtpExtensionSize> extensions,
const RtpHeaderExtensionMap& registered_extensions);
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.cc b/modules/rtp_rtcp/source/rtp_header_extensions.cc
index 9af58b0..3f9a852 100644
--- a/modules/rtp_rtcp/source/rtp_header_extensions.cc
+++ b/modules/rtp_rtcp/source/rtp_header_extensions.cc
@@ -49,7 +49,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | ID | len=2 | absolute send time |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-bool AbsoluteSendTime::Parse(rtc::ArrayView<const uint8_t> data,
+bool AbsoluteSendTime::Parse(ArrayView<const uint8_t> data,
uint32_t* time_24bits) {
if (data.size() != 3)
return false;
@@ -57,8 +57,7 @@
return true;
}
-bool AbsoluteSendTime::Write(rtc::ArrayView<uint8_t> data,
- uint32_t time_24bits) {
+bool AbsoluteSendTime::Write(ArrayView<uint8_t> data, uint32_t time_24bits) {
RTC_DCHECK_EQ(data.size(), 3);
RTC_DCHECK_LE(time_24bits, 0x00FFFFFF);
ByteWriter<uint32_t, 3>::WriteBigEndian(data.data(), time_24bits);
@@ -100,7 +99,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | ... (56-63) |
// +-+-+-+-+-+-+-+-+
-bool AbsoluteCaptureTimeExtension::Parse(rtc::ArrayView<const uint8_t> data,
+bool AbsoluteCaptureTimeExtension::Parse(ArrayView<const uint8_t> data,
AbsoluteCaptureTime* extension) {
if (data.size() != kValueSizeBytes &&
data.size() != kValueSizeBytesWithoutEstimatedCaptureClockOffset) {
@@ -127,7 +126,7 @@
}
}
-bool AbsoluteCaptureTimeExtension::Write(rtc::ArrayView<uint8_t> data,
+bool AbsoluteCaptureTimeExtension::Write(ArrayView<uint8_t> data,
const AbsoluteCaptureTime& extension) {
RTC_DCHECK_EQ(data.size(), ValueSize(extension));
@@ -161,7 +160,7 @@
// | ID | len=1 |V| level |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// Sample Audio Level Encoding Using the Two-Byte Header Format
-bool AudioLevelExtension::Parse(rtc::ArrayView<const uint8_t> data,
+bool AudioLevelExtension::Parse(ArrayView<const uint8_t> data,
AudioLevel* extension) {
// One-byte and two-byte format share the same data definition.
if (data.size() != 1)
@@ -172,7 +171,7 @@
return true;
}
-bool AudioLevelExtension::Write(rtc::ArrayView<uint8_t> data,
+bool AudioLevelExtension::Write(ArrayView<uint8_t> data,
const AudioLevel& extension) {
// One-byte and two-byte format share the same data definition.
RTC_DCHECK_EQ(data.size(), 1);
@@ -203,7 +202,7 @@
// |0| level 3 | 0 (pad) | ... |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// Sample Audio Level Encoding Using the Two-Byte Header Format
-bool CsrcAudioLevel::Parse(rtc::ArrayView<const uint8_t> data,
+bool CsrcAudioLevel::Parse(ArrayView<const uint8_t> data,
std::vector<uint8_t>* csrc_audio_levels) {
if (data.size() > kRtpCsrcSize) {
return false;
@@ -215,13 +214,12 @@
return true;
}
-size_t CsrcAudioLevel::ValueSize(
- rtc::ArrayView<const uint8_t> csrc_audio_levels) {
+size_t CsrcAudioLevel::ValueSize(ArrayView<const uint8_t> csrc_audio_levels) {
return csrc_audio_levels.size();
}
-bool CsrcAudioLevel::Write(rtc::ArrayView<uint8_t> data,
- rtc::ArrayView<const uint8_t> csrc_audio_levels) {
+bool CsrcAudioLevel::Write(ArrayView<uint8_t> data,
+ ArrayView<const uint8_t> csrc_audio_levels) {
RTC_CHECK_LE(csrc_audio_levels.size(), kRtpCsrcSize);
if (csrc_audio_levels.size() != data.size()) {
return false;
@@ -248,7 +246,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | ID | len=2 | transmission offset |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-bool TransmissionOffset::Parse(rtc::ArrayView<const uint8_t> data,
+bool TransmissionOffset::Parse(ArrayView<const uint8_t> data,
int32_t* rtp_time) {
if (data.size() != 3)
return false;
@@ -256,7 +254,7 @@
return true;
}
-bool TransmissionOffset::Write(rtc::ArrayView<uint8_t> data, int32_t rtp_time) {
+bool TransmissionOffset::Write(ArrayView<uint8_t> data, int32_t rtp_time) {
RTC_DCHECK_EQ(data.size(), 3);
RTC_DCHECK_LE(rtp_time, 0x00ffffff);
ByteWriter<int32_t, 3>::WriteBigEndian(data.data(), rtp_time);
@@ -270,7 +268,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | ID | L=1 |transport-wide sequence number |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-bool TransportSequenceNumber::Parse(rtc::ArrayView<const uint8_t> data,
+bool TransportSequenceNumber::Parse(ArrayView<const uint8_t> data,
uint16_t* transport_sequence_number) {
if (data.size() != kValueSizeBytes)
return false;
@@ -278,7 +276,7 @@
return true;
}
-bool TransportSequenceNumber::Write(rtc::ArrayView<uint8_t> data,
+bool TransportSequenceNumber::Write(ArrayView<uint8_t> data,
uint16_t transport_sequence_number) {
RTC_DCHECK_EQ(data.size(), ValueSize(transport_sequence_number));
ByteWriter<uint16_t>::WriteBigEndian(data.data(), transport_sequence_number);
@@ -303,7 +301,7 @@
// cover including the current packet. If `seq_count` is zero no feedback is
// requested.
bool TransportSequenceNumberV2::Parse(
- rtc::ArrayView<const uint8_t> data,
+ ArrayView<const uint8_t> data,
uint16_t* transport_sequence_number,
std::optional<FeedbackRequest>* feedback_request) {
if (data.size() != kValueSizeBytes &&
@@ -329,7 +327,7 @@
}
bool TransportSequenceNumberV2::Write(
- rtc::ArrayView<uint8_t> data,
+ ArrayView<uint8_t> data,
uint16_t transport_sequence_number,
const std::optional<FeedbackRequest>& feedback_request) {
RTC_DCHECK_EQ(data.size(),
@@ -359,7 +357,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | ID | len=0 |0 0 0 0 C F R R|
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-bool VideoOrientation::Parse(rtc::ArrayView<const uint8_t> data,
+bool VideoOrientation::Parse(ArrayView<const uint8_t> data,
VideoRotation* rotation) {
if (data.size() != 1)
return false;
@@ -367,22 +365,20 @@
return true;
}
-bool VideoOrientation::Write(rtc::ArrayView<uint8_t> data,
- VideoRotation rotation) {
+bool VideoOrientation::Write(ArrayView<uint8_t> data, VideoRotation rotation) {
RTC_DCHECK_EQ(data.size(), 1);
data[0] = ConvertVideoRotationToCVOByte(rotation);
return true;
}
-bool VideoOrientation::Parse(rtc::ArrayView<const uint8_t> data,
- uint8_t* value) {
+bool VideoOrientation::Parse(ArrayView<const uint8_t> data, uint8_t* value) {
if (data.size() != 1)
return false;
*value = data[0];
return true;
}
-bool VideoOrientation::Write(rtc::ArrayView<uint8_t> data, uint8_t value) {
+bool VideoOrientation::Write(ArrayView<uint8_t> data, uint8_t value) {
RTC_DCHECK_EQ(data.size(), 1);
data[0] = value;
return true;
@@ -393,7 +389,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | ID | len=2 | MIN delay | MAX delay |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-bool PlayoutDelayLimits::Parse(rtc::ArrayView<const uint8_t> data,
+bool PlayoutDelayLimits::Parse(ArrayView<const uint8_t> data,
VideoPlayoutDelay* playout_delay) {
RTC_DCHECK(playout_delay);
if (data.size() != 3)
@@ -404,7 +400,7 @@
return playout_delay->Set(min_raw * kGranularity, max_raw * kGranularity);
}
-bool PlayoutDelayLimits::Write(rtc::ArrayView<uint8_t> data,
+bool PlayoutDelayLimits::Write(ArrayView<uint8_t> data,
const VideoPlayoutDelay& playout_delay) {
RTC_DCHECK_EQ(data.size(), 3);
@@ -433,7 +429,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | ID | len=0 | Content type |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-bool VideoContentTypeExtension::Parse(rtc::ArrayView<const uint8_t> data,
+bool VideoContentTypeExtension::Parse(ArrayView<const uint8_t> data,
VideoContentType* content_type) {
if (data.size() == 1 &&
videocontenttypehelpers::IsValidContentType(data[0])) {
@@ -447,7 +443,7 @@
return false;
}
-bool VideoContentTypeExtension::Write(rtc::ArrayView<uint8_t> data,
+bool VideoContentTypeExtension::Write(ArrayView<uint8_t> data,
VideoContentType content_type) {
RTC_DCHECK_EQ(data.size(), 1);
data[0] = static_cast<uint8_t>(content_type);
@@ -475,7 +471,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | network2 timestamp ms delta |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-bool VideoTimingExtension::Parse(rtc::ArrayView<const uint8_t> data,
+bool VideoTimingExtension::Parse(ArrayView<const uint8_t> data,
VideoSendTiming* timing) {
RTC_DCHECK(timing);
// TODO(sprang): Deprecate support for old wire format.
@@ -507,7 +503,7 @@
return true;
}
-bool VideoTimingExtension::Write(rtc::ArrayView<uint8_t> data,
+bool VideoTimingExtension::Write(ArrayView<uint8_t> data,
const VideoSendTiming& timing) {
RTC_DCHECK_EQ(data.size(), 1 + 2 * 6);
ByteWriter<uint8_t>::WriteBigEndian(data.data() + kFlagsOffset, timing.flags);
@@ -529,7 +525,7 @@
return true;
}
-bool VideoTimingExtension::Write(rtc::ArrayView<uint8_t> data,
+bool VideoTimingExtension::Write(ArrayView<uint8_t> data,
uint16_t time_delta_ms,
uint8_t offset) {
RTC_DCHECK_GE(data.size(), offset + 2);
@@ -573,7 +569,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// |range+chr.sit. |
// +-+-+-+-+-+-+-+-+
-bool ColorSpaceExtension::Parse(rtc::ArrayView<const uint8_t> data,
+bool ColorSpaceExtension::Parse(ArrayView<const uint8_t> data,
ColorSpace* color_space) {
RTC_DCHECK(color_space);
if (data.size() != kValueSizeBytes &&
@@ -613,7 +609,7 @@
return true;
}
-bool ColorSpaceExtension::Write(rtc::ArrayView<uint8_t> data,
+bool ColorSpaceExtension::Write(ArrayView<uint8_t> data,
const ColorSpace& color_space) {
RTC_DCHECK_EQ(data.size(), ValueSize(color_space));
size_t offset = 0;
@@ -651,7 +647,7 @@
static_cast<uint8_t>(chroma_siting_vertical);
}
-size_t ColorSpaceExtension::ParseHdrMetadata(rtc::ArrayView<const uint8_t> data,
+size_t ColorSpaceExtension::ParseHdrMetadata(ArrayView<const uint8_t> data,
HdrMetadata* hdr_metadata) {
RTC_DCHECK_EQ(data.size(),
kValueSizeBytes - kValueSizeBytesWithoutHdrMetadata);
@@ -698,7 +694,7 @@
return 2; // Return number of bytes read.
}
-size_t ColorSpaceExtension::WriteHdrMetadata(rtc::ArrayView<uint8_t> data,
+size_t ColorSpaceExtension::WriteHdrMetadata(ArrayView<uint8_t> data,
const HdrMetadata& hdr_metadata) {
RTC_DCHECK_EQ(data.size(),
kValueSizeBytes - kValueSizeBytesWithoutHdrMetadata);
@@ -752,7 +748,7 @@
return 2; // Return number of bytes written.
}
-bool BaseRtpStringExtension::Parse(rtc::ArrayView<const uint8_t> data,
+bool BaseRtpStringExtension::Parse(ArrayView<const uint8_t> data,
std::string* str) {
if (data.empty() || data[0] == 0) // Valid string extension can't be empty.
return false;
@@ -764,7 +760,7 @@
return true;
}
-bool BaseRtpStringExtension::Write(rtc::ArrayView<uint8_t> data,
+bool BaseRtpStringExtension::Write(ArrayView<uint8_t> data,
absl::string_view str) {
if (str.size() > kMaxValueSizeBytes) {
return false;
@@ -792,7 +788,7 @@
// | ID | len=1 |N| level |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// Sample Audio Level Encoding Using the Two-Byte Header Format
-bool InbandComfortNoiseExtension::Parse(rtc::ArrayView<const uint8_t> data,
+bool InbandComfortNoiseExtension::Parse(ArrayView<const uint8_t> data,
std::optional<uint8_t>* level) {
if (data.size() != kValueSizeBytes)
return false;
@@ -802,7 +798,7 @@
return true;
}
-bool InbandComfortNoiseExtension::Write(rtc::ArrayView<uint8_t> data,
+bool InbandComfortNoiseExtension::Write(ArrayView<uint8_t> data,
std::optional<uint8_t> level) {
RTC_DCHECK_EQ(data.size(), kValueSizeBytes);
data[0] = 0b0000'0000;
@@ -822,7 +818,7 @@
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
// | ID | L=1 | video-frame-tracking-id |
// +-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+-+
-bool VideoFrameTrackingIdExtension::Parse(rtc::ArrayView<const uint8_t> data,
+bool VideoFrameTrackingIdExtension::Parse(ArrayView<const uint8_t> data,
uint16_t* video_frame_tracking_id) {
if (data.size() != kValueSizeBytes) {
return false;
@@ -831,7 +827,7 @@
return true;
}
-bool VideoFrameTrackingIdExtension::Write(rtc::ArrayView<uint8_t> data,
+bool VideoFrameTrackingIdExtension::Write(ArrayView<uint8_t> data,
uint16_t video_frame_tracking_id) {
RTC_DCHECK_EQ(data.size(), kValueSizeBytes);
ByteWriter<uint16_t>::WriteBigEndian(data.data(), video_frame_tracking_id);
diff --git a/modules/rtp_rtcp/source/rtp_header_extensions.h b/modules/rtp_rtcp/source/rtp_header_extensions.h
index 5cecd07..8fb26e5 100644
--- a/modules/rtp_rtcp/source/rtp_header_extensions.h
+++ b/modules/rtp_rtcp/source/rtp_header_extensions.h
@@ -51,11 +51,11 @@
return RtpExtension::kAbsSendTimeUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data, uint32_t* time_24bits);
+ static bool Parse(ArrayView<const uint8_t> data, uint32_t* time_24bits);
static size_t ValueSize(uint32_t /* time_24bits */) {
return kValueSizeBytes;
}
- static bool Write(rtc::ArrayView<uint8_t> data, uint32_t time_24bits);
+ static bool Write(ArrayView<uint8_t> data, uint32_t time_24bits);
static constexpr uint32_t To24Bits(Timestamp time) {
int64_t time_us = time.us() % (int64_t{1 << 6} * 1'000'000);
@@ -87,10 +87,10 @@
return RtpExtension::kAbsoluteCaptureTimeUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
AbsoluteCaptureTime* extension);
static size_t ValueSize(const AbsoluteCaptureTime& extension);
- static bool Write(rtc::ArrayView<uint8_t> data,
+ static bool Write(ArrayView<uint8_t> data,
const AbsoluteCaptureTime& extension);
};
@@ -103,11 +103,11 @@
return RtpExtension::kAudioLevelUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data, AudioLevel* extension);
+ static bool Parse(ArrayView<const uint8_t> data, AudioLevel* extension);
static size_t ValueSize(const AudioLevel& /* extension */) {
return kValueSizeBytes;
}
- static bool Write(rtc::ArrayView<uint8_t> data, const AudioLevel& extension);
+ static bool Write(ArrayView<uint8_t> data, const AudioLevel& extension);
};
class CsrcAudioLevel {
@@ -118,11 +118,11 @@
return RtpExtension::kCsrcAudioLevelsUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
std::vector<uint8_t>* csrc_audio_levels);
- static size_t ValueSize(rtc::ArrayView<const uint8_t> csrc_audio_levels);
- static bool Write(rtc::ArrayView<uint8_t> data,
- rtc::ArrayView<const uint8_t> csrc_audio_levels);
+ static size_t ValueSize(ArrayView<const uint8_t> csrc_audio_levels);
+ static bool Write(ArrayView<uint8_t> data,
+ ArrayView<const uint8_t> csrc_audio_levels);
};
class TransmissionOffset {
@@ -134,9 +134,9 @@
return RtpExtension::kTimestampOffsetUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data, int32_t* rtp_time);
+ static bool Parse(ArrayView<const uint8_t> data, int32_t* rtp_time);
static size_t ValueSize(int32_t /* rtp_time */) { return kValueSizeBytes; }
- static bool Write(rtc::ArrayView<uint8_t> data, int32_t rtp_time);
+ static bool Write(ArrayView<uint8_t> data, int32_t rtp_time);
};
class TransportSequenceNumber {
@@ -148,12 +148,12 @@
return RtpExtension::kTransportSequenceNumberUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
uint16_t* transport_sequence_number);
static size_t ValueSize(uint16_t /*transport_sequence_number*/) {
return kValueSizeBytes;
}
- static bool Write(rtc::ArrayView<uint8_t> data,
+ static bool Write(ArrayView<uint8_t> data,
uint16_t transport_sequence_number);
};
@@ -167,7 +167,7 @@
return RtpExtension::kTransportSequenceNumberV2Uri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
uint16_t* transport_sequence_number,
std::optional<FeedbackRequest>* feedback_request);
static size_t ValueSize(
@@ -176,7 +176,7 @@
return feedback_request ? kValueSizeBytes
: kValueSizeBytesWithoutFeedbackRequest;
}
- static bool Write(rtc::ArrayView<uint8_t> data,
+ static bool Write(ArrayView<uint8_t> data,
uint16_t transport_sequence_number,
const std::optional<FeedbackRequest>& feedback_request);
@@ -193,12 +193,12 @@
return RtpExtension::kVideoRotationUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data, VideoRotation* value);
+ static bool Parse(ArrayView<const uint8_t> data, VideoRotation* value);
static size_t ValueSize(VideoRotation) { return kValueSizeBytes; }
- static bool Write(rtc::ArrayView<uint8_t> data, VideoRotation value);
- static bool Parse(rtc::ArrayView<const uint8_t> data, uint8_t* value);
+ static bool Write(ArrayView<uint8_t> data, VideoRotation value);
+ static bool Parse(ArrayView<const uint8_t> data, uint8_t* value);
static size_t ValueSize(uint8_t /* value */) { return kValueSizeBytes; }
- static bool Write(rtc::ArrayView<uint8_t> data, uint8_t value);
+ static bool Write(ArrayView<uint8_t> data, uint8_t value);
};
class PlayoutDelayLimits {
@@ -217,10 +217,10 @@
// Maximum playout delay value in milliseconds.
static constexpr TimeDelta kMax = 0xfff * kGranularity; // 40950.
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
VideoPlayoutDelay* playout_delay);
static size_t ValueSize(const VideoPlayoutDelay&) { return kValueSizeBytes; }
- static bool Write(rtc::ArrayView<uint8_t> data,
+ static bool Write(ArrayView<uint8_t> data,
const VideoPlayoutDelay& playout_delay);
};
@@ -233,11 +233,10 @@
return RtpExtension::kVideoContentTypeUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
VideoContentType* content_type);
static size_t ValueSize(VideoContentType) { return kValueSizeBytes; }
- static bool Write(rtc::ArrayView<uint8_t> data,
- VideoContentType content_type);
+ static bool Write(ArrayView<uint8_t> data, VideoContentType content_type);
};
class VideoTimingExtension {
@@ -259,17 +258,15 @@
static constexpr uint8_t kNetworkTimestampDeltaOffset = 9;
static constexpr uint8_t kNetwork2TimestampDeltaOffset = 11;
- static bool Parse(rtc::ArrayView<const uint8_t> data,
- VideoSendTiming* timing);
+ static bool Parse(ArrayView<const uint8_t> data, VideoSendTiming* timing);
static size_t ValueSize(const VideoSendTiming&) { return kValueSizeBytes; }
- static bool Write(rtc::ArrayView<uint8_t> data,
- const VideoSendTiming& timing);
+ static bool Write(ArrayView<uint8_t> data, const VideoSendTiming& timing);
static size_t ValueSize(uint16_t /* time_delta_ms */, uint8_t /* idx */) {
return kValueSizeBytes;
}
// Writes only single time delta to position idx.
- static bool Write(rtc::ArrayView<uint8_t> data,
+ static bool Write(ArrayView<uint8_t> data,
uint16_t time_delta_ms,
uint8_t offset);
};
@@ -284,14 +281,12 @@
return RtpExtension::kColorSpaceUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
- ColorSpace* color_space);
+ static bool Parse(ArrayView<const uint8_t> data, ColorSpace* color_space);
static size_t ValueSize(const ColorSpace& color_space) {
return color_space.hdr_metadata() ? kValueSizeBytes
: kValueSizeBytesWithoutHdrMetadata;
}
- static bool Write(rtc::ArrayView<uint8_t> data,
- const ColorSpace& color_space);
+ static bool Write(ArrayView<uint8_t> data, const ColorSpace& color_space);
private:
static constexpr int kChromaticityDenominator = 50000; // 0.00002 resolution.
@@ -302,12 +297,12 @@
ColorSpace::RangeID range,
ColorSpace::ChromaSiting chroma_siting_horizontal,
ColorSpace::ChromaSiting chroma_siting_vertical);
- static size_t ParseHdrMetadata(rtc::ArrayView<const uint8_t> data,
+ static size_t ParseHdrMetadata(ArrayView<const uint8_t> data,
HdrMetadata* hdr_metadata);
static size_t ParseChromaticity(const uint8_t* data,
HdrMasteringMetadata::Chromaticity* p);
static size_t ParseLuminance(const uint8_t* data, float* f, int denominator);
- static size_t WriteHdrMetadata(rtc::ArrayView<uint8_t> data,
+ static size_t WriteHdrMetadata(ArrayView<uint8_t> data,
const HdrMetadata& hdr_metadata);
static size_t WriteChromaticity(uint8_t* data,
const HdrMasteringMetadata::Chromaticity& p);
@@ -323,9 +318,9 @@
// maximum length that can be encoded with one-byte header extensions.
static constexpr uint8_t kMaxValueSizeBytes = 16;
- static bool Parse(rtc::ArrayView<const uint8_t> data, std::string* str);
+ static bool Parse(ArrayView<const uint8_t> data, std::string* str);
static size_t ValueSize(absl::string_view str) { return str.size(); }
- static bool Write(rtc::ArrayView<uint8_t> data, absl::string_view str);
+ static bool Write(ArrayView<uint8_t> data, absl::string_view str);
};
class RtpStreamId : public BaseRtpStringExtension {
@@ -358,12 +353,12 @@
"http://www.webrtc.org/experiments/rtp-hdrext/inband-cn";
static constexpr absl::string_view Uri() { return kUri; }
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
std::optional<uint8_t>* level);
static size_t ValueSize(std::optional<uint8_t> /* level */) {
return kValueSizeBytes;
}
- static bool Write(rtc::ArrayView<uint8_t> data, std::optional<uint8_t> level);
+ static bool Write(ArrayView<uint8_t> data, std::optional<uint8_t> level);
};
class VideoFrameTrackingIdExtension {
@@ -375,13 +370,12 @@
return RtpExtension::kVideoFrameTrackingIdUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
uint16_t* video_frame_tracking_id);
static size_t ValueSize(uint16_t /*video_frame_tracking_id*/) {
return kValueSizeBytes;
}
- static bool Write(rtc::ArrayView<uint8_t> data,
- uint16_t video_frame_tracking_id);
+ static bool Write(ArrayView<uint8_t> data, uint16_t video_frame_tracking_id);
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/rtp_packet.cc b/modules/rtp_rtcp/source/rtp_packet.cc
index bf8d5e4..fe9d3a7 100644
--- a/modules/rtp_rtcp/source/rtp_packet.cc
+++ b/modules/rtp_rtcp/source/rtp_packet.cc
@@ -93,11 +93,11 @@
return true;
}
-bool RtpPacket::Parse(rtc::ArrayView<const uint8_t> packet) {
+bool RtpPacket::Parse(ArrayView<const uint8_t> packet) {
return Parse(packet.data(), packet.size());
}
-bool RtpPacket::Parse(rtc::CopyOnWriteBuffer buffer) {
+bool RtpPacket::Parse(CopyOnWriteBuffer buffer) {
if (!ParseBuffer(buffer.cdata(), buffer.size())) {
Clear();
return false;
@@ -216,7 +216,7 @@
}
}
-void RtpPacket::SetCsrcs(rtc::ArrayView<const uint32_t> csrcs) {
+void RtpPacket::SetCsrcs(ArrayView<const uint32_t> csrcs) {
RTC_DCHECK_EQ(extensions_size_, 0);
RTC_DCHECK_EQ(payload_size_, 0);
RTC_DCHECK_EQ(padding_size_, 0);
@@ -232,7 +232,7 @@
buffer_.SetSize(payload_offset_);
}
-rtc::ArrayView<uint8_t> RtpPacket::AllocateRawExtension(int id, size_t length) {
+ArrayView<uint8_t> RtpPacket::AllocateRawExtension(int id, size_t length) {
RTC_DCHECK_GE(id, RtpExtension::kMinId);
RTC_DCHECK_LE(id, RtpExtension::kMaxId);
RTC_DCHECK_GE(length, 1);
@@ -241,7 +241,7 @@
if (extension_entry != nullptr) {
// Extension already reserved. Check if same length is used.
if (extension_entry->length == length)
- return rtc::MakeArrayView(WriteAt(extension_entry->offset), length);
+ return MakeArrayView(WriteAt(extension_entry->offset), length);
RTC_LOG(LS_ERROR) << "Length mismatch for extension id " << id
<< ": expected "
@@ -342,8 +342,7 @@
SetExtensionLengthMaybeAddZeroPadding(extensions_offset);
payload_offset_ = extensions_offset + extensions_size_padded;
buffer_.SetSize(payload_offset_);
- return rtc::MakeArrayView(WriteAt(extension_info_offset),
- extension_info_length);
+ return MakeArrayView(WriteAt(extension_info_offset), extension_info_length);
}
void RtpPacket::PromoteToTwoByteHeaderExtension() {
@@ -587,8 +586,7 @@
return extension_entries_.back();
}
-rtc::ArrayView<const uint8_t> RtpPacket::FindExtension(
- ExtensionType type) const {
+ArrayView<const uint8_t> RtpPacket::FindExtension(ExtensionType type) const {
uint8_t id = extensions_.GetId(type);
if (id == ExtensionManager::kInvalidId) {
// Extension not registered.
@@ -598,12 +596,11 @@
if (extension_info == nullptr) {
return nullptr;
}
- return rtc::MakeArrayView(data() + extension_info->offset,
- extension_info->length);
+ return MakeArrayView(data() + extension_info->offset, extension_info->length);
}
-rtc::ArrayView<uint8_t> RtpPacket::AllocateExtension(ExtensionType type,
- size_t length) {
+ArrayView<uint8_t> RtpPacket::AllocateExtension(ExtensionType type,
+ size_t length) {
// TODO(webrtc:7990): Add support for empty extensions (length==0).
if (length == 0 || length > RtpExtension::kMaxValueSize ||
(!extensions_.ExtmapAllowMixed() &&
diff --git a/modules/rtp_rtcp/source/rtp_packet.h b/modules/rtp_rtcp/source/rtp_packet.h
index 9958917..9f98d5b 100644
--- a/modules/rtp_rtcp/source/rtp_packet.h
+++ b/modules/rtp_rtcp/source/rtp_packet.h
@@ -52,10 +52,10 @@
// read or allocate extensions in methods GetExtension, AllocateExtension,
// etc.)
bool Parse(const uint8_t* buffer, size_t size);
- bool Parse(rtc::ArrayView<const uint8_t> packet);
+ bool Parse(ArrayView<const uint8_t> packet);
// Parse and move given buffer into Packet.
- bool Parse(rtc::CopyOnWriteBuffer packet);
+ bool Parse(CopyOnWriteBuffer packet);
// Maps extensions id to their types.
void IdentifyExtensions(ExtensionManager extensions);
@@ -77,15 +77,15 @@
size_t payload_size() const { return payload_size_; }
bool has_padding() const { return buffer_[0] & 0x20; }
size_t padding_size() const { return padding_size_; }
- rtc::ArrayView<const uint8_t> payload() const {
- return rtc::MakeArrayView(data() + payload_offset_, payload_size_);
+ ArrayView<const uint8_t> payload() const {
+ return MakeArrayView(data() + payload_offset_, payload_size_);
}
- rtc::CopyOnWriteBuffer PayloadBuffer() const {
+ CopyOnWriteBuffer PayloadBuffer() const {
return buffer_.Slice(payload_offset_, payload_size_);
}
// Buffer.
- rtc::CopyOnWriteBuffer Buffer() const { return buffer_; }
+ CopyOnWriteBuffer Buffer() const { return buffer_; }
size_t capacity() const { return buffer_.capacity(); }
size_t size() const {
return payload_offset_ + payload_size_ + padding_size_;
@@ -118,7 +118,7 @@
// Writes csrc list. Assumes:
// a) There is enough room left in buffer.
// b) Extension headers, payload or padding data has not already been added.
- void SetCsrcs(rtc::ArrayView<const uint32_t> csrcs);
+ void SetCsrcs(ArrayView<const uint32_t> csrcs);
// Header extensions.
template <typename Extension>
@@ -138,24 +138,24 @@
// Returns view of the raw extension or empty view on failure.
template <typename Extension>
- rtc::ArrayView<const uint8_t> GetRawExtension() const;
+ ArrayView<const uint8_t> GetRawExtension() const;
template <typename Extension, typename... Values>
bool SetExtension(const Values&...);
template <typename Extension>
- bool SetRawExtension(rtc::ArrayView<const uint8_t> data);
+ bool SetRawExtension(ArrayView<const uint8_t> data);
template <typename Extension>
bool ReserveExtension();
// Find or allocate an extension `type`. Returns view of size `length`
// to write raw extension to or an empty view on failure.
- rtc::ArrayView<uint8_t> AllocateExtension(ExtensionType type, size_t length);
+ ArrayView<uint8_t> AllocateExtension(ExtensionType type, size_t length);
// Find an extension `type`.
// Returns view of the raw extension or empty view on failure.
- rtc::ArrayView<const uint8_t> FindExtension(ExtensionType type) const;
+ ArrayView<const uint8_t> FindExtension(ExtensionType type) const;
// Returns pointer to the payload of size at least `size_bytes`.
// Keeps original payload, if any. If `size_bytes` is larger than current
@@ -194,7 +194,7 @@
// Allocates and returns place to store rtp header extension.
// Returns empty arrayview on failure.
- rtc::ArrayView<uint8_t> AllocateRawExtension(int id, size_t length);
+ ArrayView<uint8_t> AllocateRawExtension(int id, size_t length);
// Promotes existing one-byte header extensions to two-byte header extensions
// by rewriting the data and updates the corresponding extension offsets.
@@ -221,7 +221,7 @@
ExtensionManager extensions_;
std::vector<ExtensionInfo> extension_entries_;
size_t extensions_size_ = 0; // Unaligned.
- rtc::CopyOnWriteBuffer buffer_;
+ CopyOnWriteBuffer buffer_;
};
template <typename Extension>
@@ -253,7 +253,7 @@
}
template <typename Extension>
-rtc::ArrayView<const uint8_t> RtpPacket::GetRawExtension() const {
+ArrayView<const uint8_t> RtpPacket::GetRawExtension() const {
return FindExtension(Extension::kId);
}
@@ -267,9 +267,8 @@
}
template <typename Extension>
-bool RtpPacket::SetRawExtension(rtc::ArrayView<const uint8_t> data) {
- rtc::ArrayView<uint8_t> buffer =
- AllocateExtension(Extension::kId, data.size());
+bool RtpPacket::SetRawExtension(ArrayView<const uint8_t> data) {
+ ArrayView<uint8_t> buffer = AllocateExtension(Extension::kId, data.size());
if (buffer.empty()) {
return false;
}
diff --git a/modules/rtp_rtcp/source/rtp_packet_history.cc b/modules/rtp_rtcp/source/rtp_packet_history.cc
index 3be0519..9b2db99 100644
--- a/modules/rtp_rtcp/source/rtp_packet_history.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_history.cc
@@ -299,7 +299,7 @@
}
void RtpPacketHistory::CullAcknowledgedPackets(
- rtc::ArrayView<const uint16_t> sequence_numbers) {
+ ArrayView<const uint16_t> sequence_numbers) {
MutexLock lock(&lock_);
for (uint16_t sequence_number : sequence_numbers) {
int packet_index = GetPacketIndex(sequence_number);
diff --git a/modules/rtp_rtcp/source/rtp_packet_history.h b/modules/rtp_rtcp/source/rtp_packet_history.h
index 46b6aa1..ebd2f91 100644
--- a/modules/rtp_rtcp/source/rtp_packet_history.h
+++ b/modules/rtp_rtcp/source/rtp_packet_history.h
@@ -116,7 +116,7 @@
encapsulate);
// Cull packets that have been acknowledged as received by the remote end.
- void CullAcknowledgedPackets(rtc::ArrayView<const uint16_t> sequence_numbers);
+ void CullAcknowledgedPackets(ArrayView<const uint16_t> sequence_numbers);
// Remove all pending packets from the history, but keep storage mode and
// capacity.
diff --git a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
index f1f0c06..a5531ef 100644
--- a/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_history_unittest.cc
@@ -152,7 +152,7 @@
Timestamp capture_time = Timestamp::Millis(1);
std::unique_ptr<RtpPacketToSend> packet = CreateRtpPacket(kStartSeqNum);
packet->set_capture_time(capture_time);
- rtc::CopyOnWriteBuffer buffer = packet->Buffer();
+ CopyOnWriteBuffer buffer = packet->Buffer();
hist_.PutRtpPacket(std::move(packet),
/*send_time=*/fake_clock_.CurrentTime());
diff --git a/modules/rtp_rtcp/source/rtp_packet_received.h b/modules/rtp_rtcp/source/rtp_packet_received.h
index 86bc043..21a6955 100644
--- a/modules/rtp_rtcp/source/rtp_packet_received.h
+++ b/modules/rtp_rtcp/source/rtp_packet_received.h
@@ -50,8 +50,8 @@
// Explicit Congestion Notification (ECN), RFC-3168, Section 5.
// Used by L4S: https://www.rfc-editor.org/rfc/rfc9331.html
- rtc::EcnMarking ecn() const { return ecn_; }
- void set_ecn(rtc::EcnMarking ecn) { ecn_ = ecn; }
+ EcnMarking ecn() const { return ecn_; }
+ void set_ecn(EcnMarking ecn) { ecn_ = ecn; }
// Flag if packet was recovered via RTX or FEC.
bool recovered() const { return recovered_; }
@@ -64,19 +64,19 @@
// An application can attach arbitrary data to an RTP packet using
// `additional_data`. The additional data does not affect WebRTC processing.
- rtc::scoped_refptr<rtc::RefCountedBase> additional_data() const {
+ scoped_refptr<RefCountedBase> additional_data() const {
return additional_data_;
}
- void set_additional_data(rtc::scoped_refptr<rtc::RefCountedBase> data) {
+ void set_additional_data(scoped_refptr<RefCountedBase> data) {
additional_data_ = std::move(data);
}
private:
webrtc::Timestamp arrival_time_ = Timestamp::MinusInfinity();
- rtc::EcnMarking ecn_ = rtc::EcnMarking::kNotEct;
+ EcnMarking ecn_ = EcnMarking::kNotEct;
int payload_type_frequency_ = 0;
bool recovered_ = false;
- rtc::scoped_refptr<rtc::RefCountedBase> additional_data_;
+ scoped_refptr<RefCountedBase> additional_data_;
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/rtp_packet_to_send.h b/modules/rtp_rtcp/source/rtp_packet_to_send.h
index 3542354..4e60c12 100644
--- a/modules/rtp_rtcp/source/rtp_packet_to_send.h
+++ b/modules/rtp_rtcp/source/rtp_packet_to_send.h
@@ -80,10 +80,10 @@
// An application can attach arbitrary data to an RTP packet using
// `additional_data`. The additional data does not affect WebRTC processing.
- rtc::scoped_refptr<rtc::RefCountedBase> additional_data() const {
+ scoped_refptr<RefCountedBase> additional_data() const {
return additional_data_;
}
- void set_additional_data(rtc::scoped_refptr<rtc::RefCountedBase> data) {
+ void set_additional_data(scoped_refptr<RefCountedBase> data) {
additional_data_ = std::move(data);
}
@@ -160,7 +160,7 @@
std::optional<int64_t> transport_sequence_number_;
bool allow_retransmission_ = false;
std::optional<uint16_t> retransmitted_sequence_number_;
- rtc::scoped_refptr<rtc::RefCountedBase> additional_data_;
+ scoped_refptr<RefCountedBase> additional_data_;
bool is_first_packet_of_frame_ = false;
bool is_key_frame_ = false;
bool fec_protect_packet_ = false;
diff --git a/modules/rtp_rtcp/source/rtp_packet_unittest.cc b/modules/rtp_rtcp/source/rtp_packet_unittest.cc
index df3428d..80fe006 100644
--- a/modules/rtp_rtcp/source/rtp_packet_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_packet_unittest.cc
@@ -476,8 +476,7 @@
RtpPacket packet;
EXPECT_TRUE(packet.SetPadding(kPaddingSize));
- EXPECT_THAT(rtc::MakeArrayView(packet.data() + 12, kPaddingSize - 1),
- Each(0));
+ EXPECT_THAT(MakeArrayView(packet.data() + 12, kPaddingSize - 1), Each(0));
}
TEST(RtpPacketTest, CreateOneBytePadding) {
@@ -511,7 +510,7 @@
}
TEST(RtpPacketTest, ParseBuffer) {
- rtc::CopyOnWriteBuffer unparsed(kMinimumPacket);
+ CopyOnWriteBuffer unparsed(kMinimumPacket);
const uint8_t* raw = unparsed.data();
RtpPacketReceived packet;
@@ -550,7 +549,7 @@
// clang-format on
RtpPacket packet;
- EXPECT_TRUE(packet.Parse(rtc::CopyOnWriteBuffer(kPaddingHeader)));
+ EXPECT_TRUE(packet.Parse(CopyOnWriteBuffer(kPaddingHeader)));
EXPECT_EQ(packet.PayloadType(), 0x62u);
EXPECT_EQ(packet.SequenceNumber(), 0x3579u);
EXPECT_EQ(packet.Timestamp(), 0x65431278u);
@@ -570,7 +569,7 @@
// clang-format on
RtpPacket packet;
- EXPECT_TRUE(packet.Parse(rtc::CopyOnWriteBuffer(kPaddingHeader)));
+ EXPECT_TRUE(packet.Parse(CopyOnWriteBuffer(kPaddingHeader)));
EXPECT_TRUE(packet.has_padding());
EXPECT_EQ(packet.padding_size(), 0u);
@@ -590,7 +589,7 @@
RtpHeaderExtensionMap extensions;
extensions.Register<TransmissionOffset>(1);
RtpPacket packet(&extensions);
- EXPECT_TRUE(packet.Parse(rtc::CopyOnWriteBuffer(kPaddingHeader)));
+ EXPECT_TRUE(packet.Parse(CopyOnWriteBuffer(kPaddingHeader)));
EXPECT_TRUE(packet.has_padding());
EXPECT_TRUE(packet.HasExtension<TransmissionOffset>());
EXPECT_EQ(packet.padding_size(), 0u);
@@ -606,7 +605,7 @@
// clang-format on
RtpPacket packet;
- EXPECT_TRUE(packet.Parse(rtc::CopyOnWriteBuffer(kPaddingHeader)));
+ EXPECT_TRUE(packet.Parse(CopyOnWriteBuffer(kPaddingHeader)));
EXPECT_TRUE(packet.has_padding());
EXPECT_EQ(packet.padding_size(), 3u);
}
@@ -892,11 +891,11 @@
static constexpr absl::string_view Uri() { return "uri"; }
static size_t ValueSize(const UncopyableValue& /* value */) { return 1; }
- static bool Write(rtc::ArrayView<uint8_t> /* data */,
+ static bool Write(ArrayView<uint8_t> /* data */,
const UncopyableValue& /* value */) {
return true;
}
- static bool Parse(rtc::ArrayView<const uint8_t> /* data */,
+ static bool Parse(ArrayView<const uint8_t> /* data */,
UncopyableValue* /* value */) {
return true;
}
@@ -929,14 +928,12 @@
static size_t ValueSize(uint8_t /* value1 */, uint8_t /* value2 */) {
return 2;
}
- static bool Write(rtc::ArrayView<uint8_t> data,
- uint8_t value1,
- uint8_t value2) {
+ static bool Write(ArrayView<uint8_t> data, uint8_t value1, uint8_t value2) {
data[0] = value1;
data[1] = value2;
return true;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
uint8_t& value1,
uint8_t& value2) {
value1 = data[0];
diff --git a/modules/rtp_rtcp/source/rtp_packetizer_av1.cc b/modules/rtp_rtcp/source/rtp_packetizer_av1.cc
index 01a7f8c..e5293a9 100644
--- a/modules/rtp_rtcp/source/rtp_packetizer_av1.cc
+++ b/modules/rtp_rtcp/source/rtp_packetizer_av1.cc
@@ -71,7 +71,7 @@
} // namespace
-RtpPacketizerAv1::RtpPacketizerAv1(rtc::ArrayView<const uint8_t> payload,
+RtpPacketizerAv1::RtpPacketizerAv1(ArrayView<const uint8_t> payload,
RtpPacketizer::PayloadSizeLimits limits,
VideoFrameType frame_type,
bool is_last_frame_in_picture)
@@ -81,7 +81,7 @@
is_last_frame_in_picture_(is_last_frame_in_picture) {}
std::vector<RtpPacketizerAv1::Obu> RtpPacketizerAv1::ParseObus(
- rtc::ArrayView<const uint8_t> payload) {
+ ArrayView<const uint8_t> payload) {
std::vector<Obu> result;
ByteBufferReader payload_reader(payload);
while (payload_reader.Length() > 0) {
@@ -99,9 +99,9 @@
++obu.size;
}
if (!ObuHasSize(obu.header)) {
- obu.payload = rtc::MakeArrayView(
- reinterpret_cast<const uint8_t*>(payload_reader.Data()),
- payload_reader.Length());
+ obu.payload =
+ MakeArrayView(reinterpret_cast<const uint8_t*>(payload_reader.Data()),
+ payload_reader.Length());
payload_reader.Consume(payload_reader.Length());
} else {
uint64_t size = 0;
@@ -112,7 +112,7 @@
<< payload_reader.Length();
return {};
}
- obu.payload = rtc::MakeArrayView(
+ obu.payload = MakeArrayView(
reinterpret_cast<const uint8_t*>(payload_reader.Data()), size);
payload_reader.Consume(size);
}
@@ -148,7 +148,7 @@
}
std::vector<RtpPacketizerAv1::Packet> RtpPacketizerAv1::PacketizeInternal(
- rtc::ArrayView<const Obu> obus,
+ ArrayView<const Obu> obus,
PayloadSizeLimits limits) {
std::vector<Packet> packets;
if (obus.empty()) {
@@ -301,7 +301,7 @@
}
std::vector<RtpPacketizerAv1::Packet> RtpPacketizerAv1::Packetize(
- rtc::ArrayView<const Obu> obus,
+ ArrayView<const Obu> obus,
PayloadSizeLimits limits) {
std::vector<Packet> packets = PacketizeInternal(obus, limits);
if (packets.size() <= 1) {
diff --git a/modules/rtp_rtcp/source/rtp_packetizer_av1.h b/modules/rtp_rtcp/source/rtp_packetizer_av1.h
index a96bc59..b64418a 100644
--- a/modules/rtp_rtcp/source/rtp_packetizer_av1.h
+++ b/modules/rtp_rtcp/source/rtp_packetizer_av1.h
@@ -24,7 +24,7 @@
class RtpPacketizerAv1 : public RtpPacketizer {
public:
- RtpPacketizerAv1(rtc::ArrayView<const uint8_t> payload,
+ RtpPacketizerAv1(ArrayView<const uint8_t> payload,
PayloadSizeLimits limits,
VideoFrameType frame_type,
bool is_last_frame_in_picture);
@@ -37,7 +37,7 @@
struct Obu {
uint8_t header;
uint8_t extension_header; // undefined if (header & kXbit) == 0
- rtc::ArrayView<const uint8_t> payload;
+ ArrayView<const uint8_t> payload;
int size; // size of the header and payload combined.
};
struct Packet {
@@ -53,14 +53,14 @@
};
// Parses the payload into serie of OBUs.
- static std::vector<Obu> ParseObus(rtc::ArrayView<const uint8_t> payload);
+ static std::vector<Obu> ParseObus(ArrayView<const uint8_t> payload);
// Returns the number of additional bytes needed to store the previous OBU
// element if an additonal OBU element is added to the packet.
static int AdditionalBytesForPreviousObuElement(const Packet& packet);
- static std::vector<Packet> PacketizeInternal(rtc::ArrayView<const Obu> obus,
+ static std::vector<Packet> PacketizeInternal(ArrayView<const Obu> obus,
PayloadSizeLimits limits);
// Packetize and try to distribute the payload evenly across packets.
- static std::vector<Packet> Packetize(rtc::ArrayView<const Obu> obus,
+ static std::vector<Packet> Packetize(ArrayView<const Obu> obus,
PayloadSizeLimits limits);
uint8_t AggregationHeader() const;
diff --git a/modules/rtp_rtcp/source/rtp_packetizer_av1_unittest.cc b/modules/rtp_rtcp/source/rtp_packetizer_av1_unittest.cc
index 1046901..bb46fcd 100644
--- a/modules/rtp_rtcp/source/rtp_packetizer_av1_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_packetizer_av1_unittest.cc
@@ -41,8 +41,8 @@
// Wrapper around rtp_packet to make it look like container of payload bytes.
struct RtpPayload {
- using value_type = rtc::ArrayView<const uint8_t>::value_type;
- using const_iterator = rtc::ArrayView<const uint8_t>::const_iterator;
+ using value_type = ArrayView<const uint8_t>::value_type;
+ using const_iterator = ArrayView<const uint8_t>::const_iterator;
RtpPayload() : rtp_packet(/*extensions=*/nullptr) {}
RtpPayload& operator=(RtpPayload&&) = default;
@@ -65,7 +65,7 @@
using value_type = uint8_t;
using const_iterator = const uint8_t*;
- explicit Av1Frame(rtc::scoped_refptr<EncodedImageBuffer> frame)
+ explicit Av1Frame(scoped_refptr<EncodedImageBuffer> frame)
: frame_(std::move(frame)) {}
const_iterator begin() const { return frame_ ? frame_->data() : nullptr; }
@@ -74,11 +74,11 @@
}
private:
- rtc::scoped_refptr<EncodedImageBuffer> frame_;
+ scoped_refptr<EncodedImageBuffer> frame_;
};
std::vector<RtpPayload> Packetize(
- rtc::ArrayView<const uint8_t> payload,
+ ArrayView<const uint8_t> payload,
RtpPacketizer::PayloadSizeLimits limits,
VideoFrameType frame_type = VideoFrameType::kVideoFrameDelta,
bool is_last_frame_in_picture = true) {
@@ -93,8 +93,8 @@
return result;
}
-Av1Frame ReassembleFrame(rtc::ArrayView<const RtpPayload> rtp_payloads) {
- std::vector<rtc::ArrayView<const uint8_t>> payloads(rtp_payloads.size());
+Av1Frame ReassembleFrame(ArrayView<const RtpPayload> rtp_payloads) {
+ std::vector<ArrayView<const uint8_t>> payloads(rtp_payloads.size());
for (size_t i = 0; i < rtp_payloads.size(); ++i) {
payloads[i] = rtp_payloads[i];
}
diff --git a/modules/rtp_rtcp/source/rtp_packetizer_h265.cc b/modules/rtp_rtcp/source/rtp_packetizer_h265.cc
index 79f2bf4..0ae271c 100644
--- a/modules/rtp_rtcp/source/rtp_packetizer_h265.cc
+++ b/modules/rtp_rtcp/source/rtp_packetizer_h265.cc
@@ -26,7 +26,7 @@
namespace webrtc {
-RtpPacketizerH265::RtpPacketizerH265(rtc::ArrayView<const uint8_t> payload,
+RtpPacketizerH265::RtpPacketizerH265(ArrayView<const uint8_t> payload,
PayloadSizeLimits limits)
: limits_(limits), num_packets_left_(0) {
for (const auto& nalu : H264::FindNaluIndices(payload)) {
@@ -83,7 +83,7 @@
bool RtpPacketizerH265::PacketizeFu(size_t fragment_index) {
// Fragment payload into packets (FU).
// Strip out the original header and leave room for the FU header.
- rtc::ArrayView<const uint8_t> fragment = input_fragments_[fragment_index];
+ ArrayView<const uint8_t> fragment = input_fragments_[fragment_index];
PayloadSizeLimits limits = limits_;
// Refer to section 4.4.3 in RFC7798, each FU fragment will have a 2-bytes
// payload header and a one-byte FU header. DONL is not supported so ignore
@@ -147,7 +147,7 @@
}
int aggregated_fragments = 0;
size_t fragment_headers_length = 0;
- rtc::ArrayView<const uint8_t> fragment = input_fragments_[fragment_index];
+ ArrayView<const uint8_t> fragment = input_fragments_[fragment_index];
RTC_CHECK_GE(payload_size_left, fragment.size());
++num_packets_left_;
@@ -252,7 +252,7 @@
uint8_t temporal_id_min = kH265MaxTemporalId;
while (packet->aggregated) {
// Add NAL unit length field.
- rtc::ArrayView<const uint8_t> fragment = packet->source_fragment;
+ ArrayView<const uint8_t> fragment = packet->source_fragment;
uint8_t layer_id = ((fragment[0] & kH265LayerIDHMask) << 5) |
((fragment[1] & kH265LayerIDLMask) >> 3);
layer_id_min = std::min(layer_id_min, layer_id);
@@ -315,7 +315,7 @@
// Now update payload_hdr_h with FU type.
payload_hdr_h = (payload_hdr_h & kH265TypeMaskN) |
(H265::NaluType::kFu << 1) | layer_id_h;
- rtc::ArrayView<const uint8_t> fragment = packet->source_fragment;
+ ArrayView<const uint8_t> fragment = packet->source_fragment;
uint8_t* buffer = rtp_packet->AllocatePayload(
kH265FuHeaderSizeBytes + kH265PayloadHeaderSizeBytes + fragment.size());
RTC_CHECK(buffer);
diff --git a/modules/rtp_rtcp/source/rtp_packetizer_h265.h b/modules/rtp_rtcp/source/rtp_packetizer_h265.h
index 7b2b4f4..9c57fd8 100644
--- a/modules/rtp_rtcp/source/rtp_packetizer_h265.h
+++ b/modules/rtp_rtcp/source/rtp_packetizer_h265.h
@@ -27,8 +27,7 @@
// Initialize with payload from encoder.
// The payload_data must be exactly one encoded H.265 frame.
// For H265 we only support tx-mode SRST.
- RtpPacketizerH265(rtc::ArrayView<const uint8_t> payload,
- PayloadSizeLimits limits);
+ RtpPacketizerH265(ArrayView<const uint8_t> payload, PayloadSizeLimits limits);
RtpPacketizerH265(const RtpPacketizerH265&) = delete;
RtpPacketizerH265& operator=(const RtpPacketizerH265&) = delete;
@@ -44,13 +43,13 @@
private:
struct PacketUnit {
- rtc::ArrayView<const uint8_t> source_fragment;
+ ArrayView<const uint8_t> source_fragment;
bool first_fragment = false;
bool last_fragment = false;
bool aggregated = false;
uint16_t header = 0;
};
- std::deque<rtc::ArrayView<const uint8_t>> input_fragments_;
+ std::deque<ArrayView<const uint8_t>> input_fragments_;
std::queue<PacketUnit> packets_;
bool GeneratePackets();
diff --git a/modules/rtp_rtcp/source/rtp_packetizer_h265_unittest.cc b/modules/rtp_rtcp/source/rtp_packetizer_h265_unittest.cc
index a93e38d..8602e17 100644
--- a/modules/rtp_rtcp/source/rtp_packetizer_h265_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_packetizer_h265_unittest.cc
@@ -53,9 +53,9 @@
};
// Creates Buffer that looks like nal unit of given header and size.
-rtc::Buffer GenerateNalUnit(NalUnitHeader header, size_t size) {
+Buffer GenerateNalUnit(NalUnitHeader header, size_t size) {
RTC_CHECK_GT(size, 0);
- rtc::Buffer buffer(size);
+ Buffer buffer(size);
buffer[0] = (header.nal_unit_type << 1) | (header.nuh_layer_id >> 5);
buffer[1] = (header.nuh_layer_id << 3) | header.nuh_temporal_id_plus1;
for (size_t i = 2; i < size; ++i) {
@@ -68,10 +68,10 @@
}
// Create frame consisting of nalus of given size.
-rtc::Buffer CreateFrame(std::initializer_list<size_t> nalu_sizes) {
+Buffer CreateFrame(std::initializer_list<size_t> nalu_sizes) {
static constexpr int kStartCodeSize = 3;
- rtc::Buffer frame(absl::c_accumulate(nalu_sizes, size_t{0}) +
- kStartCodeSize * nalu_sizes.size());
+ Buffer frame(absl::c_accumulate(nalu_sizes, size_t{0}) +
+ kStartCodeSize * nalu_sizes.size());
size_t offset = 0;
for (size_t nalu_size : nalu_sizes) {
EXPECT_GE(nalu_size, 1u);
@@ -91,15 +91,15 @@
}
// Create frame consisting of given nalus.
-rtc::Buffer CreateFrame(rtc::ArrayView<const rtc::Buffer> nalus) {
+Buffer CreateFrame(ArrayView<const Buffer> nalus) {
static constexpr int kStartCodeSize = 3;
int frame_size = 0;
- for (const rtc::Buffer& nalu : nalus) {
+ for (const Buffer& nalu : nalus) {
frame_size += (kStartCodeSize + nalu.size());
}
- rtc::Buffer frame(frame_size);
+ Buffer frame(frame_size);
size_t offset = 0;
- for (const rtc::Buffer& nalu : nalus) {
+ for (const Buffer& nalu : nalus) {
// Insert nalu start code
frame[offset] = 0;
frame[offset + 1] = 0;
@@ -137,16 +137,15 @@
TEST(RtpPacketizerH265Test, SingleNaluTwoPackets) {
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = kMaxPayloadSizeBytes;
- rtc::Buffer nalus[] = {
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- kMaxPayloadSizeBytes),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- 100)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ kMaxPayloadSizeBytes),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ 100)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH265 packetizer(frame, limits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -161,20 +160,19 @@
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 200;
limits.first_packet_reduction_len = 5;
- rtc::Buffer nalus[] = {
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/195),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/200),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/200)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/195),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/200),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/200)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH265 packetizer(frame, limits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -190,20 +188,19 @@
RtpPacketizer::PayloadSizeLimits limits;
limits.max_payload_len = 200;
limits.last_packet_reduction_len = 5;
- rtc::Buffer nalus[] = {
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/200),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/200),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/195)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/200),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/200),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/195)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH265 packetizer(frame, limits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -220,7 +217,7 @@
limits.max_payload_len = 200;
limits.first_packet_reduction_len = 20;
limits.last_packet_reduction_len = 30;
- rtc::Buffer frame = CreateFrame({150});
+ Buffer frame = CreateFrame({150});
RtpPacketizerH265 packetizer(frame, limits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -230,20 +227,19 @@
// Aggregation tests.
TEST(RtpPacketizerH265Test, ApRespectsNoPacketReduction) {
- rtc::Buffer nalus[] = {
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/3),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/3),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/0x123)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/3),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/3),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/0x123)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH265 packetizer(frame, kNoLimits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -282,20 +278,19 @@
// So in the AP packet header, nuh_layer_id should be 0 which is the lowest
// nuh_layer_id value of 3 NALUs and nuh_temporal_id_plus1 should be 1 which
// is the lowest nuh_temporal_id_plus1 value of 3 NALUs
- rtc::Buffer nalus[] = {
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 2,
- .nuh_temporal_id_plus1 = 6},
- /*size=*/3),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 0,
- .nuh_temporal_id_plus1 = 1},
- /*size=*/3),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/0x123)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 2,
+ .nuh_temporal_id_plus1 = 6},
+ /*size=*/3),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 0,
+ .nuh_temporal_id_plus1 = 1},
+ /*size=*/3),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/0x123)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH265 packetizer(frame, kNoLimits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -336,20 +331,19 @@
limits.first_packet_reduction_len = 100;
const size_t kFirstFragmentSize =
limits.max_payload_len - limits.first_packet_reduction_len;
- rtc::Buffer nalus[] = {
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/kFirstFragmentSize),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/3),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/3)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/kFirstFragmentSize),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/3),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/3)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH265 packetizer(frame, limits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -374,20 +368,19 @@
limits.last_packet_reduction_len = 100;
const size_t kLastFragmentSize =
limits.max_payload_len - limits.last_packet_reduction_len;
- rtc::Buffer nalus[] = {
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/3),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/3),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/kLastFragmentSize)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/3),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/3),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/kLastFragmentSize)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH265 packetizer(frame, limits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -407,20 +400,19 @@
limits.max_payload_len = 1000;
const size_t kLastFragmentSize =
limits.max_payload_len - 3 * kH265LengthFieldSizeBytes - 4;
- rtc::Buffer nalus[] = {
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/3),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/3),
- GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
- .nuh_layer_id = 32,
- .nuh_temporal_id_plus1 = 2},
- /*size=*/kLastFragmentSize)};
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer nalus[] = {GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/3),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/3),
+ GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
+ .nuh_layer_id = 32,
+ .nuh_temporal_id_plus1 = 2},
+ /*size=*/kLastFragmentSize)};
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH265 packetizer(frame, limits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -442,7 +434,7 @@
limits.last_packet_reduction_len = 20;
limits.single_packet_reduction_len = 20;
// Actual sizes, which triggered this bug.
- rtc::Buffer frame = CreateFrame({20, 8, 18, 1161});
+ Buffer frame = CreateFrame({20, 8, 18, 1161});
RtpPacketizerH265 packetizer(frame, limits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -458,12 +450,12 @@
// Returns sizes of the payloads excluding FU headers.
std::vector<int> TestFu(size_t frame_payload_size,
const RtpPacketizer::PayloadSizeLimits& limits) {
- rtc::Buffer nalu[] = {
+ Buffer nalu[] = {
GenerateNalUnit({.nal_unit_type = H265::NaluType::kIdrNLp,
.nuh_layer_id = 32,
.nuh_temporal_id_plus1 = 2},
kH265NalHeaderSizeBytes + frame_payload_size)};
- rtc::Buffer frame = CreateFrame(nalu);
+ Buffer frame = CreateFrame(nalu);
RtpPacketizerH265 packetizer(frame, limits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
@@ -567,7 +559,7 @@
RtpPacketizer::PayloadSizeLimits limits;
const MixedApFuTestParams params = GetParam();
limits.max_payload_len = 100;
- std::vector<rtc::Buffer> nalus;
+ std::vector<Buffer> nalus;
nalus.reserve(params.nalus.size());
// Generate nalus according to size specified in paramters
@@ -577,7 +569,7 @@
.nuh_temporal_id_plus1 = 2},
params.nalus[index]));
}
- rtc::Buffer frame = CreateFrame(nalus);
+ Buffer frame = CreateFrame(nalus);
RtpPacketizerH265 packetizer(frame, limits);
std::vector<RtpPacketToSend> packets = FetchAllPackets(&packetizer);
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
index b846675..5bd844f 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.cc
@@ -210,7 +210,7 @@
}
void ModuleRtpRtcpImpl::IncomingRtcpPacket(
- rtc::ArrayView<const uint8_t> rtcp_packet) {
+ ArrayView<const uint8_t> rtcp_packet) {
rtcp_receiver_.IncomingPacket(rtcp_packet);
}
@@ -403,13 +403,13 @@
}
void ModuleRtpRtcpImpl::OnAbortedRetransmissions(
- rtc::ArrayView<const uint16_t> /* sequence_numbers */) {
+ ArrayView<const uint16_t> /* sequence_numbers */) {
RTC_DCHECK_NOTREACHED()
<< "Stream flushing not supported with legacy rtp modules.";
}
void ModuleRtpRtcpImpl::OnPacketsAcknowledged(
- rtc::ArrayView<const uint16_t> sequence_numbers) {
+ ArrayView<const uint16_t> sequence_numbers) {
RTC_DCHECK(rtp_sender_);
rtp_sender_->packet_history.CullAcknowledgedPackets(sequence_numbers);
}
@@ -435,7 +435,7 @@
std::vector<RtpSequenceNumberMap::Info>
ModuleRtpRtcpImpl::GetSentRtpPacketInfos(
- rtc::ArrayView<const uint16_t> sequence_numbers) const {
+ ArrayView<const uint16_t> sequence_numbers) const {
RTC_DCHECK(rtp_sender_);
return rtp_sender_->packet_sender.GetSentRtpPacketInfos(sequence_numbers);
}
@@ -688,7 +688,7 @@
}
void ModuleRtpRtcpImpl::OnReceivedRtcpReportBlocks(
- rtc::ArrayView<const ReportBlockData> report_blocks) {
+ ArrayView<const ReportBlockData> report_blocks) {
if (rtp_sender_) {
uint32_t ssrc = SSRC();
std::optional<uint32_t> rtx_ssrc;
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl.h b/modules/rtp_rtcp/source/rtp_rtcp_impl.h
index c27b9a5..32aba69 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl.h
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl.h
@@ -67,7 +67,7 @@
// Receiver part.
// Called when we receive an RTCP packet.
- void IncomingRtcpPacket(rtc::ArrayView<const uint8_t> packet) override;
+ void IncomingRtcpPacket(ArrayView<const uint8_t> packet) override;
void SetRemoteSSRC(uint32_t ssrc) override;
void SetLocalSsrc(uint32_t ssrc) override;
@@ -164,16 +164,16 @@
std::vector<std::unique_ptr<RtpPacketToSend>> FetchFecPackets() override;
void OnAbortedRetransmissions(
- rtc::ArrayView<const uint16_t> sequence_numbers) override;
+ ArrayView<const uint16_t> sequence_numbers) override;
void OnPacketsAcknowledged(
- rtc::ArrayView<const uint16_t> sequence_numbers) override;
+ ArrayView<const uint16_t> sequence_numbers) override;
std::vector<std::unique_ptr<RtpPacketToSend>> GeneratePadding(
size_t target_size_bytes) override;
std::vector<RtpSequenceNumberMap::Info> GetSentRtpPacketInfos(
- rtc::ArrayView<const uint16_t> sequence_numbers) const override;
+ ArrayView<const uint16_t> sequence_numbers) const override;
size_t ExpectedPerPacketOverhead() const override;
@@ -249,7 +249,7 @@
void OnReceivedNack(
const std::vector<uint16_t>& nack_sequence_numbers) override;
void OnReceivedRtcpReportBlocks(
- rtc::ArrayView<const ReportBlockData> report_blocks) override;
+ ArrayView<const ReportBlockData> report_blocks) override;
void OnRequestSendReport() override;
void SetVideoBitrateAllocation(
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
index cea0472..f71ca3c1 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.cc
@@ -159,7 +159,7 @@
}
void ModuleRtpRtcpImpl2::IncomingRtcpPacket(
- rtc::ArrayView<const uint8_t> rtcp_packet) {
+ ArrayView<const uint8_t> rtcp_packet) {
RTC_DCHECK_RUN_ON(&rtcp_thread_checker_);
rtcp_receiver_.IncomingPacket(rtcp_packet);
}
@@ -409,14 +409,14 @@
}
void ModuleRtpRtcpImpl2::OnAbortedRetransmissions(
- rtc::ArrayView<const uint16_t> sequence_numbers) {
+ ArrayView<const uint16_t> sequence_numbers) {
RTC_DCHECK(rtp_sender_);
RTC_DCHECK_RUN_ON(&rtp_sender_->sequencing_checker);
rtp_sender_->packet_sender.OnAbortedRetransmissions(sequence_numbers);
}
void ModuleRtpRtcpImpl2::OnPacketsAcknowledged(
- rtc::ArrayView<const uint16_t> sequence_numbers) {
+ ArrayView<const uint16_t> sequence_numbers) {
RTC_DCHECK(rtp_sender_);
rtp_sender_->packet_history.CullAcknowledgedPackets(sequence_numbers);
}
@@ -443,7 +443,7 @@
std::vector<RtpSequenceNumberMap::Info>
ModuleRtpRtcpImpl2::GetSentRtpPacketInfos(
- rtc::ArrayView<const uint16_t> sequence_numbers) const {
+ ArrayView<const uint16_t> sequence_numbers) const {
RTC_DCHECK(rtp_sender_);
return rtp_sender_->packet_sender.GetSentRtpPacketInfos(sequence_numbers);
}
@@ -706,7 +706,7 @@
}
void ModuleRtpRtcpImpl2::OnReceivedRtcpReportBlocks(
- rtc::ArrayView<const ReportBlockData> report_blocks) {
+ ArrayView<const ReportBlockData> report_blocks) {
if (rtp_sender_) {
uint32_t ssrc = SSRC();
std::optional<uint32_t> rtx_ssrc;
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h
index 57139e2..d603c45 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl2.h
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2.h
@@ -63,8 +63,7 @@
// Receiver part.
// Called when we receive an RTCP packet.
- void IncomingRtcpPacket(
- rtc::ArrayView<const uint8_t> incoming_packet) override;
+ void IncomingRtcpPacket(ArrayView<const uint8_t> incoming_packet) override;
void SetRemoteSSRC(uint32_t ssrc) override;
@@ -158,16 +157,16 @@
std::vector<std::unique_ptr<RtpPacketToSend>> FetchFecPackets() override;
void OnAbortedRetransmissions(
- rtc::ArrayView<const uint16_t> sequence_numbers) override;
+ ArrayView<const uint16_t> sequence_numbers) override;
void OnPacketsAcknowledged(
- rtc::ArrayView<const uint16_t> sequence_numbers) override;
+ ArrayView<const uint16_t> sequence_numbers) override;
std::vector<std::unique_ptr<RtpPacketToSend>> GeneratePadding(
size_t target_size_bytes) override;
std::vector<RtpSequenceNumberMap::Info> GetSentRtpPacketInfos(
- rtc::ArrayView<const uint16_t> sequence_numbers) const override;
+ ArrayView<const uint16_t> sequence_numbers) const override;
size_t ExpectedPerPacketOverhead() const override;
@@ -242,7 +241,7 @@
void OnReceivedNack(
const std::vector<uint16_t>& nack_sequence_numbers) override;
void OnReceivedRtcpReportBlocks(
- rtc::ArrayView<const ReportBlockData> report_blocks) override;
+ ArrayView<const ReportBlockData> report_blocks) override;
void OnRequestSendReport() override;
void SetVideoBitrateAllocation(
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc
index d3dba14..40bfcd3 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl2_unittest.cc
@@ -125,13 +125,13 @@
void SetRtpRtcpModule(ModuleRtpRtcpImpl2* receiver) { receiver_ = receiver; }
void SimulateNetworkDelay(TimeDelta delay) { delay_ = delay; }
- bool SendRtp(rtc::ArrayView<const uint8_t> data,
+ bool SendRtp(ArrayView<const uint8_t> data,
const PacketOptions& /* options */) override {
EXPECT_TRUE(last_packet_.Parse(data));
++rtp_packets_sent_;
return true;
}
- bool SendRtcp(rtc::ArrayView<const uint8_t> data) override {
+ bool SendRtcp(ArrayView<const uint8_t> data) override {
test::RtcpPacketParser parser;
parser.Parse(data);
last_nack_list_ = parser.nack()->packet_ids();
@@ -407,7 +407,7 @@
nack.SetSenderSsrc(sender ? kReceiverSsrc : kSenderSsrc);
nack.SetMediaSsrc(sender ? kSenderSsrc : kReceiverSsrc);
nack.SetPacketIds(list, kListLength);
- rtc::Buffer packet = nack.Build();
+ Buffer packet = nack.Build();
module->impl_->IncomingRtcpPacket(packet);
}
};
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
index 19eaeca7..0fae24d 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_rtcp_impl_unittest.cc
@@ -95,7 +95,7 @@
clock_ = clock;
delay_ms_ = delay_ms;
}
- bool SendRtp(rtc::ArrayView<const uint8_t> data,
+ bool SendRtp(ArrayView<const uint8_t> data,
const PacketOptions& /* options */) override {
RtpPacket packet;
EXPECT_TRUE(packet.Parse(data));
@@ -103,7 +103,7 @@
last_rtp_sequence_number_ = packet.SequenceNumber();
return true;
}
- bool SendRtcp(rtc::ArrayView<const uint8_t> data) override {
+ bool SendRtcp(ArrayView<const uint8_t> data) override {
test::RtcpPacketParser parser;
parser.Parse(data);
last_nack_list_ = parser.nack()->packet_ids();
diff --git a/modules/rtp_rtcp/source/rtp_rtcp_interface.h b/modules/rtp_rtcp/source/rtp_rtcp_interface.h
index 0d4d2a5..ee577ea 100644
--- a/modules/rtp_rtcp/source/rtp_rtcp_interface.h
+++ b/modules/rtp_rtcp/source/rtp_rtcp_interface.h
@@ -106,7 +106,7 @@
// Update network2 instead of pacer_exit field of video timing extension.
bool populate_network2_timestamp = false;
- rtc::scoped_refptr<FrameTransformerInterface> frame_transformer;
+ scoped_refptr<FrameTransformerInterface> frame_transformer;
// E2EE Custom Video Frame Encryption
FrameEncryptorInterface* frame_encryptor = nullptr;
@@ -185,8 +185,7 @@
// Receiver functions
// **************************************************************************
- virtual void IncomingRtcpPacket(
- rtc::ArrayView<const uint8_t> incoming_packet) = 0;
+ virtual void IncomingRtcpPacket(ArrayView<const uint8_t> incoming_packet) = 0;
virtual void SetRemoteSSRC(uint32_t ssrc) = 0;
@@ -346,16 +345,16 @@
virtual std::vector<std::unique_ptr<RtpPacketToSend>> FetchFecPackets() = 0;
virtual void OnAbortedRetransmissions(
- rtc::ArrayView<const uint16_t> sequence_numbers) = 0;
+ ArrayView<const uint16_t> sequence_numbers) = 0;
virtual void OnPacketsAcknowledged(
- rtc::ArrayView<const uint16_t> sequence_numbers) = 0;
+ ArrayView<const uint16_t> sequence_numbers) = 0;
virtual std::vector<std::unique_ptr<RtpPacketToSend>> GeneratePadding(
size_t target_size_bytes) = 0;
virtual std::vector<RtpSequenceNumberMap::Info> GetSentRtpPacketInfos(
- rtc::ArrayView<const uint16_t> sequence_numbers) const = 0;
+ ArrayView<const uint16_t> sequence_numbers) const = 0;
// Returns an expected per packet overhead representing the main RTP header,
// any CSRCs, and the registered header extensions that are expected on all
diff --git a/modules/rtp_rtcp/source/rtp_sender.cc b/modules/rtp_rtcp/source/rtp_sender.cc
index 61dd8153..888e601 100644
--- a/modules/rtp_rtcp/source/rtp_sender.cc
+++ b/modules/rtp_rtcp/source/rtp_sender.cc
@@ -199,19 +199,17 @@
// to understand performance attributes and possibly remove locks.
}
-rtc::ArrayView<const RtpExtensionSize> RTPSender::FecExtensionSizes() {
- return rtc::MakeArrayView(kFecOrPaddingExtensionSizes,
- arraysize(kFecOrPaddingExtensionSizes));
+ArrayView<const RtpExtensionSize> RTPSender::FecExtensionSizes() {
+ return MakeArrayView(kFecOrPaddingExtensionSizes,
+ arraysize(kFecOrPaddingExtensionSizes));
}
-rtc::ArrayView<const RtpExtensionSize> RTPSender::VideoExtensionSizes() {
- return rtc::MakeArrayView(kVideoExtensionSizes,
- arraysize(kVideoExtensionSizes));
+ArrayView<const RtpExtensionSize> RTPSender::VideoExtensionSizes() {
+ return MakeArrayView(kVideoExtensionSizes, arraysize(kVideoExtensionSizes));
}
-rtc::ArrayView<const RtpExtensionSize> RTPSender::AudioExtensionSizes() {
- return rtc::MakeArrayView(kAudioExtensionSizes,
- arraysize(kAudioExtensionSizes));
+ArrayView<const RtpExtensionSize> RTPSender::AudioExtensionSizes() {
+ return MakeArrayView(kAudioExtensionSizes, arraysize(kAudioExtensionSizes));
}
void RTPSender::SetExtmapAllowMixed(bool extmap_allow_mixed) {
@@ -517,7 +515,7 @@
}
std::unique_ptr<RtpPacketToSend> RTPSender::AllocatePacket(
- rtc::ArrayView<const uint32_t> csrcs) {
+ ArrayView<const uint32_t> csrcs) {
MutexLock lock(&send_mutex_);
RTC_DCHECK_LE(csrcs.size(), kRtpCsrcSize);
if (csrcs.size() > max_num_csrcs_) {
@@ -653,9 +651,9 @@
continue;
}
- rtc::ArrayView<const uint8_t> source = packet.FindExtension(extension);
+ ArrayView<const uint8_t> source = packet.FindExtension(extension);
- rtc::ArrayView<uint8_t> destination =
+ ArrayView<uint8_t> destination =
rtx_packet->AllocateExtension(extension, source.size());
// Could happen if any:
diff --git a/modules/rtp_rtcp/source/rtp_sender.h b/modules/rtp_rtcp/source/rtp_sender.h
index 0a29968..80c1c84 100644
--- a/modules/rtp_rtcp/source/rtp_sender.h
+++ b/modules/rtp_rtcp/source/rtp_sender.h
@@ -114,22 +114,21 @@
RTC_LOCKS_EXCLUDED(send_mutex_);
// Size info for header extensions used by FEC packets.
- static rtc::ArrayView<const RtpExtensionSize> FecExtensionSizes()
+ static ArrayView<const RtpExtensionSize> FecExtensionSizes()
RTC_LOCKS_EXCLUDED(send_mutex_);
// Size info for header extensions used by video packets.
- static rtc::ArrayView<const RtpExtensionSize> VideoExtensionSizes()
+ static ArrayView<const RtpExtensionSize> VideoExtensionSizes()
RTC_LOCKS_EXCLUDED(send_mutex_);
// Size info for header extensions used by audio packets.
- static rtc::ArrayView<const RtpExtensionSize> AudioExtensionSizes()
+ static ArrayView<const RtpExtensionSize> AudioExtensionSizes()
RTC_LOCKS_EXCLUDED(send_mutex_);
// Create empty packet, fills ssrc, csrcs and reserve place for header
// extensions RtpSender updates before sending.
std::unique_ptr<RtpPacketToSend> AllocatePacket(
- rtc::ArrayView<const uint32_t> csrcs = {})
- RTC_LOCKS_EXCLUDED(send_mutex_);
+ ArrayView<const uint32_t> csrcs = {}) RTC_LOCKS_EXCLUDED(send_mutex_);
// Maximum header overhead per fec/padding packet.
size_t FecOrPaddingPacketMaxRtpHeaderLength() const
diff --git a/modules/rtp_rtcp/source/rtp_sender_audio.h b/modules/rtp_rtcp/source/rtp_sender_audio.h
index 5f0922d..6a87d35 100644
--- a/modules/rtp_rtcp/source/rtp_sender_audio.h
+++ b/modules/rtp_rtcp/source/rtp_sender_audio.h
@@ -48,7 +48,7 @@
struct RtpAudioFrame {
AudioFrameType type = AudioFrameType::kAudioFrameSpeech;
- rtc::ArrayView<const uint8_t> payload;
+ ArrayView<const uint8_t> payload;
// Payload id to write to the payload type field of the rtp packet.
int payload_id = -1;
@@ -65,7 +65,7 @@
std::optional<int> audio_level_dbov;
// Contributing sources list.
- rtc::ArrayView<const uint32_t> csrcs;
+ ArrayView<const uint32_t> csrcs;
};
bool SendAudio(const RtpAudioFrame& frame);
diff --git a/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc
index 5050e8ad..6ce33ae 100644
--- a/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_audio_unittest.cc
@@ -53,15 +53,13 @@
kAbsoluteCaptureTimeExtensionId);
}
- bool SendRtp(rtc::ArrayView<const uint8_t> data,
+ bool SendRtp(ArrayView<const uint8_t> data,
const PacketOptions& /*options*/) override {
sent_packets_.push_back(RtpPacketReceived(&receivers_extensions_));
EXPECT_TRUE(sent_packets_.back().Parse(data));
return true;
}
- bool SendRtcp(rtc::ArrayView<const uint8_t> /* data */) override {
- return false;
- }
+ bool SendRtcp(ArrayView<const uint8_t> /* data */) override { return false; }
const RtpPacketReceived& last_sent_packet() { return sent_packets_.back(); }
int packets_sent() { return sent_packets_.size(); }
diff --git a/modules/rtp_rtcp/source/rtp_sender_egress.cc b/modules/rtp_rtcp/source/rtp_sender_egress.cc
index 640601f..57758ad 100644
--- a/modules/rtp_rtcp/source/rtp_sender_egress.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_egress.cc
@@ -200,7 +200,7 @@
if (packet->is_red()) {
RtpPacketToSend unpacked_packet(*packet);
- const rtc::CopyOnWriteBuffer buffer = packet->Buffer();
+ const CopyOnWriteBuffer buffer = packet->Buffer();
// Grab media payload type from RED header.
const size_t headers_size = packet->headers_size();
unpacked_packet.SetPayloadType(buffer[headers_size]);
@@ -379,7 +379,7 @@
}
std::vector<RtpSequenceNumberMap::Info> RtpSenderEgress::GetSentRtpPacketInfos(
- rtc::ArrayView<const uint16_t> sequence_numbers) const {
+ ArrayView<const uint16_t> sequence_numbers) const {
RTC_DCHECK_RUN_ON(worker_queue_);
RTC_DCHECK(!sequence_numbers.empty());
if (!need_rtp_packet_infos_) {
@@ -419,7 +419,7 @@
}
void RtpSenderEgress::OnAbortedRetransmissions(
- rtc::ArrayView<const uint16_t> sequence_numbers) {
+ ArrayView<const uint16_t> sequence_numbers) {
RTC_DCHECK_RUN_ON(worker_queue_);
// Mark aborted retransmissions as sent, rather than leaving them in
// a 'pending' state - otherwise they can not be requested again and
diff --git a/modules/rtp_rtcp/source/rtp_sender_egress.h b/modules/rtp_rtcp/source/rtp_sender_egress.h
index 7c4bb2a..6d3cdd3 100644
--- a/modules/rtp_rtcp/source/rtp_sender_egress.h
+++ b/modules/rtp_rtcp/source/rtp_sender_egress.h
@@ -93,15 +93,14 @@
// recalled, return a vector with all of them (in corresponding order).
// If any could not be recalled, return an empty vector.
std::vector<RtpSequenceNumberMap::Info> GetSentRtpPacketInfos(
- rtc::ArrayView<const uint16_t> sequence_numbers) const;
+ ArrayView<const uint16_t> sequence_numbers) const;
void SetFecProtectionParameters(const FecProtectionParams& delta_params,
const FecProtectionParams& key_params);
std::vector<std::unique_ptr<RtpPacketToSend>> FetchFecPackets();
// Clears pending status for these sequence numbers in the packet history.
- void OnAbortedRetransmissions(
- rtc::ArrayView<const uint16_t> sequence_numbers);
+ void OnAbortedRetransmissions(ArrayView<const uint16_t> sequence_numbers);
private:
struct Packet {
diff --git a/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc
index 5497308..833a93b 100644
--- a/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_egress_unittest.cc
@@ -92,7 +92,7 @@
};
struct TransmittedPacket {
- TransmittedPacket(rtc::ArrayView<const uint8_t> data,
+ TransmittedPacket(ArrayView<const uint8_t> data,
const PacketOptions& packet_options,
RtpHeaderExtensionMap* extensions)
: packet(extensions), options(packet_options) {
@@ -107,7 +107,7 @@
explicit TestTransport(RtpHeaderExtensionMap* extensions)
: total_data_sent_(DataSize::Zero()), extensions_(extensions) {}
MOCK_METHOD(void, SentRtp, (const PacketOptions& options), ());
- bool SendRtp(rtc::ArrayView<const uint8_t> packet,
+ bool SendRtp(ArrayView<const uint8_t> packet,
const PacketOptions& options) override {
total_data_sent_ += DataSize::Bytes(packet.size());
last_packet_.emplace(packet, options, extensions_);
@@ -115,9 +115,7 @@
return true;
}
- bool SendRtcp(rtc::ArrayView<const uint8_t>) override {
- RTC_CHECK_NOTREACHED();
- }
+ bool SendRtcp(ArrayView<const uint8_t>) override { RTC_CHECK_NOTREACHED(); }
std::optional<TransmittedPacket> last_packet() { return last_packet_; }
@@ -851,7 +849,7 @@
TEST_F(RtpSenderEgressTest, SendPacketUpdatesStats) {
const size_t kPayloadSize = 1000;
- const rtc::ArrayView<const RtpExtensionSize> kNoRtpHeaderExtensionSizes;
+ const ArrayView<const RtpExtensionSize> kNoRtpHeaderExtensionSizes;
FlexfecSender flexfec(env_, kFlexfectPayloadType, kFlexFecSsrc, kSsrc,
/*mid=*/"",
/*header_extensions=*/{}, kNoRtpHeaderExtensionSizes,
diff --git a/modules/rtp_rtcp/source/rtp_sender_video.cc b/modules/rtp_rtcp/source/rtp_sender_video.cc
index c3eeced..acb4c73 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video.cc
@@ -185,7 +185,7 @@
absolute_capture_time_sender_(config.clock),
frame_transformer_delegate_(
config.frame_transformer
- ? rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ ? make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
this,
config.frame_transformer,
rtp_sender_->SSRC(),
@@ -513,7 +513,7 @@
std::optional<VideoCodecType> codec_type,
uint32_t rtp_timestamp,
Timestamp capture_time,
- rtc::ArrayView<const uint8_t> payload,
+ ArrayView<const uint8_t> payload,
size_t encoder_output_size,
RTPVideoHeader video_header,
TimeDelta expected_retransmission_time,
@@ -666,7 +666,7 @@
MinimizeDescriptor(&video_header);
}
- rtc::Buffer encrypted_video_payload;
+ Buffer encrypted_video_payload;
if (frame_encryptor_ != nullptr) {
const size_t max_ciphertext_size =
frame_encryptor_->GetMaxCiphertextByteSize(webrtc::MediaType::VIDEO,
diff --git a/modules/rtp_rtcp/source/rtp_sender_video.h b/modules/rtp_rtcp/source/rtp_sender_video.h
index 4091ec7..86943db 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video.h
+++ b/modules/rtp_rtcp/source/rtp_sender_video.h
@@ -88,7 +88,7 @@
bool enable_retransmit_all_layers = false;
std::optional<int> red_payload_type;
const FieldTrialsView* field_trials = nullptr;
- rtc::scoped_refptr<FrameTransformerInterface> frame_transformer;
+ scoped_refptr<FrameTransformerInterface> frame_transformer;
TaskQueueFactory* task_queue_factory = nullptr;
};
@@ -105,7 +105,7 @@
std::optional<VideoCodecType> codec_type,
uint32_t rtp_timestamp,
Timestamp capture_time,
- rtc::ArrayView<const uint8_t> payload,
+ ArrayView<const uint8_t> payload,
size_t encoder_output_size,
RTPVideoHeader video_header,
TimeDelta expected_retransmission_time,
@@ -254,7 +254,7 @@
// targets bitmask should be attached to the dependency descriptor.
ActiveDecodeTargetsHelper active_decode_targets_tracker_;
- const rtc::scoped_refptr<RTPSenderVideoFrameTransformerDelegate>
+ const scoped_refptr<RTPSenderVideoFrameTransformerDelegate>
frame_transformer_delegate_;
};
diff --git a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc
index f823220..2d08bd6 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.cc
@@ -76,11 +76,9 @@
~TransformableVideoSenderFrame() override = default;
// Implements TransformableVideoFrameInterface.
- rtc::ArrayView<const uint8_t> GetData() const override {
- return *encoded_data_;
- }
+ ArrayView<const uint8_t> GetData() const override { return *encoded_data_; }
- void SetData(rtc::ArrayView<const uint8_t> data) override {
+ void SetData(ArrayView<const uint8_t> data) override {
encoded_data_ = EncodedImageBuffer::Create(data.data(), data.size());
}
@@ -144,7 +142,7 @@
}
private:
- rtc::scoped_refptr<EncodedImageBufferInterface> encoded_data_;
+ scoped_refptr<EncodedImageBufferInterface> encoded_data_;
const size_t pre_transform_payload_size_;
RTPVideoHeader header_;
const VideoFrameType frame_type_;
@@ -161,7 +159,7 @@
RTPSenderVideoFrameTransformerDelegate::RTPSenderVideoFrameTransformerDelegate(
RTPVideoFrameSenderInterface* sender,
- rtc::scoped_refptr<FrameTransformerInterface> frame_transformer,
+ scoped_refptr<FrameTransformerInterface> frame_transformer,
uint32_t ssrc,
TaskQueueFactory* task_queue_factory)
: sender_(sender),
@@ -173,7 +171,7 @@
void RTPSenderVideoFrameTransformerDelegate::Init() {
frame_transformer_->RegisterTransformedFrameSinkCallback(
- rtc::scoped_refptr<TransformedFrameCallback>(this), ssrc_);
+ scoped_refptr<TransformedFrameCallback>(this), ssrc_);
}
bool RTPSenderVideoFrameTransformerDelegate::TransformFrame(
@@ -208,7 +206,7 @@
if (!sender_) {
return;
}
- rtc::scoped_refptr<RTPSenderVideoFrameTransformerDelegate> delegate(this);
+ scoped_refptr<RTPSenderVideoFrameTransformerDelegate> delegate(this);
transformation_queue_->PostTask(
[delegate = std::move(delegate), frame = std::move(frame)]() mutable {
RTC_DCHECK_RUN_ON(delegate->transformation_queue_.get());
diff --git a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h
index e44a626..4302fb7 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h
+++ b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate.h
@@ -43,7 +43,7 @@
std::optional<VideoCodecType> codec_type,
uint32_t rtp_timestamp,
Timestamp capture_time,
- rtc::ArrayView<const uint8_t> payload,
+ ArrayView<const uint8_t> payload,
size_t encoder_output_size,
RTPVideoHeader video_header,
TimeDelta expected_retransmission_time,
@@ -65,7 +65,7 @@
public:
RTPSenderVideoFrameTransformerDelegate(
RTPVideoFrameSenderInterface* sender,
- rtc::scoped_refptr<FrameTransformerInterface> frame_transformer,
+ scoped_refptr<FrameTransformerInterface> frame_transformer,
uint32_t ssrc,
TaskQueueFactory* send_transport_queue);
@@ -113,7 +113,7 @@
mutable Mutex sender_lock_;
RTPVideoFrameSenderInterface* sender_ RTC_GUARDED_BY(sender_lock_);
- rtc::scoped_refptr<FrameTransformerInterface> frame_transformer_;
+ scoped_refptr<FrameTransformerInterface> frame_transformer_;
const uint32_t ssrc_;
// Used when the encoded frames arrives without a current task queue. This can
// happen if a hardware encoder was used.
diff --git a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate_unittest.cc
index 08db7c5..af3083b 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video_frame_transformer_delegate_unittest.cc
@@ -55,7 +55,7 @@
std::optional<VideoCodecType> codec_type,
uint32_t rtp_timestamp,
Timestamp capture_time,
- rtc::ArrayView<const uint8_t> payload,
+ ArrayView<const uint8_t> payload,
size_t encoder_output_size,
RTPVideoHeader video_header,
TimeDelta expected_retransmission_time,
@@ -75,13 +75,13 @@
class RtpSenderVideoFrameTransformerDelegateTest : public ::testing::Test {
protected:
RtpSenderVideoFrameTransformerDelegateTest()
- : frame_transformer_(rtc::make_ref_counted<MockFrameTransformer>()),
+ : frame_transformer_(make_ref_counted<MockFrameTransformer>()),
time_controller_(Timestamp::Seconds(0)) {}
~RtpSenderVideoFrameTransformerDelegateTest() override = default;
std::unique_ptr<TransformableFrameInterface> GetTransformableFrame(
- rtc::scoped_refptr<RTPSenderVideoFrameTransformerDelegate> delegate,
+ scoped_refptr<RTPSenderVideoFrameTransformerDelegate> delegate,
bool key_frame = false) {
EncodedImage encoded_image;
encoded_image.SetEncodedData(EncodedImageBuffer::Create(1));
@@ -107,13 +107,13 @@
}
MockRTPVideoFrameSenderInterface test_sender_;
- rtc::scoped_refptr<MockFrameTransformer> frame_transformer_;
+ scoped_refptr<MockFrameTransformer> frame_transformer_;
GlobalSimulatedTimeController time_controller_;
};
TEST_F(RtpSenderVideoFrameTransformerDelegateTest,
RegisterTransformedFrameCallbackSinkOnInit) {
- auto delegate = rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ auto delegate = make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
&test_sender_, frame_transformer_,
/*ssrc=*/1111, time_controller_.CreateTaskQueueFactory().get());
EXPECT_CALL(*frame_transformer_,
@@ -123,7 +123,7 @@
TEST_F(RtpSenderVideoFrameTransformerDelegateTest,
UnregisterTransformedFrameSinkCallbackOnReset) {
- auto delegate = rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ auto delegate = make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
&test_sender_, frame_transformer_,
/*ssrc=*/1111, time_controller_.CreateTaskQueueFactory().get());
EXPECT_CALL(*frame_transformer_,
@@ -133,7 +133,7 @@
TEST_F(RtpSenderVideoFrameTransformerDelegateTest,
TransformFrameCallsTransform) {
- auto delegate = rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ auto delegate = make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
&test_sender_, frame_transformer_,
/*ssrc=*/1111, time_controller_.CreateTaskQueueFactory().get());
@@ -147,11 +147,11 @@
TEST_F(RtpSenderVideoFrameTransformerDelegateTest,
OnTransformedFrameCallsSenderSendVideo) {
- auto delegate = rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ auto delegate = make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
&test_sender_, frame_transformer_,
/*ssrc=*/1111, time_controller_.CreateTaskQueueFactory().get());
- rtc::scoped_refptr<TransformedFrameCallback> callback;
+ scoped_refptr<TransformedFrameCallback> callback;
EXPECT_CALL(*frame_transformer_, RegisterTransformedFrameSinkCallback)
.WillOnce(SaveArg<0>(&callback));
delegate->Init();
@@ -174,7 +174,7 @@
}
TEST_F(RtpSenderVideoFrameTransformerDelegateTest, CloneSenderVideoFrame) {
- auto delegate = rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ auto delegate = make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
&test_sender_, frame_transformer_,
/*ssrc=*/1111, time_controller_.CreateTaskQueueFactory().get());
@@ -195,7 +195,7 @@
}
TEST_F(RtpSenderVideoFrameTransformerDelegateTest, CloneKeyFrame) {
- auto delegate = rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ auto delegate = make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
&test_sender_, frame_transformer_,
/*ssrc=*/1111, time_controller_.CreateTaskQueueFactory().get());
@@ -216,7 +216,7 @@
}
TEST_F(RtpSenderVideoFrameTransformerDelegateTest, MetadataAfterSetMetadata) {
- auto delegate = rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ auto delegate = make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
&test_sender_, frame_transformer_,
/*ssrc=*/1111, time_controller_.CreateTaskQueueFactory().get());
@@ -244,7 +244,7 @@
TEST_F(RtpSenderVideoFrameTransformerDelegateTest,
ReceiverFrameConvertedToSenderFrame) {
- auto delegate = rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ auto delegate = make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
&test_sender_, frame_transformer_,
/*ssrc=*/1111, time_controller_.CreateTaskQueueFactory().get());
@@ -261,14 +261,14 @@
metadata.SetRTPVideoHeaderCodecSpecifics(RTPVideoHeaderVP8());
metadata.SetCsrcs(frame_csrcs);
ON_CALL(*mock_receiver_frame, Metadata).WillByDefault(Return(metadata));
- rtc::ArrayView<const uint8_t> buffer =
- (rtc::ArrayView<const uint8_t>)*EncodedImageBuffer::Create(1);
+ ArrayView<const uint8_t> buffer =
+ (ArrayView<const uint8_t>)*EncodedImageBuffer::Create(1);
ON_CALL(*mock_receiver_frame, GetData).WillByDefault(Return(buffer));
ON_CALL(*mock_receiver_frame, GetPayloadType)
.WillByDefault(Return(payload_type));
ON_CALL(*mock_receiver_frame, GetTimestamp).WillByDefault(Return(timestamp));
- rtc::scoped_refptr<TransformedFrameCallback> callback;
+ scoped_refptr<TransformedFrameCallback> callback;
EXPECT_CALL(*frame_transformer_, RegisterTransformedFrameSinkCallback)
.WillOnce(SaveArg<0>(&callback));
delegate->Init();
@@ -292,7 +292,7 @@
}
TEST_F(RtpSenderVideoFrameTransformerDelegateTest, SettingRTPTimestamp) {
- auto delegate = rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ auto delegate = make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
&test_sender_, frame_transformer_,
/*ssrc=*/1111, time_controller_.CreateTaskQueueFactory().get());
@@ -310,7 +310,7 @@
TEST_F(RtpSenderVideoFrameTransformerDelegateTest,
ShortCircuitingSkipsTransform) {
- auto delegate = rtc::make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
+ auto delegate = make_ref_counted<RTPSenderVideoFrameTransformerDelegate>(
&test_sender_, frame_transformer_,
/*ssrc=*/1111, time_controller_.CreateTaskQueueFactory().get());
EXPECT_CALL(*frame_transformer_,
diff --git a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
index ef10229..b5045ae 100644
--- a/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_sender_video_unittest.cc
@@ -141,15 +141,13 @@
kCorruptionDetectionExtensionId);
}
- bool SendRtp(rtc::ArrayView<const uint8_t> data,
+ bool SendRtp(ArrayView<const uint8_t> data,
const PacketOptions& /* options */) override {
sent_packets_.push_back(RtpPacketReceived(&receivers_extensions_));
EXPECT_TRUE(sent_packets_.back().Parse(data));
return true;
}
- bool SendRtcp(rtc::ArrayView<const uint8_t> /* data */) override {
- return false;
- }
+ bool SendRtcp(ArrayView<const uint8_t> /* data */) override { return false; }
const RtpPacketReceived& last_sent_packet() { return sent_packets_.back(); }
int packets_sent() { return sent_packets_.size(); }
const std::vector<RtpPacketReceived>& sent_packets() const {
@@ -623,7 +621,7 @@
// when rtx packet barely fit.
for (size_t frame_size = 800; frame_size < kMaxPacketSize; ++frame_size) {
SCOPED_TRACE(frame_size);
- rtc::ArrayView<const uint8_t> payload(kPayload, frame_size);
+ ArrayView<const uint8_t> payload(kPayload, frame_size);
EXPECT_TRUE(rtp_sender_video_->SendVideo(
kMediaPayloadId, /*codec_type=*/kVideoCodecVP8, /*rtp_timestamp=*/0,
@@ -922,11 +920,11 @@
rtp_module_.RegisterRtpHeaderExtension(
RtpDependencyDescriptorExtension::Uri(), kDependencyDescriptorId);
- auto encryptor = rtc::make_ref_counted<NiceMock<MockFrameEncryptor>>();
+ auto encryptor = make_ref_counted<NiceMock<MockFrameEncryptor>>();
ON_CALL(*encryptor, GetMaxCiphertextByteSize).WillByDefault(ReturnArg<1>());
ON_CALL(*encryptor, Encrypt)
.WillByDefault(WithArgs<3, 5>(
- [](rtc::ArrayView<const uint8_t> frame, size_t* bytes_written) {
+ [](ArrayView<const uint8_t> frame, size_t* bytes_written) {
*bytes_written = frame.size();
return 0;
}));
@@ -1500,7 +1498,7 @@
kPayloadTypeGeneric, kCodecType, 1234, fake_clock_.CurrentTime(),
kPayload, sizeof(kPayload), video_header, TimeDelta::PlusInfinity(), {}));
- rtc::ArrayView<const uint8_t> sent_payload =
+ ArrayView<const uint8_t> sent_payload =
transport_.last_sent_packet().payload();
uint8_t generic_header = sent_payload[0];
EXPECT_TRUE(generic_header & RtpFormatVideoGeneric::kKeyFrameBit);
@@ -1533,7 +1531,7 @@
kPayloadTypeRaw, std::nullopt, 1234, fake_clock_.CurrentTime(), kPayload,
sizeof(kPayload), video_header, TimeDelta::PlusInfinity(), {}));
- rtc::ArrayView<const uint8_t> sent_payload =
+ ArrayView<const uint8_t> sent_payload =
transport_.last_sent_packet().payload();
EXPECT_THAT(sent_payload, ElementsAreArray(kPayload));
}
@@ -1555,7 +1553,7 @@
}
std::unique_ptr<RTPSenderVideo> CreateSenderWithFrameTransformer(
- rtc::scoped_refptr<FrameTransformerInterface> transformer) {
+ scoped_refptr<FrameTransformerInterface> transformer) {
RTPSenderVideo::Config config;
config.clock = time_controller_.GetClock();
config.rtp_sender = rtp_module_.RtpSender();
@@ -1584,7 +1582,7 @@
TEST_F(RtpSenderVideoWithFrameTransformerTest,
CreateSenderRegistersFrameTransformer) {
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
EXPECT_CALL(*mock_frame_transformer,
RegisterTransformedFrameSinkCallback(_, kSsrc));
std::unique_ptr<RTPSenderVideo> rtp_sender_video =
@@ -1594,7 +1592,7 @@
TEST_F(RtpSenderVideoWithFrameTransformerTest,
DestroySenderUnregistersFrameTransformer) {
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
std::unique_ptr<RTPSenderVideo> rtp_sender_video =
CreateSenderWithFrameTransformer(mock_frame_transformer);
EXPECT_CALL(*mock_frame_transformer,
@@ -1605,7 +1603,7 @@
TEST_F(RtpSenderVideoWithFrameTransformerTest,
SendEncodedImageTransformsFrame) {
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
std::unique_ptr<RTPSenderVideo> rtp_sender_video =
CreateSenderWithFrameTransformer(mock_frame_transformer);
auto encoded_image = CreateDefaultEncodedImage();
@@ -1620,7 +1618,7 @@
#if RTC_DCHECK_IS_ON && GTEST_HAS_DEATH_TEST && !defined(WEBRTC_ANDROID)
TEST_F(RtpSenderVideoWithFrameTransformerTest, ValidPayloadTypes) {
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
std::unique_ptr<RTPSenderVideo> rtp_sender_video =
CreateSenderWithFrameTransformer(mock_frame_transformer);
auto encoded_image = CreateDefaultEncodedImage();
@@ -1645,8 +1643,8 @@
TEST_F(RtpSenderVideoWithFrameTransformerTest, OnTransformedFrameSendsVideo) {
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
- rtc::scoped_refptr<TransformedFrameCallback> callback;
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
+ scoped_refptr<TransformedFrameCallback> callback;
EXPECT_CALL(*mock_frame_transformer, RegisterTransformedFrameSinkCallback)
.WillOnce(SaveArg<0>(&callback));
std::unique_ptr<RTPSenderVideo> rtp_sender_video =
@@ -1682,8 +1680,8 @@
TEST_F(RtpSenderVideoWithFrameTransformerTest,
TransformOverheadCorrectlyAccountedFor) {
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
- rtc::scoped_refptr<TransformedFrameCallback> callback;
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
+ scoped_refptr<TransformedFrameCallback> callback;
EXPECT_CALL(*mock_frame_transformer, RegisterTransformedFrameSinkCallback)
.WillOnce(SaveArg<0>(&callback));
std::unique_ptr<RTPSenderVideo> rtp_sender_video =
@@ -1719,7 +1717,7 @@
TEST_F(RtpSenderVideoWithFrameTransformerTest,
TransformableFrameMetadataHasCorrectValue) {
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
std::unique_ptr<RTPSenderVideo> rtp_sender_video =
CreateSenderWithFrameTransformer(mock_frame_transformer);
auto encoded_image = CreateDefaultEncodedImage();
@@ -1761,7 +1759,7 @@
TEST_F(RtpSenderVideoWithFrameTransformerTest,
TransformableFrameHasCorrectCaptureIdentifier) {
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
std::unique_ptr<RTPSenderVideo> rtp_sender_video =
CreateSenderWithFrameTransformer(mock_frame_transformer);
auto encoded_image = CreateDefaultEncodedImage();
@@ -1785,8 +1783,8 @@
TEST_F(RtpSenderVideoWithFrameTransformerTest,
OnTransformedFrameSendsVideoWhenCloned) {
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
- rtc::scoped_refptr<TransformedFrameCallback> callback;
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
+ scoped_refptr<TransformedFrameCallback> callback;
EXPECT_CALL(*mock_frame_transformer, RegisterTransformedFrameSinkCallback)
.WillOnce(SaveArg<0>(&callback));
std::unique_ptr<RTPSenderVideo> rtp_sender_video =
diff --git a/modules/rtp_rtcp/source/rtp_util.cc b/modules/rtp_rtcp/source/rtp_util.cc
index cf1e542..4d802b6 100644
--- a/modules/rtp_rtcp/source/rtp_util.cc
+++ b/modules/rtp_rtcp/source/rtp_util.cc
@@ -24,7 +24,7 @@
constexpr size_t kMinRtpPacketLen = 12;
constexpr size_t kMinRtcpPacketLen = 4;
-bool HasCorrectRtpVersion(rtc::ArrayView<const uint8_t> packet) {
+bool HasCorrectRtpVersion(ArrayView<const uint8_t> packet) {
return packet[0] >> 6 == kRtpVersion;
}
@@ -35,27 +35,27 @@
} // namespace
-bool IsRtpPacket(rtc::ArrayView<const uint8_t> packet) {
+bool IsRtpPacket(ArrayView<const uint8_t> packet) {
return packet.size() >= kMinRtpPacketLen && HasCorrectRtpVersion(packet) &&
!PayloadTypeIsReservedForRtcp(packet[1] & 0x7F);
}
-bool IsRtcpPacket(rtc::ArrayView<const uint8_t> packet) {
+bool IsRtcpPacket(ArrayView<const uint8_t> packet) {
return packet.size() >= kMinRtcpPacketLen && HasCorrectRtpVersion(packet) &&
PayloadTypeIsReservedForRtcp(packet[1] & 0x7F);
}
-int ParseRtpPayloadType(rtc::ArrayView<const uint8_t> rtp_packet) {
+int ParseRtpPayloadType(ArrayView<const uint8_t> rtp_packet) {
RTC_DCHECK(IsRtpPacket(rtp_packet));
return rtp_packet[1] & 0x7F;
}
-uint16_t ParseRtpSequenceNumber(rtc::ArrayView<const uint8_t> rtp_packet) {
+uint16_t ParseRtpSequenceNumber(ArrayView<const uint8_t> rtp_packet) {
RTC_DCHECK(IsRtpPacket(rtp_packet));
return ByteReader<uint16_t>::ReadBigEndian(rtp_packet.data() + 2);
}
-uint32_t ParseRtpSsrc(rtc::ArrayView<const uint8_t> rtp_packet) {
+uint32_t ParseRtpSsrc(ArrayView<const uint8_t> rtp_packet) {
RTC_DCHECK(IsRtpPacket(rtp_packet));
return ByteReader<uint32_t>::ReadBigEndian(rtp_packet.data() + 8);
}
diff --git a/modules/rtp_rtcp/source/rtp_util.h b/modules/rtp_rtcp/source/rtp_util.h
index 835cfcd..a183e0e 100644
--- a/modules/rtp_rtcp/source/rtp_util.h
+++ b/modules/rtp_rtcp/source/rtp_util.h
@@ -17,14 +17,14 @@
namespace webrtc {
-bool IsRtcpPacket(rtc::ArrayView<const uint8_t> packet);
-bool IsRtpPacket(rtc::ArrayView<const uint8_t> packet);
+bool IsRtcpPacket(ArrayView<const uint8_t> packet);
+bool IsRtpPacket(ArrayView<const uint8_t> packet);
// Returns base rtp header fields of the rtp packet.
// Behaviour is undefined when `!IsRtpPacket(rtp_packet)`.
-int ParseRtpPayloadType(rtc::ArrayView<const uint8_t> rtp_packet);
-uint16_t ParseRtpSequenceNumber(rtc::ArrayView<const uint8_t> rtp_packet);
-uint32_t ParseRtpSsrc(rtc::ArrayView<const uint8_t> rtp_packet);
+int ParseRtpPayloadType(ArrayView<const uint8_t> rtp_packet);
+uint16_t ParseRtpSequenceNumber(ArrayView<const uint8_t> rtp_packet);
+uint32_t ParseRtpSsrc(ArrayView<const uint8_t> rtp_packet);
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc b/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc
index a4a1d3d..57e0925 100644
--- a/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc
+++ b/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.cc
@@ -110,7 +110,7 @@
// for the description of the format.
bool RtpVideoLayersAllocationExtension::Write(
- rtc::ArrayView<uint8_t> data,
+ ArrayView<uint8_t> data,
const VideoLayersAllocation& allocation) {
RTC_DCHECK(AllocationIsValid(allocation));
RTC_DCHECK_GE(data.size(), ValueSize(allocation));
@@ -179,7 +179,7 @@
}
bool RtpVideoLayersAllocationExtension::Parse(
- rtc::ArrayView<const uint8_t> data,
+ ArrayView<const uint8_t> data,
VideoLayersAllocation* allocation) {
if (data.empty() || allocation == nullptr) {
return false;
diff --git a/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.h b/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.h
index f4e9c34..520a163 100644
--- a/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.h
+++ b/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension.h
@@ -30,10 +30,10 @@
return RtpExtension::kVideoLayersAllocationUri;
}
- static bool Parse(rtc::ArrayView<const uint8_t> data,
+ static bool Parse(ArrayView<const uint8_t> data,
VideoLayersAllocation* allocation);
static size_t ValueSize(const VideoLayersAllocation& allocation);
- static bool Write(rtc::ArrayView<uint8_t> data,
+ static bool Write(ArrayView<uint8_t> data,
const VideoLayersAllocation& allocation);
};
diff --git a/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension_unittest.cc b/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension_unittest.cc
index 34b1563..a7a856d 100644
--- a/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_video_layers_allocation_extension_unittest.cc
@@ -22,7 +22,7 @@
TEST(RtpVideoLayersAllocationExtension, WriteEmptyLayersAllocationReturnsTrue) {
VideoLayersAllocation written_allocation;
- rtc::Buffer buffer(
+ Buffer buffer(
RtpVideoLayersAllocationExtension::ValueSize(written_allocation));
EXPECT_TRUE(
RtpVideoLayersAllocationExtension::Write(buffer, written_allocation));
@@ -36,7 +36,7 @@
written_allocation.resolution_and_frame_rate_is_valid = true;
written_allocation.rtp_stream_index = 0;
- rtc::Buffer buffer(
+ Buffer buffer(
RtpVideoLayersAllocationExtension::ValueSize(written_allocation));
EXPECT_TRUE(
RtpVideoLayersAllocationExtension::Write(buffer, written_allocation));
@@ -71,7 +71,7 @@
/*frame_rate_fps*/ 0,
},
};
- rtc::Buffer buffer(
+ Buffer buffer(
RtpVideoLayersAllocationExtension::ValueSize(written_allocation));
EXPECT_TRUE(
RtpVideoLayersAllocationExtension::Write(buffer, written_allocation));
@@ -105,7 +105,7 @@
/*height*/ 0,
/*frame_rate_fps*/ 0},
};
- rtc::Buffer buffer(
+ Buffer buffer(
RtpVideoLayersAllocationExtension::ValueSize(written_allocation));
EXPECT_TRUE(
RtpVideoLayersAllocationExtension::Write(buffer, written_allocation));
@@ -133,7 +133,7 @@
/*height*/ 0,
/*frame_rate_fps*/ 0},
};
- rtc::Buffer buffer(
+ Buffer buffer(
RtpVideoLayersAllocationExtension::ValueSize(written_allocation));
EXPECT_TRUE(
RtpVideoLayersAllocationExtension::Write(buffer, written_allocation));
@@ -161,7 +161,7 @@
/*height*/ 0,
/*frame_rate_fps*/ 0},
};
- rtc::Buffer buffer(
+ Buffer buffer(
RtpVideoLayersAllocationExtension::ValueSize(written_allocation));
EXPECT_TRUE(
RtpVideoLayersAllocationExtension::Write(buffer, written_allocation));
@@ -194,7 +194,7 @@
/*frame_rate_fps*/ 0,
},
};
- rtc::Buffer buffer(
+ Buffer buffer(
RtpVideoLayersAllocationExtension::ValueSize(written_allocation));
EXPECT_TRUE(
RtpVideoLayersAllocationExtension::Write(buffer, written_allocation));
@@ -230,7 +230,7 @@
},
};
- rtc::Buffer buffer(
+ Buffer buffer(
RtpVideoLayersAllocationExtension::ValueSize(written_allocation));
EXPECT_TRUE(
RtpVideoLayersAllocationExtension::Write(buffer, written_allocation));
@@ -244,7 +244,7 @@
WriteEmptyAllocationCanHaveAnyRtpStreamIndex) {
VideoLayersAllocation written_allocation;
written_allocation.rtp_stream_index = 1;
- rtc::Buffer buffer(
+ Buffer buffer(
RtpVideoLayersAllocationExtension::ValueSize(written_allocation));
EXPECT_TRUE(
RtpVideoLayersAllocationExtension::Write(buffer, written_allocation));
@@ -272,7 +272,7 @@
/*frame_rate_fps*/ 8,
},
};
- rtc::Buffer buffer(
+ Buffer buffer(
RtpVideoLayersAllocationExtension::ValueSize(written_allocation));
ASSERT_TRUE(
RtpVideoLayersAllocationExtension::Write(buffer, written_allocation));
diff --git a/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc b/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc
index cc472aa..7b5f480 100644
--- a/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc
+++ b/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.cc
@@ -55,11 +55,11 @@
~TransformableVideoReceiverFrame() override = default;
// Implements TransformableVideoFrameInterface.
- rtc::ArrayView<const uint8_t> GetData() const override {
+ ArrayView<const uint8_t> GetData() const override {
return *frame_->GetEncodedData();
}
- void SetData(rtc::ArrayView<const uint8_t> data) override {
+ void SetData(ArrayView<const uint8_t> data) override {
frame_->SetEncodedData(
EncodedImageBuffer::Create(data.data(), data.size()));
}
@@ -137,7 +137,7 @@
RtpVideoStreamReceiverFrameTransformerDelegate(
RtpVideoFrameReceiver* receiver,
Clock* clock,
- rtc::scoped_refptr<FrameTransformerInterface> frame_transformer,
+ scoped_refptr<FrameTransformerInterface> frame_transformer,
Thread* network_thread,
uint32_t ssrc)
: receiver_(receiver),
@@ -149,7 +149,7 @@
void RtpVideoStreamReceiverFrameTransformerDelegate::Init() {
RTC_DCHECK_RUN_ON(&network_sequence_checker_);
frame_transformer_->RegisterTransformedFrameSinkCallback(
- rtc::scoped_refptr<TransformedFrameCallback>(this), ssrc_);
+ scoped_refptr<TransformedFrameCallback>(this), ssrc_);
}
void RtpVideoStreamReceiverFrameTransformerDelegate::Reset() {
@@ -174,8 +174,7 @@
void RtpVideoStreamReceiverFrameTransformerDelegate::OnTransformedFrame(
std::unique_ptr<TransformableFrameInterface> frame) {
- rtc::scoped_refptr<RtpVideoStreamReceiverFrameTransformerDelegate> delegate(
- this);
+ scoped_refptr<RtpVideoStreamReceiverFrameTransformerDelegate> delegate(this);
network_thread_->PostTask(
[delegate = std::move(delegate), frame = std::move(frame)]() mutable {
delegate->ManageFrame(std::move(frame));
@@ -183,8 +182,7 @@
}
void RtpVideoStreamReceiverFrameTransformerDelegate::StartShortCircuiting() {
- rtc::scoped_refptr<RtpVideoStreamReceiverFrameTransformerDelegate> delegate(
- this);
+ scoped_refptr<RtpVideoStreamReceiverFrameTransformerDelegate> delegate(this);
network_thread_->PostTask([delegate = std::move(delegate)]() mutable {
delegate->StartShortCircuitingOnNetworkSequence();
});
@@ -237,7 +235,7 @@
VideoFrameMetadata metadata = transformed_frame->Metadata();
RTPVideoHeader video_header = RTPVideoHeader::FromMetadata(metadata);
VideoSendTiming timing;
- rtc::ArrayView<const uint8_t> data = transformed_frame->GetData();
+ ArrayView<const uint8_t> data = transformed_frame->GetData();
int64_t receive_time = clock_->CurrentTime().ms();
receiver_->ManageFrame(std::make_unique<RtpFrameObject>(
/*first_seq_num=*/metadata.GetFrameId().value_or(0),
diff --git a/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h b/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h
index 7ed54f8..1e6678b 100644
--- a/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h
+++ b/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate.h
@@ -43,7 +43,7 @@
RtpVideoStreamReceiverFrameTransformerDelegate(
RtpVideoFrameReceiver* receiver,
Clock* clock,
- rtc::scoped_refptr<FrameTransformerInterface> frame_transformer,
+ scoped_refptr<FrameTransformerInterface> frame_transformer,
Thread* network_thread,
uint32_t ssrc);
@@ -72,7 +72,7 @@
RTC_NO_UNIQUE_ADDRESS SequenceChecker network_sequence_checker_;
RtpVideoFrameReceiver* receiver_ RTC_GUARDED_BY(network_sequence_checker_);
- rtc::scoped_refptr<FrameTransformerInterface> frame_transformer_
+ scoped_refptr<FrameTransformerInterface> frame_transformer_
RTC_GUARDED_BY(network_sequence_checker_);
Thread* const network_thread_;
const uint32_t ssrc_;
diff --git a/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc b/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc
index d182309..92860b1 100644
--- a/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc
+++ b/modules/rtp_rtcp/source/rtp_video_stream_receiver_frame_transformer_delegate_unittest.cc
@@ -90,10 +90,10 @@
TEST(RtpVideoStreamReceiverFrameTransformerDelegateTest,
RegisterTransformedFrameCallbackSinkOnInit) {
TestRtpVideoFrameReceiver receiver;
- auto frame_transformer(rtc::make_ref_counted<MockFrameTransformer>());
+ auto frame_transformer(make_ref_counted<MockFrameTransformer>());
SimulatedClock clock(0);
auto delegate(
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver, &clock, frame_transformer, Thread::Current(),
/*remote_ssrc*/ 1111));
EXPECT_CALL(*frame_transformer,
@@ -104,10 +104,10 @@
TEST(RtpVideoStreamReceiverFrameTransformerDelegateTest,
UnregisterTransformedFrameSinkCallbackOnReset) {
TestRtpVideoFrameReceiver receiver;
- auto frame_transformer(rtc::make_ref_counted<MockFrameTransformer>());
+ auto frame_transformer(make_ref_counted<MockFrameTransformer>());
SimulatedClock clock(0);
auto delegate(
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver, &clock, frame_transformer, Thread::Current(),
/*remote_ssrc*/ 1111));
EXPECT_CALL(*frame_transformer, UnregisterTransformedFrameSinkCallback(1111));
@@ -117,10 +117,10 @@
TEST(RtpVideoStreamReceiverFrameTransformerDelegateTest, TransformFrame) {
TestRtpVideoFrameReceiver receiver;
auto frame_transformer(
- rtc::make_ref_counted<testing::NiceMock<MockFrameTransformer>>());
+ make_ref_counted<testing::NiceMock<MockFrameTransformer>>());
SimulatedClock clock(0);
auto delegate(
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver, &clock, frame_transformer, Thread::Current(),
/*remote_ssrc*/ 1111));
auto frame = CreateRtpFrameObject();
@@ -133,15 +133,15 @@
AutoThread main_thread_;
TestRtpVideoFrameReceiver receiver;
auto mock_frame_transformer(
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>());
+ make_ref_counted<NiceMock<MockFrameTransformer>>());
SimulatedClock clock(0);
std::vector<uint32_t> csrcs = {234, 345, 456};
auto delegate =
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver, &clock, mock_frame_transformer, Thread::Current(),
/*remote_ssrc*/ 1111);
- rtc::scoped_refptr<TransformedFrameCallback> callback;
+ scoped_refptr<TransformedFrameCallback> callback;
EXPECT_CALL(*mock_frame_transformer, RegisterTransformedFrameSinkCallback)
.WillOnce(SaveArg<0>(&callback));
delegate->Init();
@@ -167,10 +167,10 @@
TransformableFrameMetadataHasCorrectValue) {
TestRtpVideoFrameReceiver receiver;
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
SimulatedClock clock(0);
auto delegate =
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver, &clock, mock_frame_transformer, Thread::Current(), 1111);
delegate->Init();
RTPVideoHeader video_header;
@@ -227,10 +227,10 @@
TransformableFrameWithNegativeSenderCaptureTimeOffsetIsCorrect) {
TestRtpVideoFrameReceiver receiver;
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
SimulatedClock clock(0);
auto delegate =
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver, &clock, mock_frame_transformer, Thread::Current(), 1111);
delegate->Init();
RTPVideoHeader video_header;
@@ -261,13 +261,13 @@
AutoThread main_thread;
TestRtpVideoFrameReceiver receiver;
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
SimulatedClock clock(1000);
auto delegate =
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver, &clock, mock_frame_transformer, Thread::Current(), 1111);
- rtc::scoped_refptr<TransformedFrameCallback> callback;
+ scoped_refptr<TransformedFrameCallback> callback;
EXPECT_CALL(*mock_frame_transformer, RegisterTransformedFrameSinkCallback)
.WillOnce(SaveArg<0>(&callback));
delegate->Init();
@@ -324,10 +324,10 @@
AutoThread main_thread_;
TestRtpVideoFrameReceiver receiver;
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
SimulatedClock clock(/*initial_timestamp_us=*/12345000);
auto delegate =
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver, &clock, mock_frame_transformer, Thread::Current(),
/*remote_ssrc*/ 1111);
@@ -339,12 +339,12 @@
metadata.SetCodec(kVideoCodecVP8);
metadata.SetRTPVideoHeaderCodecSpecifics(RTPVideoHeaderVP8());
ON_CALL(*mock_sender_frame, Metadata).WillByDefault(Return(metadata));
- rtc::scoped_refptr<EncodedImageBufferInterface> buffer =
+ scoped_refptr<EncodedImageBufferInterface> buffer =
EncodedImageBuffer::Create(1);
ON_CALL(*mock_sender_frame, GetData)
- .WillByDefault(Return(rtc::ArrayView<const uint8_t>(*buffer)));
+ .WillByDefault(Return(ArrayView<const uint8_t>(*buffer)));
- rtc::scoped_refptr<TransformedFrameCallback> callback;
+ scoped_refptr<TransformedFrameCallback> callback;
EXPECT_CALL(*mock_frame_transformer, RegisterTransformedFrameSinkCallback)
.WillOnce(SaveArg<0>(&callback));
delegate->Init();
@@ -367,23 +367,23 @@
TestRtpVideoFrameReceiver receiver1;
auto mock_frame_transformer1(
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>());
+ make_ref_counted<NiceMock<MockFrameTransformer>>());
SimulatedClock clock(0);
auto delegate1 =
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver1, &clock, mock_frame_transformer1, Thread::Current(),
/*remote_ssrc*/ 1111);
TestRtpVideoFrameReceiver receiver2;
auto mock_frame_transformer2(
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>());
+ make_ref_counted<NiceMock<MockFrameTransformer>>());
auto delegate2 =
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver2, &clock, mock_frame_transformer2, Thread::Current(),
/*remote_ssrc*/ 1111);
delegate1->Init();
- rtc::scoped_refptr<TransformedFrameCallback> callback_for_2;
+ scoped_refptr<TransformedFrameCallback> callback_for_2;
EXPECT_CALL(*mock_frame_transformer2, RegisterTransformedFrameSinkCallback)
.WillOnce(SaveArg<0>(&callback_for_2));
delegate2->Init();
@@ -416,10 +416,10 @@
AutoThread main_thread_;
TestRtpVideoFrameReceiver receiver;
auto mock_frame_transformer =
- rtc::make_ref_counted<NiceMock<MockFrameTransformer>>();
+ make_ref_counted<NiceMock<MockFrameTransformer>>();
SimulatedClock clock(0);
auto delegate =
- rtc::make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
+ make_ref_counted<RtpVideoStreamReceiverFrameTransformerDelegate>(
&receiver, &clock, mock_frame_transformer, Thread::Current(), 1111);
delegate->Init();
diff --git a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
index fe9b758..69ad59d 100644
--- a/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_generator_unittest.cc
@@ -42,7 +42,7 @@
int red_payload_type,
int fec_payload_type,
bool marker_bit,
- const rtc::CopyOnWriteBuffer& data) {
+ const CopyOnWriteBuffer& data) {
// Marker bit not set.
EXPECT_EQ(marker_bit ? 0x80 : 0, data[1] & 0x80);
EXPECT_EQ(red_payload_type, data[1] & 0x7F);
diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc
index 3757307..5bd4488 100644
--- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc
+++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.cc
@@ -112,7 +112,7 @@
}
void UlpfecHeaderWriter::FinalizeFecHeader(
- rtc::ArrayView<const ProtectedStream> protected_streams,
+ ArrayView<const ProtectedStream> protected_streams,
ForwardErrorCorrection::Packet& fec_packet) const {
RTC_CHECK_EQ(protected_streams.size(), 1);
uint16_t seq_num_base = protected_streams[0].seq_num_base;
diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h
index dc98645..b08725e 100644
--- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h
+++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer.h
@@ -58,7 +58,7 @@
size_t FecHeaderSize(size_t packet_mask_row_size) const override;
void FinalizeFecHeader(
- rtc::ArrayView<const ProtectedStream> protected_streams,
+ ArrayView<const ProtectedStream> protected_streams,
ForwardErrorCorrection::Packet& fec_packet) const override;
};
diff --git a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
index dfd7172..99ac112 100644
--- a/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
+++ b/modules/rtp_rtcp/source/ulpfec_header_reader_writer_unittest.cc
@@ -70,7 +70,7 @@
UlpfecHeaderReader reader;
std::unique_ptr<ReceivedFecPacket> read_packet(new ReceivedFecPacket());
read_packet->ssrc = kMediaSsrc;
- read_packet->pkt = rtc::scoped_refptr<Packet>(new Packet());
+ read_packet->pkt = scoped_refptr<Packet>(new Packet());
read_packet->pkt->data = written_packet.data;
EXPECT_TRUE(reader.ReadFecHeader(read_packet.get()));
return read_packet;
@@ -114,7 +114,7 @@
};
const size_t packet_length = sizeof(packet);
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::scoped_refptr<Packet>(new Packet());
+ read_packet.pkt = scoped_refptr<Packet>(new Packet());
read_packet.pkt->data.SetData(packet, packet_length);
UlpfecHeaderReader reader;
@@ -138,7 +138,7 @@
};
const size_t packet_length = sizeof(packet);
ReceivedFecPacket read_packet;
- read_packet.pkt = rtc::scoped_refptr<Packet>(new Packet());
+ read_packet.pkt = scoped_refptr<Packet>(new Packet());
read_packet.pkt->data.SetData(packet, packet_length);
UlpfecHeaderReader reader;
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer.cc
index a5ff8d6..74a7522 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer.cc
@@ -22,18 +22,18 @@
namespace webrtc {
-rtc::scoped_refptr<EncodedImageBuffer> VideoRtpDepacketizer::AssembleFrame(
- rtc::ArrayView<const rtc::ArrayView<const uint8_t>> rtp_payloads) {
+scoped_refptr<EncodedImageBuffer> VideoRtpDepacketizer::AssembleFrame(
+ ArrayView<const ArrayView<const uint8_t>> rtp_payloads) {
size_t frame_size = 0;
- for (rtc::ArrayView<const uint8_t> payload : rtp_payloads) {
+ for (ArrayView<const uint8_t> payload : rtp_payloads) {
frame_size += payload.size();
}
- rtc::scoped_refptr<EncodedImageBuffer> bitstream =
+ scoped_refptr<EncodedImageBuffer> bitstream =
EncodedImageBuffer::Create(frame_size);
uint8_t* write_at = bitstream->data();
- for (rtc::ArrayView<const uint8_t> payload : rtp_payloads) {
+ for (ArrayView<const uint8_t> payload : rtp_payloads) {
memcpy(write_at, payload.data(), payload.size());
write_at += payload.size();
}
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer.h b/modules/rtp_rtcp/source/video_rtp_depacketizer.h
index adf6dc6..487be38 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer.h
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer.h
@@ -27,14 +27,14 @@
public:
struct ParsedRtpPayload {
RTPVideoHeader video_header;
- rtc::CopyOnWriteBuffer video_payload;
+ CopyOnWriteBuffer video_payload;
};
virtual ~VideoRtpDepacketizer() = default;
virtual std::optional<ParsedRtpPayload> Parse(
- rtc::CopyOnWriteBuffer rtp_payload) = 0;
- virtual rtc::scoped_refptr<EncodedImageBuffer> AssembleFrame(
- rtc::ArrayView<const rtc::ArrayView<const uint8_t>> rtp_payloads);
+ CopyOnWriteBuffer rtp_payload) = 0;
+ virtual scoped_refptr<EncodedImageBuffer> AssembleFrame(
+ ArrayView<const ArrayView<const uint8_t>> rtp_payloads);
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc
index ec302ff..fd8d647 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.cc
@@ -94,7 +94,7 @@
}
private:
- using Storage = absl::InlinedVector<rtc::ArrayView<const uint8_t>, 2>;
+ using Storage = absl::InlinedVector<ArrayView<const uint8_t>, 2>;
size_t size_ = 0;
Storage data_;
@@ -196,10 +196,10 @@
// fills ObuInfo::data field.
// Returns empty vector on error.
VectorObuInfo ParseObus(
- rtc::ArrayView<const rtc::ArrayView<const uint8_t>> rtp_payloads) {
+ ArrayView<const ArrayView<const uint8_t>> rtp_payloads) {
VectorObuInfo obu_infos;
bool expect_continues_obu = false;
- for (rtc::ArrayView<const uint8_t> rtp_payload : rtp_payloads) {
+ for (ArrayView<const uint8_t> rtp_payload : rtp_payloads) {
ByteBufferReader payload(rtp_payload);
uint8_t aggregation_header;
if (!payload.ReadUInt8(&aggregation_header)) {
@@ -337,8 +337,8 @@
} // namespace
-rtc::scoped_refptr<EncodedImageBuffer> VideoRtpDepacketizerAv1::AssembleFrame(
- rtc::ArrayView<const rtc::ArrayView<const uint8_t>> rtp_payloads) {
+scoped_refptr<EncodedImageBuffer> VideoRtpDepacketizerAv1::AssembleFrame(
+ ArrayView<const ArrayView<const uint8_t>> rtp_payloads) {
VectorObuInfo obu_infos = ParseObus(rtp_payloads);
if (obu_infos.empty()) {
return nullptr;
@@ -352,7 +352,7 @@
frame_size += (obu_info.prefix_size + obu_info.payload_size);
}
- rtc::scoped_refptr<EncodedImageBuffer> bitstream =
+ scoped_refptr<EncodedImageBuffer> bitstream =
EncodedImageBuffer::Create(frame_size);
uint8_t* write_at = bitstream->data();
for (const ObuInfo& obu_info : obu_infos) {
@@ -368,7 +368,7 @@
}
std::optional<VideoRtpDepacketizer::ParsedRtpPayload>
-VideoRtpDepacketizerAv1::Parse(rtc::CopyOnWriteBuffer rtp_payload) {
+VideoRtpDepacketizerAv1::Parse(CopyOnWriteBuffer rtp_payload) {
if (rtp_payload.size() == 0) {
RTC_DLOG(LS_ERROR) << "Empty rtp payload.";
return std::nullopt;
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.h b/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.h
index ed998d6..4acf209 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.h
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_av1.h
@@ -31,12 +31,10 @@
VideoRtpDepacketizerAv1& operator=(const VideoRtpDepacketizerAv1&) = delete;
~VideoRtpDepacketizerAv1() override = default;
- rtc::scoped_refptr<EncodedImageBuffer> AssembleFrame(
- rtc::ArrayView<const rtc::ArrayView<const uint8_t>> rtp_payloads)
- override;
+ scoped_refptr<EncodedImageBuffer> AssembleFrame(
+ ArrayView<const ArrayView<const uint8_t>> rtp_payloads) override;
- std::optional<ParsedRtpPayload> Parse(
- rtc::CopyOnWriteBuffer rtp_payload) override;
+ std::optional<ParsedRtpPayload> Parse(CopyOnWriteBuffer rtp_payload) override;
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_av1_unittest.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_av1_unittest.cc
index 201be73..aa3a735 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_av1_unittest.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_av1_unittest.cc
@@ -36,7 +36,7 @@
TEST(VideoRtpDepacketizerAv1Test, ParsePassFullRtpPayloadAsCodecPayload) {
const uint8_t packet[] = {(uint8_t{1} << 7) | kObuCountOne, 1, 2, 3, 4};
- rtc::CopyOnWriteBuffer rtp_payload(packet);
+ CopyOnWriteBuffer rtp_payload(packet);
VideoRtpDepacketizerAv1 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
depacketizer.Parse(rtp_payload);
@@ -53,7 +53,7 @@
// continuation of the OBU from previous packet.
VideoRtpDepacketizerAv1 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(packet));
+ depacketizer.Parse(CopyOnWriteBuffer(packet));
ASSERT_TRUE(parsed);
EXPECT_FALSE(parsed->video_header.is_first_packet_in_frame);
}
@@ -63,14 +63,14 @@
const uint8_t packet[] = {(uint8_t{0} << 7) | kObuCountOne, kObuHeaderFrame};
VideoRtpDepacketizerAv1 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(packet));
+ depacketizer.Parse(CopyOnWriteBuffer(packet));
ASSERT_TRUE(parsed);
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
}
TEST(VideoRtpDepacketizerAv1Test, ParseTreatsWillContinueFlagAsNotEndOfFrame) {
const uint8_t packet[] = {(uint8_t{1} << 6) | kObuCountOne, kObuHeaderFrame};
- rtc::CopyOnWriteBuffer rtp_payload(packet);
+ CopyOnWriteBuffer rtp_payload(packet);
VideoRtpDepacketizerAv1 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
depacketizer.Parse(rtp_payload);
@@ -82,7 +82,7 @@
const uint8_t packet[] = {(uint8_t{0} << 6) | kObuCountOne, kObuHeaderFrame};
VideoRtpDepacketizerAv1 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(packet));
+ depacketizer.Parse(CopyOnWriteBuffer(packet));
ASSERT_TRUE(parsed);
EXPECT_TRUE(parsed->video_header.is_last_packet_in_frame);
}
@@ -93,7 +93,7 @@
kObuHeaderSequenceHeader};
VideoRtpDepacketizerAv1 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(packet));
+ depacketizer.Parse(CopyOnWriteBuffer(packet));
ASSERT_TRUE(parsed);
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
EXPECT_TRUE(parsed->video_header.frame_type ==
@@ -106,7 +106,7 @@
kObuHeaderSequenceHeader};
VideoRtpDepacketizerAv1 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(packet));
+ depacketizer.Parse(CopyOnWriteBuffer(packet));
ASSERT_TRUE(parsed);
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
EXPECT_TRUE(parsed->video_header.frame_type ==
@@ -118,17 +118,17 @@
const uint8_t packet[] = {0b10'00'1000 | kObuCountOne,
kObuHeaderSequenceHeader};
VideoRtpDepacketizerAv1 depacketizer;
- ASSERT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(packet)));
+ ASSERT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(packet)));
}
TEST(VideoRtpDepacketizerAv1Test, AssembleFrameSetsOBUPayloadSizeWhenAbsent) {
const uint8_t payload1[] = {0b00'01'0000, // aggregation header
0b0'0110'000, // / Frame
20, 30, 40}; // \ OBU
- rtc::ArrayView<const uint8_t> payloads[] = {payload1};
+ ArrayView<const uint8_t> payloads[] = {payload1};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- rtc::ArrayView<const uint8_t> frame_view(*frame);
+ ArrayView<const uint8_t> frame_view(*frame);
EXPECT_TRUE(frame_view[0] & kObuHeaderHasSize);
EXPECT_EQ(frame_view[1], 3);
}
@@ -140,10 +140,10 @@
20,
30,
40}; // \ obu_payload
- rtc::ArrayView<const uint8_t> payloads[] = {payload1};
+ ArrayView<const uint8_t> payloads[] = {payload1};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- rtc::ArrayView<const uint8_t> frame_view(*frame);
+ ArrayView<const uint8_t> frame_view(*frame);
EXPECT_TRUE(frame_view[0] & kObuHeaderHasSize);
EXPECT_EQ(frame_view[1], 3);
}
@@ -154,10 +154,10 @@
0b0'0110'100, // / Frame
0b010'01'000, // | extension_header
20, 30, 40}; // \ OBU
- rtc::ArrayView<const uint8_t> payloads[] = {payload1};
+ ArrayView<const uint8_t> payloads[] = {payload1};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- rtc::ArrayView<const uint8_t> frame_view(*frame);
+ ArrayView<const uint8_t> frame_view(*frame);
EXPECT_TRUE(frame_view[0] & kObuHeaderHasSize);
EXPECT_EQ(frame_view[2], 3);
}
@@ -171,10 +171,10 @@
20,
30,
40}; // \ obu_payload
- rtc::ArrayView<const uint8_t> payloads[] = {payload1};
+ ArrayView<const uint8_t> payloads[] = {payload1};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- rtc::ArrayView<const uint8_t> frame_view(*frame);
+ ArrayView<const uint8_t> frame_view(*frame);
EXPECT_TRUE(frame_view[0] & kObuHeaderHasSize);
EXPECT_EQ(frame_view[2], 3);
}
@@ -183,10 +183,10 @@
const uint8_t payload1[] = {0b00'01'0000, // aggregation header
0b0'0110'000, // / Frame
20}; // \ OBU
- rtc::ArrayView<const uint8_t> payloads[] = {payload1};
+ ArrayView<const uint8_t> payloads[] = {payload1};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- EXPECT_THAT(rtc::ArrayView<const uint8_t>(*frame),
+ EXPECT_THAT(ArrayView<const uint8_t>(*frame),
ElementsAre(0b0'0110'010, 1, 20));
}
@@ -197,10 +197,10 @@
10, // \ OBU
0b0'0110'000, // / Frame
20}; // \ OBU
- rtc::ArrayView<const uint8_t> payloads[] = {payload1};
+ ArrayView<const uint8_t> payloads[] = {payload1};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- EXPECT_THAT(rtc::ArrayView<const uint8_t>(*frame),
+ EXPECT_THAT(ArrayView<const uint8_t>(*frame),
ElementsAre(0b0'0001'010, 1, 10, // Sequence Header OBU
0b0'0110'010, 1, 20)); // Frame OBU
}
@@ -210,10 +210,10 @@
0b0'0110'000, 20, 30};
const uint8_t payload2[] = {0b10'01'0000, // aggregation header
40};
- rtc::ArrayView<const uint8_t> payloads[] = {payload1, payload2};
+ ArrayView<const uint8_t> payloads[] = {payload1, payload2};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- EXPECT_THAT(rtc::ArrayView<const uint8_t>(*frame),
+ EXPECT_THAT(ArrayView<const uint8_t>(*frame),
ElementsAre(0b0'0110'010, 3, 20, 30, 40));
}
@@ -227,10 +227,10 @@
30}; //
const uint8_t payload2[] = {0b10'01'0000, // aggregation header
40}; //
- rtc::ArrayView<const uint8_t> payloads[] = {payload1, payload2};
+ ArrayView<const uint8_t> payloads[] = {payload1, payload2};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- EXPECT_THAT(rtc::ArrayView<const uint8_t>(*frame),
+ EXPECT_THAT(ArrayView<const uint8_t>(*frame),
ElementsAre(0b0'0001'010, 1, 10, // SH
0b0'0110'010, 3, 20, 30, 40)); // Frame
}
@@ -258,10 +258,10 @@
const uint8_t payload2[] = {0b10'01'0000, // aggregation header
70, 80, 90}; // \ tail of the frame OBU
- rtc::ArrayView<const uint8_t> payloads[] = {payload1, payload2};
+ ArrayView<const uint8_t> payloads[] = {payload1, payload2};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- EXPECT_THAT(rtc::ArrayView<const uint8_t>(*frame),
+ EXPECT_THAT(ArrayView<const uint8_t>(*frame),
ElementsAre( // Sequence header OBU
0b0'0001'010, 1, 10,
// Metadata OBU without extension
@@ -282,11 +282,11 @@
const uint8_t payload4[] = {0b10'01'0000, // aggregation header
18};
- rtc::ArrayView<const uint8_t> payloads[] = {payload1, payload2, payload3,
- payload4};
+ ArrayView<const uint8_t> payloads[] = {payload1, payload2, payload3,
+ payload4};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- EXPECT_THAT(rtc::ArrayView<const uint8_t>(*frame),
+ EXPECT_THAT(ArrayView<const uint8_t>(*frame),
ElementsAre(0b0'0110'010, 8, 11, 12, 13, 14, 15, 16, 17, 18));
}
@@ -314,11 +314,11 @@
32};
const uint8_t payload4[] = {0b10'01'0000, // aggregation header
33, 34, 35, 36};
- rtc::ArrayView<const uint8_t> payloads[] = {payload1, payload2, payload3,
- payload4};
+ ArrayView<const uint8_t> payloads[] = {payload1, payload2, payload3,
+ payload4};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- EXPECT_THAT(rtc::ArrayView<const uint8_t>(*frame),
+ EXPECT_THAT(ArrayView<const uint8_t>(*frame),
ElementsAre(0b0'0011'010, 2, 11, 12, // Frame header
0b0'0100'010, 7, 21, 22, 23, 24, 25, 26, 27, //
0b0'0111'010, 2, 11, 12, //
@@ -334,11 +334,11 @@
payload1[2] = 0x01; // in two bytes
payload1[3] = 0b0'0110'000; // obu_header with size and extension bits unset.
payload1[4 + 42] = 0x42;
- rtc::ArrayView<const uint8_t> payloads[] = {payload1};
+ ArrayView<const uint8_t> payloads[] = {payload1};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
EXPECT_EQ(frame->size(), 2 + 127u);
- rtc::ArrayView<const uint8_t> frame_view(*frame);
+ ArrayView<const uint8_t> frame_view(*frame);
EXPECT_EQ(frame_view[0], 0b0'0110'010); // obu_header with size bit set.
EXPECT_EQ(frame_view[1], 127); // obu payload size, 1 byte enough to encode.
// Check 'random' byte from the payload is at the same 'random' offset.
@@ -359,11 +359,11 @@
payload2[1] = 96; // leb128 encoded size of 96 bytes in one byte
payload2[2 + 20] = 0x20;
- rtc::ArrayView<const uint8_t> payloads[] = {payload1, payload2};
+ ArrayView<const uint8_t> payloads[] = {payload1, payload2};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
EXPECT_EQ(frame->size(), 3 + 128u);
- rtc::ArrayView<const uint8_t> frame_view(*frame);
+ ArrayView<const uint8_t> frame_view(*frame);
EXPECT_EQ(frame_view[0], 0b0'0110'010); // obu_header with size bit set.
EXPECT_EQ(frame_view[1], 0x80); // obu payload size of 128 bytes.
EXPECT_EQ(frame_view[2], 0x01); // encoded in two byes
@@ -376,11 +376,11 @@
AssembleFrameFromAlmostEmptyPacketStartingAnOBU) {
const uint8_t payload1[] = {0b01'01'0000};
const uint8_t payload2[] = {0b10'01'0000, 0b0'0110'000, 10, 20, 30};
- rtc::ArrayView<const uint8_t> payloads[] = {payload1, payload2};
+ ArrayView<const uint8_t> payloads[] = {payload1, payload2};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- EXPECT_THAT(rtc::ArrayView<const uint8_t>(*frame),
+ EXPECT_THAT(ArrayView<const uint8_t>(*frame),
ElementsAre(0b0'0110'010, 3, 10, 20, 30));
}
@@ -388,11 +388,11 @@
AssembleFrameFromAlmostEmptyPacketFinishingAnOBU) {
const uint8_t payload1[] = {0b01'01'0000, 0b0'0110'000, 10, 20, 30};
const uint8_t payload2[] = {0b10'01'0000};
- rtc::ArrayView<const uint8_t> payloads[] = {payload1, payload2};
+ ArrayView<const uint8_t> payloads[] = {payload1, payload2};
auto frame = VideoRtpDepacketizerAv1().AssembleFrame(payloads);
ASSERT_TRUE(frame);
- EXPECT_THAT(rtc::ArrayView<const uint8_t>(*frame),
+ EXPECT_THAT(ArrayView<const uint8_t>(*frame),
ElementsAre(0b0'0110'010, 3, 10, 20, 30));
}
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc
index 2acd56a..1ac96a2 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.cc
@@ -36,7 +36,7 @@
} // namespace
std::optional<VideoRtpDepacketizer::ParsedRtpPayload>
-VideoRtpDepacketizerGeneric::Parse(rtc::CopyOnWriteBuffer rtp_payload) {
+VideoRtpDepacketizerGeneric::Parse(CopyOnWriteBuffer rtp_payload) {
if (rtp_payload.size() == 0) {
RTC_LOG(LS_WARNING) << "Empty payload.";
return std::nullopt;
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.h b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.h
index a85bd43..91b34fb 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.h
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic.h
@@ -22,8 +22,7 @@
public:
~VideoRtpDepacketizerGeneric() override = default;
- std::optional<ParsedRtpPayload> Parse(
- rtc::CopyOnWriteBuffer rtp_payload) override;
+ std::optional<ParsedRtpPayload> Parse(CopyOnWriteBuffer rtp_payload) override;
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic_unittest.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic_unittest.cc
index 6e0663e..e808eff 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_generic_unittest.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_generic_unittest.cc
@@ -30,7 +30,7 @@
TEST(VideoRtpDepacketizerGeneric, NonExtendedHeaderNoFrameId) {
const size_t kRtpPayloadSize = 10;
const uint8_t kPayload[kRtpPayloadSize] = {0x01};
- rtc::CopyOnWriteBuffer rtp_payload(kPayload);
+ CopyOnWriteBuffer rtp_payload(kPayload);
VideoRtpDepacketizerGeneric depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
@@ -44,7 +44,7 @@
TEST(VideoRtpDepacketizerGeneric, ExtendedHeaderParsesFrameId) {
const size_t kRtpPayloadSize = 10;
const uint8_t kPayload[kRtpPayloadSize] = {0x05, 0x13, 0x37};
- rtc::CopyOnWriteBuffer rtp_payload(kPayload);
+ CopyOnWriteBuffer rtp_payload(kPayload);
VideoRtpDepacketizerGeneric depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
@@ -60,7 +60,7 @@
TEST(VideoRtpDepacketizerGeneric, PassRtpPayloadAsVideoPayload) {
const uint8_t kPayload[] = {0x01, 0x25, 0x52};
- rtc::CopyOnWriteBuffer rtp_payload(kPayload);
+ CopyOnWriteBuffer rtp_payload(kPayload);
VideoRtpDepacketizerGeneric depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.cc
index 2ff754e..54b85e5 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.cc
@@ -40,9 +40,9 @@
constexpr size_t kFuAHeaderSize = 2;
constexpr size_t kLengthFieldSize = 2;
-std::vector<rtc::ArrayView<const uint8_t>> ParseStapA(
- rtc::ArrayView<const uint8_t> data) {
- std::vector<rtc::ArrayView<const uint8_t>> nal_units;
+std::vector<ArrayView<const uint8_t>> ParseStapA(
+ ArrayView<const uint8_t> data) {
+ std::vector<ArrayView<const uint8_t>> nal_units;
ByteBufferReader reader(data);
if (!reader.Consume(kNalHeaderSize)) {
return nal_units;
@@ -63,12 +63,12 @@
}
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> ProcessStapAOrSingleNalu(
- rtc::CopyOnWriteBuffer rtp_payload) {
- rtc::ArrayView<const uint8_t> payload_data(rtp_payload);
+ CopyOnWriteBuffer rtp_payload) {
+ ArrayView<const uint8_t> payload_data(rtp_payload);
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed_payload(
std::in_place);
bool modified_buffer = false;
- rtc::Buffer output_buffer;
+ Buffer output_buffer;
parsed_payload->video_payload = rtp_payload;
parsed_payload->video_header.width = 0;
parsed_payload->video_header.height = 0;
@@ -79,7 +79,7 @@
.emplace<RTPVideoHeaderH264>();
uint8_t nal_type = payload_data[0] & kH264TypeMask;
- std::vector<rtc::ArrayView<const uint8_t>> nal_units;
+ std::vector<ArrayView<const uint8_t>> nal_units;
if (nal_type == H264::NaluType::kStapA) {
nal_units = ParseStapA(payload_data);
if (nal_units.empty()) {
@@ -96,13 +96,12 @@
parsed_payload->video_header.frame_type = VideoFrameType::kVideoFrameDelta;
- for (const rtc::ArrayView<const uint8_t>& nal_unit : nal_units) {
+ for (const ArrayView<const uint8_t>& nal_unit : nal_units) {
NaluInfo nalu;
nalu.type = nal_unit[0] & kH264TypeMask;
nalu.sps_id = -1;
nalu.pps_id = -1;
- rtc::ArrayView<const uint8_t> nalu_data =
- nal_unit.subview(H264::kNaluTypeSize);
+ ArrayView<const uint8_t> nalu_data = nal_unit.subview(H264::kNaluTypeSize);
if (nalu_data.empty()) {
RTC_LOG(LS_WARNING) << "Skipping empty NAL unit.";
@@ -228,7 +227,7 @@
}
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> ParseFuaNalu(
- rtc::CopyOnWriteBuffer rtp_payload) {
+ CopyOnWriteBuffer rtp_payload) {
if (rtp_payload.size() < kFuAHeaderSize) {
RTC_LOG(LS_ERROR) << "FU-A NAL units truncated.";
return std::nullopt;
@@ -247,7 +246,7 @@
if (original_nal_type == H264::NaluType::kIdr ||
original_nal_type == H264::NaluType::kSlice) {
std::optional<PpsParser::SliceHeader> slice_header =
- PpsParser::ParseSliceHeader(rtc::ArrayView<const uint8_t>(rtp_payload)
+ PpsParser::ParseSliceHeader(ArrayView<const uint8_t>(rtp_payload)
.subview(2 * kNalHeaderSize));
if (slice_header) {
nalu.pps_id = slice_header->pic_parameter_set_id;
@@ -293,7 +292,7 @@
} // namespace
std::optional<VideoRtpDepacketizer::ParsedRtpPayload>
-VideoRtpDepacketizerH264::Parse(rtc::CopyOnWriteBuffer rtp_payload) {
+VideoRtpDepacketizerH264::Parse(CopyOnWriteBuffer rtp_payload) {
if (rtp_payload.size() == 0) {
RTC_LOG(LS_ERROR) << "Empty payload.";
return std::nullopt;
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.h b/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.h
index 0953a12..3415afe 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.h
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_h264.h
@@ -21,8 +21,7 @@
public:
~VideoRtpDepacketizerH264() override = default;
- std::optional<ParsedRtpPayload> Parse(
- rtc::CopyOnWriteBuffer rtp_payload) override;
+ std::optional<ParsedRtpPayload> Parse(CopyOnWriteBuffer rtp_payload) override;
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_h264_unittest.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_h264_unittest.cc
index b670f52..c2ff144 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_h264_unittest.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_h264_unittest.cc
@@ -53,7 +53,7 @@
TEST(VideoRtpDepacketizerH264Test, SingleNalu) {
const uint8_t kPayload[] = {H264::kIdr, 0xFF}; // F=0, NRI=0, Type=5 (IDR).
- rtc::CopyOnWriteBuffer rtp_payload(kPayload);
+ CopyOnWriteBuffer rtp_payload(kPayload);
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
@@ -79,7 +79,7 @@
0x03, 0x2A, 0xE0, 0xF1, 0x83, 0x25
};
// clang-format on
- rtc::CopyOnWriteBuffer rtp_payload(kPayload);
+ CopyOnWriteBuffer rtp_payload(kPayload);
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
@@ -116,7 +116,7 @@
0x0
};
// clang-format on
- rtc::CopyOnWriteBuffer rtp_payload(kPayload);
+ CopyOnWriteBuffer rtp_payload(kPayload);
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
@@ -149,7 +149,7 @@
H264::kIdr, 0xFF, 0x00, 0x11
};
// clang-format on
- rtc::CopyOnWriteBuffer rtp_payload(kPayload);
+ CopyOnWriteBuffer rtp_payload(kPayload);
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
@@ -193,17 +193,15 @@
// clang-format on
VideoRtpDepacketizerH264 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(lone_empty_packet)));
- EXPECT_FALSE(
- depacketizer.Parse(rtc::CopyOnWriteBuffer(leading_empty_packet)));
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(middle_empty_packet)));
- EXPECT_FALSE(
- depacketizer.Parse(rtc::CopyOnWriteBuffer(trailing_empty_packet)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(lone_empty_packet)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(leading_empty_packet)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(middle_empty_packet)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(trailing_empty_packet)));
}
TEST(VideoRtpDepacketizerH264Test, DepacketizeWithRewriting) {
- rtc::CopyOnWriteBuffer in_buffer;
- rtc::Buffer out_buffer;
+ CopyOnWriteBuffer in_buffer;
+ Buffer out_buffer;
uint8_t kHeader[] = {H264::kStapA, 0x00};
in_buffer.AppendData(kHeader, 1);
@@ -231,14 +229,14 @@
VideoRtpDepacketizerH264 depacketizer;
auto parsed = depacketizer.Parse(in_buffer);
ASSERT_TRUE(parsed);
- EXPECT_THAT(rtc::MakeArrayView(parsed->video_payload.cdata(),
- parsed->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed->video_payload.cdata(),
+ parsed->video_payload.size()),
ElementsAreArray(out_buffer));
}
TEST(VideoRtpDepacketizerH264Test, DepacketizeWithDoubleRewriting) {
- rtc::CopyOnWriteBuffer in_buffer;
- rtc::Buffer out_buffer;
+ CopyOnWriteBuffer in_buffer;
+ Buffer out_buffer;
uint8_t kHeader[] = {H264::kStapA, 0x00};
in_buffer.AppendData(kHeader, 1);
@@ -276,8 +274,8 @@
ASSERT_TRUE(parsed);
std::vector<uint8_t> expected_packet_payload(
out_buffer.data(), &out_buffer.data()[out_buffer.size()]);
- EXPECT_THAT(rtc::MakeArrayView(parsed->video_payload.cdata(),
- parsed->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed->video_payload.cdata(),
+ parsed->video_payload.size()),
ElementsAreArray(out_buffer));
}
@@ -294,7 +292,7 @@
H264::kSlice, 0xFF, 0x00, 0x11
};
// clang-format on
- rtc::CopyOnWriteBuffer rtp_payload(kPayload);
+ CopyOnWriteBuffer rtp_payload(kPayload);
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
@@ -342,12 +340,12 @@
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed1 =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload1));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload1));
ASSERT_TRUE(parsed1);
// We expect that the first packet is one byte shorter since the FU-A header
// has been replaced by the original nal header.
- EXPECT_THAT(rtc::MakeArrayView(parsed1->video_payload.cdata(),
- parsed1->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed1->video_payload.cdata(),
+ parsed1->video_payload.size()),
ElementsAreArray(kExpected1));
EXPECT_EQ(parsed1->video_header.frame_type, VideoFrameType::kVideoFrameKey);
EXPECT_EQ(parsed1->video_header.codec, kVideoCodecH264);
@@ -365,9 +363,9 @@
// Following packets will be 2 bytes shorter since they will only be appended
// onto the first packet.
- auto parsed2 = depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload2));
- EXPECT_THAT(rtc::MakeArrayView(parsed2->video_payload.cdata(),
- parsed2->video_payload.size()),
+ auto parsed2 = depacketizer.Parse(CopyOnWriteBuffer(kPayload2));
+ EXPECT_THAT(MakeArrayView(parsed2->video_payload.cdata(),
+ parsed2->video_payload.size()),
ElementsAreArray(kExpected2));
EXPECT_FALSE(parsed2->video_header.is_first_packet_in_frame);
EXPECT_EQ(parsed2->video_header.codec, kVideoCodecH264);
@@ -380,9 +378,9 @@
EXPECT_THAT(h264.nalus, IsEmpty());
}
- auto parsed3 = depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload3));
- EXPECT_THAT(rtc::MakeArrayView(parsed3->video_payload.cdata(),
- parsed3->video_payload.size()),
+ auto parsed3 = depacketizer.Parse(CopyOnWriteBuffer(kPayload3));
+ EXPECT_THAT(MakeArrayView(parsed3->video_payload.cdata(),
+ parsed3->video_payload.size()),
ElementsAreArray(kExpected3));
EXPECT_FALSE(parsed3->video_header.is_first_packet_in_frame);
EXPECT_EQ(parsed3->video_header.codec, kVideoCodecH264);
@@ -397,7 +395,7 @@
}
TEST(VideoRtpDepacketizerH264Test, EmptyPayload) {
- rtc::CopyOnWriteBuffer empty;
+ CopyOnWriteBuffer empty;
VideoRtpDepacketizerH264 depacketizer;
EXPECT_FALSE(depacketizer.Parse(empty));
}
@@ -405,25 +403,25 @@
TEST(VideoRtpDepacketizerH264Test, TruncatedFuaNalu) {
const uint8_t kPayload[] = {0x9c};
VideoRtpDepacketizerH264 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH264Test, TruncatedSingleStapANalu) {
const uint8_t kPayload[] = {0xd8, 0x27};
VideoRtpDepacketizerH264 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH264Test, StapAPacketWithTruncatedNalUnits) {
const uint8_t kPayload[] = {0x58, 0xCB, 0xED, 0xDF};
VideoRtpDepacketizerH264 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH264Test, TruncationJustAfterSingleStapANalu) {
const uint8_t kPayload[] = {0x38, 0x27, 0x27};
VideoRtpDepacketizerH264 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH264Test, SeiPacket) {
@@ -432,7 +430,7 @@
0x03, 0x03, 0x03, 0x03 // Payload.
};
VideoRtpDepacketizerH264 depacketizer;
- auto parsed = depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ auto parsed = depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed);
const RTPVideoHeaderH264& h264 =
std::get<RTPVideoHeaderH264>(parsed->video_header.video_type_header);
@@ -448,7 +446,7 @@
TEST(VideoRtpDepacketizerH264Test, ShortSpsPacket) {
const uint8_t kPayload[] = {0x27, 0x80, 0x00};
VideoRtpDepacketizerH264 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH264Test, BadSps) {
@@ -456,7 +454,7 @@
H264::kSps, 0x42, 0x41, 0x2a, 0xd3, 0x93, 0xd3, 0x3b // Payload.
};
VideoRtpDepacketizerH264 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH264Test, BadPps) {
@@ -465,7 +463,7 @@
0x00 // Payload.
};
VideoRtpDepacketizerH264 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH264Test, BadSlice) {
@@ -474,7 +472,7 @@
0xc0 // Payload.
};
VideoRtpDepacketizerH264 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH264Test, StapASpsPpsMultiSlice) {
@@ -523,7 +521,7 @@
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed);
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
}
@@ -544,7 +542,7 @@
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed);
EXPECT_FALSE(parsed->video_header.is_first_packet_in_frame);
}
@@ -558,7 +556,7 @@
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed);
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
}
@@ -573,7 +571,7 @@
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed);
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
}
@@ -587,7 +585,7 @@
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed);
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
}
@@ -596,7 +594,7 @@
const uint8_t kPayload[] = {H264::kEndOfSequence};
VideoRtpDepacketizerH264 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed);
}
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.cc
index 8415d80..4af35dc 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.cc
@@ -62,7 +62,7 @@
// Aggregation Packet (AP) strcture
// https://datatracker.ietf.org/doc/html/rfc7798#section-4.4.2
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> ProcessApOrSingleNalu(
- rtc::CopyOnWriteBuffer rtp_payload) {
+ CopyOnWriteBuffer rtp_payload) {
if (rtp_payload.size() < kH265PayloadHeaderSizeBytes) {
RTC_LOG(LS_ERROR) << "RTP payload truncated.";
return std::nullopt;
@@ -79,7 +79,7 @@
const size_t nalu_length = rtp_payload.size() - kH265PayloadHeaderSizeBytes;
uint8_t nal_type = (payload_data[0] & kH265TypeMask) >> 1;
std::vector<size_t> nalu_start_offsets;
- rtc::CopyOnWriteBuffer video_payload;
+ CopyOnWriteBuffer video_payload;
if (nal_type == H265::NaluType::kAp) {
// Skip the aggregated packet header (Aggregated packet NAL type + length).
if (rtp_payload.size() <= kH265ApHeaderSizeBytes) {
@@ -118,8 +118,8 @@
uint8_t nalu_type = (payload_data[start_offset] & kH265TypeMask) >> 1;
start_offset += kH265NalHeaderSizeBytes;
- rtc::ArrayView<const uint8_t> nalu_data(&payload_data[start_offset],
- end_offset - start_offset);
+ ArrayView<const uint8_t> nalu_data(&payload_data[start_offset],
+ end_offset - start_offset);
switch (nalu_type) {
case H265::NaluType::kBlaWLp:
case H265::NaluType::kBlaWRadl:
@@ -190,7 +190,7 @@
// Fragmentation Unit (FU) structure:
// https://datatracker.ietf.org/doc/html/rfc7798#section-4.4.3
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> ParseFuNalu(
- rtc::CopyOnWriteBuffer rtp_payload) {
+ CopyOnWriteBuffer rtp_payload) {
if (rtp_payload.size() < kH265FuHeaderSizeBytes + kH265NalHeaderSizeBytes) {
RTC_LOG(LS_ERROR) << "FU NAL units truncated.";
return std::nullopt;
@@ -213,8 +213,8 @@
kH265FuHeaderSizeBytes + kH265PayloadHeaderSizeBytes;
std::optional<bool> first_slice_segment_in_pic_flag =
H265BitstreamParser::IsFirstSliceSegmentInPic(
- rtc::ArrayView<const uint8_t>(rtp_payload.cdata() + slice_offset,
- rtp_payload.size() - slice_offset));
+ ArrayView<const uint8_t>(rtp_payload.cdata() + slice_offset,
+ rtp_payload.size() - slice_offset));
if (first_slice_segment_in_pic_flag.value_or(false)) {
is_first_packet_in_frame = true;
}
@@ -223,7 +223,7 @@
kH265FuHeaderSizeBytes, rtp_payload.size() - kH265FuHeaderSizeBytes);
rtp_payload.MutableData()[0] = f | original_nal_type << 1 | layer_id_h;
rtp_payload.MutableData()[1] = layer_id_l_unshifted | tid;
- rtc::CopyOnWriteBuffer video_payload;
+ CopyOnWriteBuffer video_payload;
// Insert start code before the first fragment in FU.
video_payload.AppendData(kStartCode);
video_payload.AppendData(rtp_payload);
@@ -254,7 +254,7 @@
} // namespace
std::optional<VideoRtpDepacketizer::ParsedRtpPayload>
-VideoRtpDepacketizerH265::Parse(rtc::CopyOnWriteBuffer rtp_payload) {
+VideoRtpDepacketizerH265::Parse(CopyOnWriteBuffer rtp_payload) {
if (rtp_payload.empty()) {
RTC_LOG(LS_ERROR) << "Empty payload.";
return std::nullopt;
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.h b/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.h
index 27f3e53..d9e075c 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.h
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_h265.h
@@ -21,8 +21,7 @@
public:
~VideoRtpDepacketizerH265() override = default;
- std::optional<ParsedRtpPayload> Parse(
- rtc::CopyOnWriteBuffer rtp_payload) override;
+ std::optional<ParsedRtpPayload> Parse(CopyOnWriteBuffer rtp_payload) override;
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_h265_unittest.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_h265_unittest.cc
index 3469a0b..ba7348a 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_h265_unittest.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_h265_unittest.cc
@@ -37,15 +37,15 @@
uint8_t packet[3] = {0x26, 0x02,
0xFF}; // F=0, Type=19 (Idr), LayerId=0, TID=2.
uint8_t expected_packet[] = {0x00, 0x00, 0x00, 0x01, 0x26, 0x02, 0xff};
- rtc::CopyOnWriteBuffer rtp_payload(packet);
+ CopyOnWriteBuffer rtp_payload(packet);
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
depacketizer.Parse(rtp_payload);
ASSERT_TRUE(parsed);
- EXPECT_THAT(rtc::MakeArrayView(parsed->video_payload.cdata(),
- parsed->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed->video_payload.cdata(),
+ parsed->video_payload.size()),
ElementsAreArray(expected_packet));
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameKey);
EXPECT_EQ(parsed->video_header.codec, kVideoCodecH265);
@@ -71,15 +71,15 @@
0x03, 0x00, 0x9d, 0x08, 0x00, 0x00, 0x03, 0x00, 0x00, 0x5d, 0xb0,
0x02, 0x80, 0x80, 0x2d, 0x16, 0x59, 0x59, 0xa4, 0x93, 0x2b, 0x80,
0x40, 0x00, 0x00, 0x03, 0x00, 0x40, 0x00, 0x00, 0x07, 0x82};
- rtc::CopyOnWriteBuffer rtp_payload(packet);
+ CopyOnWriteBuffer rtp_payload(packet);
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
depacketizer.Parse(rtp_payload);
ASSERT_TRUE(parsed);
- EXPECT_THAT(rtc::MakeArrayView(parsed->video_payload.cdata(),
- parsed->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed->video_payload.cdata(),
+ parsed->video_payload.size()),
ElementsAreArray(expected_packet));
EXPECT_EQ(parsed->video_header.codec, kVideoCodecH265);
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
@@ -89,7 +89,7 @@
TEST(VideoRtpDepacketizerH265Test, PaciPackets) {
uint8_t packet[2] = {0x64, 0x02}; // F=0, Type=50 (PACI), LayerId=0, TID=2.
- rtc::CopyOnWriteBuffer rtp_payload(packet);
+ CopyOnWriteBuffer rtp_payload(packet);
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
@@ -135,7 +135,7 @@
0x7b, 0x30, 0x1c, 0xd7, 0xd4, 0x3a, 0xec, 0xad, 0xef, 0x73};
uint8_t idr[] = {0x26, 0x02, 0xaf, 0x08, 0x4a, 0x31, 0x11, 0x15, 0xe5, 0xc0};
- rtc::Buffer packet;
+ Buffer packet;
packet.AppendData(payload_header);
packet.AppendData(vps_nalu_size);
packet.AppendData(vps);
@@ -146,7 +146,7 @@
packet.AppendData(slice_nalu_size);
packet.AppendData(idr);
- rtc::Buffer expected_packet;
+ Buffer expected_packet;
expected_packet.AppendData(start_code);
expected_packet.AppendData(vps);
expected_packet.AppendData(start_code);
@@ -157,15 +157,15 @@
expected_packet.AppendData(idr);
// clang-format on
- rtc::CopyOnWriteBuffer rtp_payload(packet);
+ CopyOnWriteBuffer rtp_payload(packet);
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
depacketizer.Parse(rtp_payload);
ASSERT_TRUE(parsed);
- EXPECT_THAT(rtc::MakeArrayView(parsed->video_payload.cdata(),
- parsed->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed->video_payload.cdata(),
+ parsed->video_payload.size()),
ElementsAreArray(expected_packet));
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameKey);
EXPECT_EQ(parsed->video_header.codec, kVideoCodecH265);
@@ -195,7 +195,7 @@
0x7b, 0x30, 0x1c, 0xd7, 0xd4, 0x3a, 0xec, 0xad, 0xef, 0x73};
uint8_t idr[] = {0x26, 0x02, 0xaf, 0x08, 0x4a, 0x31, 0x11, 0x15, 0xe5, 0xc0};
- rtc::Buffer packet;
+ Buffer packet;
packet.AppendData(payload_header);
packet.AppendData(vps_nalu_size);
packet.AppendData(vps);
@@ -206,7 +206,7 @@
packet.AppendData(slice_nalu_size);
packet.AppendData(idr);
- rtc::Buffer expected_packet;
+ Buffer expected_packet;
expected_packet.AppendData(start_code);
expected_packet.AppendData(vps);
expected_packet.AppendData(start_code);
@@ -216,15 +216,15 @@
expected_packet.AppendData(start_code);
expected_packet.AppendData(idr);
- rtc::CopyOnWriteBuffer rtp_payload(packet);
+ CopyOnWriteBuffer rtp_payload(packet);
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
depacketizer.Parse(rtp_payload);
ASSERT_TRUE(parsed);
- EXPECT_THAT(rtc::MakeArrayView(parsed->video_payload.cdata(),
- parsed->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed->video_payload.cdata(),
+ parsed->video_payload.size()),
ElementsAreArray(expected_packet));
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameKey);
EXPECT_EQ(parsed->video_header.codec, kVideoCodecH265);
@@ -249,12 +249,10 @@
0x00, 0x00};
VideoRtpDepacketizerH265 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(lone_empty_packet)));
- EXPECT_FALSE(
- depacketizer.Parse(rtc::CopyOnWriteBuffer(leading_empty_packet)));
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(middle_empty_packet)));
- EXPECT_FALSE(
- depacketizer.Parse(rtc::CopyOnWriteBuffer(trailing_empty_packet)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(lone_empty_packet)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(leading_empty_packet)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(middle_empty_packet)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(trailing_empty_packet)));
}
TEST(VideoRtpDepacketizerH265Test, ApDelta) {
@@ -267,15 +265,15 @@
0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0xFF, // TrailR
0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0xFF, 0x00, // TrailR
0x00, 0x00, 0x00, 0x01, 0x02, 0x02, 0xFF, 0x00, 0x11}; // TrailR
- rtc::CopyOnWriteBuffer rtp_payload(packet);
+ CopyOnWriteBuffer rtp_payload(packet);
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
depacketizer.Parse(rtp_payload);
ASSERT_TRUE(parsed);
- EXPECT_THAT(rtc::MakeArrayView(parsed->video_payload.cdata(),
- parsed->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed->video_payload.cdata(),
+ parsed->video_payload.size()),
ElementsAreArray(expected_packet));
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameDelta);
@@ -312,12 +310,12 @@
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed1 =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(packet1));
+ depacketizer.Parse(CopyOnWriteBuffer(packet1));
ASSERT_TRUE(parsed1);
// We expect that the first packet is one byte shorter since the FU header
// has been replaced by the original nal header.
- EXPECT_THAT(rtc::MakeArrayView(parsed1->video_payload.cdata(),
- parsed1->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed1->video_payload.cdata(),
+ parsed1->video_payload.size()),
ElementsAreArray(kExpected1));
EXPECT_EQ(parsed1->video_header.frame_type, VideoFrameType::kVideoFrameKey);
EXPECT_EQ(parsed1->video_header.codec, kVideoCodecH265);
@@ -325,17 +323,17 @@
// Following packets will be 2 bytes shorter since they will only be appended
// onto the first packet.
- auto parsed2 = depacketizer.Parse(rtc::CopyOnWriteBuffer(packet2));
- EXPECT_THAT(rtc::MakeArrayView(parsed2->video_payload.cdata(),
- parsed2->video_payload.size()),
+ auto parsed2 = depacketizer.Parse(CopyOnWriteBuffer(packet2));
+ EXPECT_THAT(MakeArrayView(parsed2->video_payload.cdata(),
+ parsed2->video_payload.size()),
ElementsAreArray(kExpected2));
EXPECT_FALSE(parsed2->video_header.is_first_packet_in_frame);
EXPECT_EQ(parsed2->video_header.frame_type, VideoFrameType::kVideoFrameKey);
EXPECT_EQ(parsed2->video_header.codec, kVideoCodecH265);
- auto parsed3 = depacketizer.Parse(rtc::CopyOnWriteBuffer(packet3));
- EXPECT_THAT(rtc::MakeArrayView(parsed3->video_payload.cdata(),
- parsed3->video_payload.size()),
+ auto parsed3 = depacketizer.Parse(CopyOnWriteBuffer(packet3));
+ EXPECT_THAT(MakeArrayView(parsed3->video_payload.cdata(),
+ parsed3->video_payload.size()),
ElementsAreArray(kExpected3));
EXPECT_FALSE(parsed3->video_header.is_first_packet_in_frame);
EXPECT_EQ(parsed3->video_header.frame_type, VideoFrameType::kVideoFrameKey);
@@ -343,7 +341,7 @@
}
TEST(VideoRtpDepacketizerH265Test, EmptyPayload) {
- rtc::CopyOnWriteBuffer empty;
+ CopyOnWriteBuffer empty;
VideoRtpDepacketizerH265 depacketizer;
EXPECT_FALSE(depacketizer.Parse(empty));
}
@@ -351,31 +349,31 @@
TEST(VideoRtpDepacketizerH265Test, TruncatedFuNalu) {
const uint8_t kPayload[] = {0x62};
VideoRtpDepacketizerH265 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH265Test, TruncatedSingleApNalu) {
const uint8_t kPayload[] = {0xe0, 0x02, 0x40};
VideoRtpDepacketizerH265 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH265Test, ApPacketWithTruncatedNalUnits) {
const uint8_t kPayload[] = {0x60, 0x02, 0xED, 0xDF};
VideoRtpDepacketizerH265 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH265Test, TruncationJustAfterSingleApNalu) {
const uint8_t kPayload[] = {0x60, 0x02, 0x40, 0x40};
VideoRtpDepacketizerH265 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH265Test, ShortSpsPacket) {
const uint8_t kPayload[] = {0x40, 0x80, 0x00};
VideoRtpDepacketizerH265 depacketizer;
- EXPECT_TRUE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_TRUE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH265Test, InvalidNaluSizeApNalu) {
@@ -385,7 +383,7 @@
0, 0x05, 0x02, 0x02, 0xFF, 0x00,
0x11}; // TrailR;
VideoRtpDepacketizerH265 depacketizer;
- EXPECT_FALSE(depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload)));
+ EXPECT_FALSE(depacketizer.Parse(CopyOnWriteBuffer(kPayload)));
}
TEST(VideoRtpDepacketizerH265Test, PrefixSeiSetsFirstPacketInFrame) {
@@ -394,7 +392,7 @@
0x03, 0x03, 0x03, 0x03 // Payload.
};
VideoRtpDepacketizerH265 depacketizer;
- auto parsed = depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ auto parsed = depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed.has_value());
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
}
@@ -425,7 +423,7 @@
uint8_t idr_slice2[] = {0x28, 0x01, 0x27, 0xf8, 0x63,
0x6d, 0x7b, 0x6f, 0xcf, 0xff};
- rtc::CopyOnWriteBuffer rtp_payload;
+ CopyOnWriteBuffer rtp_payload;
rtp_payload.AppendData(payload_header);
rtp_payload.AppendData(vps_nalu_size);
rtp_payload.AppendData(vps);
@@ -438,7 +436,7 @@
rtp_payload.AppendData(slice_nalu_size);
rtp_payload.AppendData(idr_slice2);
- rtc::Buffer expected_packet;
+ Buffer expected_packet;
expected_packet.AppendData(start_code);
expected_packet.AppendData(vps);
expected_packet.AppendData(start_code);
@@ -455,8 +453,8 @@
depacketizer.Parse(rtp_payload);
ASSERT_TRUE(parsed.has_value());
- EXPECT_THAT(rtc::MakeArrayView(parsed->video_payload.cdata(),
- parsed->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed->video_payload.cdata(),
+ parsed->video_payload.size()),
ElementsAreArray(expected_packet));
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameKey);
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
@@ -473,14 +471,14 @@
uint8_t non_idr_slice2[] = {0x02, 0x01, 0x27, 0xf8, 0x20,
0x42, 0xad, 0x1b, 0x68, 0xe0};
- rtc::CopyOnWriteBuffer rtp_payload;
+ CopyOnWriteBuffer rtp_payload;
rtp_payload.AppendData(payload_header);
rtp_payload.AppendData(slice_nalu_size);
rtp_payload.AppendData(non_idr_slice1);
rtp_payload.AppendData(slice_nalu_size);
rtp_payload.AppendData(non_idr_slice2);
- rtc::Buffer expected_packet;
+ Buffer expected_packet;
expected_packet.AppendData(start_code);
expected_packet.AppendData(non_idr_slice1);
expected_packet.AppendData(start_code);
@@ -491,8 +489,8 @@
depacketizer.Parse(rtp_payload);
ASSERT_TRUE(parsed.has_value());
- EXPECT_THAT(rtc::MakeArrayView(parsed->video_payload.cdata(),
- parsed->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed->video_payload.cdata(),
+ parsed->video_payload.size()),
ElementsAreArray(expected_packet));
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameDelta);
EXPECT_FALSE(parsed->video_header.is_first_packet_in_frame);
@@ -509,14 +507,14 @@
uint8_t non_idr_slice2[] = {0x02, 0x01, 0x23, 0xfc, 0x20,
0x42, 0xad, 0x1b, 0x68, 0xdf};
- rtc::CopyOnWriteBuffer rtp_payload;
+ CopyOnWriteBuffer rtp_payload;
rtp_payload.AppendData(payload_header);
rtp_payload.AppendData(slice_nalu_size);
rtp_payload.AppendData(non_idr_slice1);
rtp_payload.AppendData(slice_nalu_size);
rtp_payload.AppendData(non_idr_slice2);
- rtc::Buffer expected_packet;
+ Buffer expected_packet;
expected_packet.AppendData(start_code);
expected_packet.AppendData(non_idr_slice1);
expected_packet.AppendData(start_code);
@@ -527,8 +525,8 @@
depacketizer.Parse(rtp_payload);
ASSERT_TRUE(parsed.has_value());
- EXPECT_THAT(rtc::MakeArrayView(parsed->video_payload.cdata(),
- parsed->video_payload.size()),
+ EXPECT_THAT(MakeArrayView(parsed->video_payload.cdata(),
+ parsed->video_payload.size()),
ElementsAreArray(expected_packet));
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameDelta);
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
@@ -543,7 +541,7 @@
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed.has_value());
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameKey);
EXPECT_FALSE(parsed->video_header.is_first_packet_in_frame);
@@ -558,7 +556,7 @@
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed.has_value());
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameDelta);
EXPECT_FALSE(parsed->video_header.is_first_packet_in_frame);
@@ -574,7 +572,7 @@
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed.has_value());
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameKey);
EXPECT_FALSE(parsed->video_header.is_first_packet_in_frame);
@@ -590,7 +588,7 @@
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed.has_value());
EXPECT_EQ(parsed->video_header.frame_type, VideoFrameType::kVideoFrameDelta);
EXPECT_FALSE(parsed->video_header.is_first_packet_in_frame);
@@ -601,7 +599,7 @@
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed.has_value());
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
}
@@ -616,7 +614,7 @@
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed.has_value());
EXPECT_TRUE(parsed->video_header.is_first_packet_in_frame);
}
@@ -626,7 +624,7 @@
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed.has_value());
EXPECT_FALSE(parsed->video_header.is_first_packet_in_frame);
}
@@ -635,7 +633,7 @@
const uint8_t kPayload[] = {0x48, 0x00}; // F=0, Type=36 (H265::kEos).
VideoRtpDepacketizerH265 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
- depacketizer.Parse(rtc::CopyOnWriteBuffer(kPayload));
+ depacketizer.Parse(CopyOnWriteBuffer(kPayload));
ASSERT_TRUE(parsed.has_value());
}
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.cc
index f18e344..6af4238 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.cc
@@ -19,7 +19,7 @@
namespace webrtc {
std::optional<VideoRtpDepacketizer::ParsedRtpPayload>
-VideoRtpDepacketizerRaw::Parse(rtc::CopyOnWriteBuffer rtp_payload) {
+VideoRtpDepacketizerRaw::Parse(CopyOnWriteBuffer rtp_payload) {
std::optional<ParsedRtpPayload> parsed(std::in_place);
parsed->video_payload = std::move(rtp_payload);
return parsed;
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.h b/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.h
index abd2d77..2ca0964 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.h
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_raw.h
@@ -22,8 +22,7 @@
public:
~VideoRtpDepacketizerRaw() override = default;
- std::optional<ParsedRtpPayload> Parse(
- rtc::CopyOnWriteBuffer rtp_payload) override;
+ std::optional<ParsedRtpPayload> Parse(CopyOnWriteBuffer rtp_payload) override;
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_raw_unittest.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_raw_unittest.cc
index e68a86c..126ec86 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_raw_unittest.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_raw_unittest.cc
@@ -23,7 +23,7 @@
TEST(VideoRtpDepacketizerRaw, PassRtpPayloadAsVideoPayload) {
const uint8_t kPayload[] = {0x05, 0x25, 0x52};
- rtc::CopyOnWriteBuffer rtp_payload(kPayload);
+ CopyOnWriteBuffer rtp_payload(kPayload);
VideoRtpDepacketizerRaw depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
@@ -38,7 +38,7 @@
TEST(VideoRtpDepacketizerRaw, UsesDefaultValuesForVideoHeader) {
const uint8_t kPayload[] = {0x05, 0x25, 0x52};
- rtc::CopyOnWriteBuffer rtp_payload(kPayload);
+ CopyOnWriteBuffer rtp_payload(kPayload);
VideoRtpDepacketizerRaw depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc
index b669d63..8d9bf6d 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.cc
@@ -139,9 +139,8 @@
} // namespace
std::optional<VideoRtpDepacketizer::ParsedRtpPayload>
-VideoRtpDepacketizerVp8::Parse(rtc::CopyOnWriteBuffer rtp_payload) {
- rtc::ArrayView<const uint8_t> payload(rtp_payload.cdata(),
- rtp_payload.size());
+VideoRtpDepacketizerVp8::Parse(CopyOnWriteBuffer rtp_payload) {
+ ArrayView<const uint8_t> payload(rtp_payload.cdata(), rtp_payload.size());
std::optional<ParsedRtpPayload> result(std::in_place);
int offset = ParseRtpPayload(payload, &result->video_header);
if (offset == kFailedToParse)
@@ -153,7 +152,7 @@
}
int VideoRtpDepacketizerVp8::ParseRtpPayload(
- rtc::ArrayView<const uint8_t> rtp_payload,
+ ArrayView<const uint8_t> rtp_payload,
RTPVideoHeader* video_header) {
RTC_DCHECK(video_header);
if (rtp_payload.empty()) {
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.h b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.h
index d303020..a01db9a 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.h
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8.h
@@ -30,11 +30,10 @@
// Parses vp8 rtp payload descriptor.
// Returns zero on error or vp8 payload header offset on success.
- static int ParseRtpPayload(rtc::ArrayView<const uint8_t> rtp_payload,
+ static int ParseRtpPayload(ArrayView<const uint8_t> rtp_payload,
RTPVideoHeader* video_header);
- std::optional<ParsedRtpPayload> Parse(
- rtc::CopyOnWriteBuffer rtp_payload) override;
+ std::optional<ParsedRtpPayload> Parse(CopyOnWriteBuffer rtp_payload) override;
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8_unittest.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8_unittest.cc
index 57a2ef0..9b7eee1 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8_unittest.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp8_unittest.cc
@@ -232,7 +232,7 @@
packet[1] = 0b1111'0000; // with all extensions,
packet[2] = 15; // and one-byte picture id.
- rtc::CopyOnWriteBuffer rtp_payload(packet);
+ CopyOnWriteBuffer rtp_payload(packet);
VideoRtpDepacketizerVp8 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
depacketizer.Parse(rtp_payload);
@@ -244,7 +244,7 @@
}
TEST(VideoRtpDepacketizerVp8Test, FailsOnEmptyPayload) {
- rtc::ArrayView<const uint8_t> empty;
+ ArrayView<const uint8_t> empty;
RTPVideoHeader video_header;
EXPECT_EQ(VideoRtpDepacketizerVp8::ParseRtpPayload(empty, &video_header), 0);
}
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc
index 80ab7cb..a0d21f4 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.cc
@@ -156,7 +156,7 @@
} // namespace
std::optional<VideoRtpDepacketizer::ParsedRtpPayload>
-VideoRtpDepacketizerVp9::Parse(rtc::CopyOnWriteBuffer rtp_payload) {
+VideoRtpDepacketizerVp9::Parse(CopyOnWriteBuffer rtp_payload) {
std::optional<ParsedRtpPayload> result(std::in_place);
int offset = ParseRtpPayload(rtp_payload, &result->video_header);
if (offset == 0)
@@ -168,7 +168,7 @@
}
int VideoRtpDepacketizerVp9::ParseRtpPayload(
- rtc::ArrayView<const uint8_t> rtp_payload,
+ ArrayView<const uint8_t> rtp_payload,
RTPVideoHeader* video_header) {
RTC_DCHECK(video_header);
// Parse mandatory first byte of payload descriptor.
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.h b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.h
index fb0dd14..d5d45ec 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.h
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9.h
@@ -30,11 +30,10 @@
// Parses vp9 rtp payload descriptor.
// Returns zero on error or vp9 payload header offset on success.
- static int ParseRtpPayload(rtc::ArrayView<const uint8_t> rtp_payload,
+ static int ParseRtpPayload(ArrayView<const uint8_t> rtp_payload,
RTPVideoHeader* video_header);
- std::optional<ParsedRtpPayload> Parse(
- rtc::CopyOnWriteBuffer rtp_payload) override;
+ std::optional<ParsedRtpPayload> Parse(CopyOnWriteBuffer rtp_payload) override;
};
} // namespace webrtc
diff --git a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9_unittest.cc b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9_unittest.cc
index c9fe6f9..91bd7f5 100644
--- a/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9_unittest.cc
+++ b/modules/rtp_rtcp/source/video_rtp_depacketizer_vp9_unittest.cc
@@ -322,7 +322,7 @@
}
TEST(VideoRtpDepacketizerVp9Test, ParseFailsForNoPayloadLength) {
- rtc::ArrayView<const uint8_t> empty;
+ ArrayView<const uint8_t> empty;
RTPVideoHeader video_header;
EXPECT_EQ(VideoRtpDepacketizerVp9::ParseRtpPayload(empty, &video_header), 0);
@@ -364,7 +364,7 @@
uint8_t packet[4] = {0};
packet[0] = 0x0C; // I:0 P:0 L:0 F:0 B:1 E:1 V:0 Z:0
- rtc::CopyOnWriteBuffer rtp_payload(packet);
+ CopyOnWriteBuffer rtp_payload(packet);
VideoRtpDepacketizerVp9 depacketizer;
std::optional<VideoRtpDepacketizer::ParsedRtpPayload> parsed =
depacketizer.Parse(rtp_payload);
diff --git a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
index a52d8ea..21591b4 100644
--- a/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
+++ b/modules/rtp_rtcp/test/testFec/test_packet_masks_metrics.cc
@@ -730,7 +730,7 @@
for (int num_fec_packets = 1; num_fec_packets <= num_media_packets;
num_fec_packets++) {
memset(packet_mask.get(), 0, num_media_packets * mask_bytes_fec_packet);
- rtc::ArrayView<const uint8_t> mask =
+ ArrayView<const uint8_t> mask =
mask_table.LookUp(num_media_packets, num_fec_packets);
memcpy(packet_mask.get(), &mask[0], mask.size());
// Convert to bit mask.
diff --git a/modules/utility/source/helpers_android.cc b/modules/utility/source/helpers_android.cc
index 9cfee8a..74e6ed9 100644
--- a/modules/utility/source/helpers_android.cc
+++ b/modules/utility/source/helpers_android.cc
@@ -94,7 +94,7 @@
// Adding debug log here so we can track down potential leaks and figure
// out why we sometimes see "Native thread exiting without having called
// DetachCurrentThread" in logcat outputs.
- ALOGD("Attaching thread to JVM[tid=%d]", rtc::CurrentThreadId());
+ ALOGD("Attaching thread to JVM[tid=%d]", CurrentThreadId());
jint res = jvm->AttachCurrentThread(&env_, NULL);
attached_ = (res == JNI_OK);
RTC_CHECK(attached_) << "AttachCurrentThread failed: " << res;
@@ -103,7 +103,7 @@
AttachThreadScoped::~AttachThreadScoped() {
if (attached_) {
- ALOGD("Detaching thread from JVM[tid=%d]", rtc::CurrentThreadId());
+ ALOGD("Detaching thread from JVM[tid=%d]", CurrentThreadId());
jint res = jvm_->DetachCurrentThread();
RTC_CHECK(res == JNI_OK) << "DetachCurrentThread failed: " << res;
RTC_CHECK(!GetEnv(jvm_));
