//chromecast: base::numerics::* -> base::*
The new names are shorter and not deprecated. Bug: 409350835 Change-Id: I3106efa54ea723c1fdad66dae7873a9bc69cf189 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6443878 Auto-Submit: Elly FJ <ellyjones@chromium.org> Reviewed-by: Simeon Anfinrud <sanfin@chromium.org> Commit-Queue: Simeon Anfinrud <sanfin@chromium.org> Cr-Commit-Position: refs/heads/main@{#1445050}
This commit is contained in:
chromecast
media
audio
net
@ -129,7 +129,7 @@ TEST_F(CaptureServiceReceiverTest, SendRequest) {
|
||||
const net::NetworkTrafficAnnotationTag&) {
|
||||
EXPECT_EQ(buf_len, static_cast<int>(sizeof(HandshakePacket)));
|
||||
auto data = base::as_bytes(buf->span());
|
||||
uint16_t size = base::numerics::U16FromBigEndian(data.first<2u>());
|
||||
uint16_t size = base::U16FromBigEndian(data.first<2u>());
|
||||
EXPECT_EQ(size, sizeof(HandshakePacket) - sizeof(size));
|
||||
HandshakePacket packet;
|
||||
base::byte_span_from_ref(packet).copy_from(
|
||||
@ -207,7 +207,7 @@ TEST_F(CaptureServiceReceiverTest, ReceiveMetadataMessage) {
|
||||
auto [write_size, write_message] = base::as_writable_bytes(buf->span())
|
||||
.first<total_size>()
|
||||
.split_at<sizeof(uint16_t)>();
|
||||
write_size.copy_from(base::numerics::U16ToBigEndian(message_size));
|
||||
write_size.copy_from(base::U16ToBigEndian(message_size));
|
||||
write_message[0u] = static_cast<uint8_t>(MessageType::kMetadata);
|
||||
// No need to fill valid metadata.
|
||||
std::ranges::fill(write_message.subspan(1u), uint8_t{0});
|
||||
|
@ -164,7 +164,7 @@ bool ConvertData(int channels,
|
||||
base::span<uint8_t> FillBuffer(base::span<uint8_t> buf,
|
||||
base::span<const uint8_t> data) {
|
||||
auto [write_size, rem] = buf.split_at(sizeof(uint16_t));
|
||||
write_size.copy_from(base::numerics::U16ToBigEndian(
|
||||
write_size.copy_from(base::U16ToBigEndian(
|
||||
base::checked_cast<uint16_t>(buf.size()) - uint16_t{sizeof(uint16_t)}));
|
||||
auto [write_data, uninit] = rem.split_at(data.size());
|
||||
write_data.copy_from(data);
|
||||
|
@ -48,7 +48,7 @@ bool GetMetaDataPaddingBytes(const char* data,
|
||||
padding_bytes =
|
||||
// NOTE: This cast may convert large unsigned values to negative values.
|
||||
// We check for and reject negative values below.
|
||||
static_cast<int32_t>(base::numerics::U32FromBigEndian(
|
||||
static_cast<int32_t>(base::U32FromBigEndian(
|
||||
base::as_bytes(
|
||||
// TODO(crbug.com/402847551): This span construction is unsound as
|
||||
// we can't know that the size is right, the function should be
|
||||
@ -154,7 +154,7 @@ void AudioSocket::PrepareAudioBuffer(net::IOBuffer* audio_buffer,
|
||||
auto buffer = base::as_writable_bytes(audio_buffer->span());
|
||||
|
||||
buffer.first<sizeof(uint16_t)>().copy_from(
|
||||
base::numerics::U16ToBigEndian(payload_size));
|
||||
base::U16ToBigEndian(payload_size));
|
||||
buffer = buffer.subspan(sizeof(uint16_t));
|
||||
|
||||
buffer.first<sizeof(uint16_t)>().copy_from(
|
||||
@ -177,7 +177,7 @@ bool AudioSocket::SendAudioBuffer(scoped_refptr<net::IOBuffer> audio_buffer,
|
||||
|
||||
bool AudioSocket::SendPreparedAudioBuffer(
|
||||
scoped_refptr<net::IOBuffer> audio_buffer) {
|
||||
uint16_t payload_size = base::numerics::U16FromBigEndian(
|
||||
uint16_t payload_size = base::U16FromBigEndian(
|
||||
base::as_bytes(base::as_bytes(audio_buffer->span()).first<2>()));
|
||||
DCHECK_GE(payload_size, kAudioHeaderSize);
|
||||
return SendBuffer(0, std::move(audio_buffer),
|
||||
@ -270,8 +270,8 @@ void AudioSocket::OnSendUnblocked() {
|
||||
base::flat_map<int, scoped_refptr<net::IOBuffer>> pending;
|
||||
pending_writes_.swap(pending);
|
||||
for (auto& m : pending) {
|
||||
uint16_t message_size = base::numerics::U16FromBigEndian(
|
||||
base::as_bytes(m.second->span().first<2u>()));
|
||||
uint16_t message_size =
|
||||
base::U16FromBigEndian(base::as_bytes(m.second->span().first<2u>()));
|
||||
SendBufferToSocket(m.first, std::move(m.second),
|
||||
sizeof(uint16_t) + message_size);
|
||||
}
|
||||
|
@ -354,7 +354,7 @@ bool SmallMessageSocket::ReadSize(char* ptr,
|
||||
// unsoundly claim that the span has 6 bytes here.
|
||||
auto span = UNSAFE_TODO(base::as_bytes(base::span(ptr, 6u)));
|
||||
|
||||
uint16_t first_size = base::numerics::U16FromBigEndian(span.first<2u>());
|
||||
uint16_t first_size = base::U16FromBigEndian(span.first<2u>());
|
||||
span = span.subspan(sizeof(uint16_t));
|
||||
data_offset = sizeof(uint16_t);
|
||||
if (first_size < kMax2ByteSize) {
|
||||
@ -363,7 +363,7 @@ bool SmallMessageSocket::ReadSize(char* ptr,
|
||||
if (bytes_read < sizeof(uint16_t) + sizeof(uint32_t)) {
|
||||
return false;
|
||||
}
|
||||
uint32_t real_size = base::numerics::U32FromBigEndian(span.first<4u>());
|
||||
uint32_t real_size = base::U32FromBigEndian(span.first<4u>());
|
||||
span = span.subspan(sizeof(uint32_t));
|
||||
data_offset += sizeof(uint32_t);
|
||||
message_size = real_size;
|
||||
|
Reference in New Issue
Block a user