diff options
39 files changed, 208 insertions, 165 deletions
diff --git a/base/base.gyp b/base/base.gyp index dc29040..12e365d 100644 --- a/base/base.gyp +++ b/base/base.gyp @@ -438,7 +438,6 @@ 'target_name': 'base_unittests', 'type': '<(gtest_target_type)', 'sources': [ - # Tests. 'android/application_status_listener_unittest.cc', 'android/jni_android_unittest.cc', 'android/jni_array_unittest.cc', @@ -451,6 +450,7 @@ 'atomicops_unittest.cc', 'barrier_closure_unittest.cc', 'base64_unittest.cc', + 'big_endian_unittest.cc', 'bind_unittest.cc', 'bind_unittest.nc', 'bits_unittest.cc', diff --git a/base/base.gypi b/base/base.gypi index 926e4dd..1f8364c 100644 --- a/base/base.gypi +++ b/base/base.gypi @@ -89,6 +89,8 @@ 'atomicops_internals_x86_msvc.h', 'barrier_closure.cc', 'barrier_closure.h', + 'base64.cc', + 'base64.h', 'base_export.h', 'base_paths.cc', 'base_paths.h', @@ -101,9 +103,9 @@ 'base_paths_win.cc', 'base_paths_win.h', 'base_switches.h', - 'base64.cc', - 'base64.h', 'basictypes.h', + 'big_endian.cc', + 'big_endian.h', 'bind.h', 'bind_helpers.cc', 'bind_helpers.h', diff --git a/net/base/big_endian.cc b/base/big_endian.cc index 888cf35..fd9e760 100644 --- a/net/base/big_endian.cc +++ b/base/big_endian.cc @@ -1,15 +1,15 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include "net/base/big_endian.h" +#include "base/big_endian.h" #include "base/strings/string_piece.h" -namespace net { +namespace base { -BigEndianReader::BigEndianReader(const void* buf, size_t len) - : ptr_(reinterpret_cast<const char*>(buf)), end_(ptr_ + len) {} +BigEndianReader::BigEndianReader(const char* buf, size_t len) + : ptr_(buf), end_(ptr_ + len) {} bool BigEndianReader::Skip(size_t len) { if (ptr_ + len > end_) @@ -55,8 +55,8 @@ bool BigEndianReader::ReadU32(uint32* value) { return Read(value); } -BigEndianWriter::BigEndianWriter(void* buf, size_t len) - : ptr_(reinterpret_cast<char*>(buf)), end_(ptr_ + len) {} +BigEndianWriter::BigEndianWriter(char* buf, size_t len) + : ptr_(buf), end_(ptr_ + len) {} bool BigEndianWriter::Skip(size_t len) { if (ptr_ + len > end_) @@ -94,5 +94,4 @@ bool BigEndianWriter::WriteU32(uint32 value) { return Write(value); } -} // namespace net - +} // namespace base diff --git a/net/base/big_endian.h b/base/big_endian.h index 911f3c5..35df5e7 100644 --- a/net/base/big_endian.h +++ b/base/big_endian.h @@ -1,15 +1,15 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef NET_BASE_BIG_ENDIAN_H_ -#define NET_BASE_BIG_ENDIAN_H_ +#ifndef BASE_BIG_ENDIAN_H_ +#define BASE_BIG_ENDIAN_H_ +#include "base/base_export.h" #include "base/basictypes.h" #include "base/strings/string_piece.h" -#include "net/base/net_export.h" -namespace net { +namespace base { // Read an integer (signed or unsigned) from |buf| in Big Endian order. // Note: this loop is unrolled with -O1 and above. @@ -49,9 +49,9 @@ inline void WriteBigEndian<uint8>(char buf[], uint8 val) { // Allows reading integers in network order (big endian) while iterating over // an underlying buffer. All the reading functions advance the internal pointer. -class NET_EXPORT BigEndianReader { +class BASE_EXPORT BigEndianReader { public: - BigEndianReader(const void* buf, size_t len); + BigEndianReader(const char* buf, size_t len); const char* ptr() const { return ptr_; } int remaining() const { return end_ - ptr_; } @@ -75,9 +75,9 @@ class NET_EXPORT BigEndianReader { // Allows writing integers in network order (big endian) while iterating over // an underlying buffer. All the writing functions advance the internal pointer. -class NET_EXPORT BigEndianWriter { +class BASE_EXPORT BigEndianWriter { public: - BigEndianWriter(void* buf, size_t len); + BigEndianWriter(char* buf, size_t len); char* ptr() const { return ptr_; } int remaining() const { return end_ - ptr_; } @@ -97,7 +97,6 @@ class NET_EXPORT BigEndianWriter { char* end_; }; -} // namespace net - -#endif // NET_BASE_BIG_ENDIAN_H_ +} // namespace base +#endif // BASE_BIG_ENDIAN_H_ diff --git a/net/base/big_endian_unittest.cc b/base/big_endian_unittest.cc index e758286..b57aeb2 100644 --- a/net/base/big_endian_unittest.cc +++ b/base/big_endian_unittest.cc @@ -1,12 +1,13 @@ -// Copyright (c) 2011 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/big_endian.h" + #include "base/strings/string_piece.h" -#include "net/base/big_endian.h" #include "testing/gtest/include/gtest/gtest.h" -namespace net { +namespace base { TEST(BigEndianReaderTest, ReadsValues) { char data[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xA, 0xB, 0xC }; @@ -96,5 +97,4 @@ TEST(BigEndianWriterTest, RespectsLength) { EXPECT_EQ(0, writer.remaining()); } -} // namespace net - +} // namespace base diff --git a/chrome/utility/cloud_print/pwg_encoder.cc b/chrome/utility/cloud_print/pwg_encoder.cc index 48c4c9b..1e33116 100644 --- a/chrome/utility/cloud_print/pwg_encoder.cc +++ b/chrome/utility/cloud_print/pwg_encoder.cc @@ -6,10 +6,10 @@ #include <algorithm> +#include "base/big_endian.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "chrome/utility/cloud_print/bitmap_image.h" -#include "net/base/big_endian.h" namespace cloud_print { @@ -66,19 +66,19 @@ void PwgEncoder::EncodePageHeader(const BitmapImage& image, const uint32 dpi, std::string* output) const { char header[kHeaderSize]; memset(header, 0, kHeaderSize); - net::WriteBigEndian<uint32>(header + kHeaderHwResolutionHorizontal, dpi); - net::WriteBigEndian<uint32>(header + kHeaderHwResolutionVertical, dpi); - net::WriteBigEndian<uint32>(header + kHeaderCupsWidth, image.size().width()); - net::WriteBigEndian<uint32>(header + kHeaderCupsHeight, - image.size().height()); - net::WriteBigEndian<uint32>(header + kHeaderCupsBitsPerColor, kBitsPerColor); - net::WriteBigEndian<uint32>(header + kHeaderCupsBitsPerPixel, kBitsPerPixel); - net::WriteBigEndian<uint32>(header + kHeaderCupsBytesPerLine, - (kBitsPerPixel * image.size().width() + 7) / 8); - net::WriteBigEndian<uint32>(header + kHeaderCupsColorOrder, kColorOrder); - net::WriteBigEndian<uint32>(header + kHeaderCupsColorSpace, kColorSpace); - net::WriteBigEndian<uint32>(header + kHeaderCupsNumColors, kNumColors); - net::WriteBigEndian<uint32>(header + kHeaderPwgTotalPageCount, total_pages); + base::WriteBigEndian<uint32>(header + kHeaderHwResolutionHorizontal, dpi); + base::WriteBigEndian<uint32>(header + kHeaderHwResolutionVertical, dpi); + base::WriteBigEndian<uint32>(header + kHeaderCupsWidth, image.size().width()); + base::WriteBigEndian<uint32>(header + kHeaderCupsHeight, + image.size().height()); + base::WriteBigEndian<uint32>(header + kHeaderCupsBitsPerColor, kBitsPerColor); + base::WriteBigEndian<uint32>(header + kHeaderCupsBitsPerPixel, kBitsPerPixel); + base::WriteBigEndian<uint32>(header + kHeaderCupsBytesPerLine, + (kBitsPerPixel * image.size().width() + 7) / 8); + base::WriteBigEndian<uint32>(header + kHeaderCupsColorOrder, kColorOrder); + base::WriteBigEndian<uint32>(header + kHeaderCupsColorSpace, kColorSpace); + base::WriteBigEndian<uint32>(header + kHeaderCupsNumColors, kNumColors); + base::WriteBigEndian<uint32>(header + kHeaderPwgTotalPageCount, total_pages); output->append(header, kHeaderSize); } diff --git a/cloud_print/gcp20/prototype/dns_packet_parser.cc b/cloud_print/gcp20/prototype/dns_packet_parser.cc index f85ffc7..26cd2e5 100644 --- a/cloud_print/gcp20/prototype/dns_packet_parser.cc +++ b/cloud_print/gcp20/prototype/dns_packet_parser.cc @@ -4,13 +4,13 @@ #include "cloud_print/gcp20/prototype/dns_packet_parser.h" -#include "net/base/big_endian.h" +#include "base/big_endian.h" DnsPacketParser::DnsPacketParser(const char* packet, size_t length) : packet_(packet), length_(length), record_parser_(packet, length, sizeof(header_)) { - net::BigEndianReader reader(packet, length); + base::BigEndianReader reader(packet, length); is_header_read_ = reader.ReadU16(&header_.id) && reader.ReadU16(&header_.flags) && reader.ReadU16(&header_.qdcount) && @@ -25,8 +25,8 @@ bool DnsPacketParser::ReadRecord(DnsQueryRecord* out) { size_t consumed = ReadName(&result.qname); if (!consumed) return false; - net::BigEndianReader reader(packet_ + GetOffset() + consumed, - length_ - (GetOffset() + consumed)); + base::BigEndianReader reader(packet_ + GetOffset() + consumed, + length_ - (GetOffset() + consumed)); if (reader.ReadU16(&result.qtype) && reader.ReadU16(&result.qclass) && record_parser_.SkipQuestion()) { // instead of |cur_ = reader.ptr();| *out = result; diff --git a/cloud_print/gcp20/prototype/dns_response_builder.cc b/cloud_print/gcp20/prototype/dns_response_builder.cc index 23cc866..46f82cd 100644 --- a/cloud_print/gcp20/prototype/dns_response_builder.cc +++ b/cloud_print/gcp20/prototype/dns_response_builder.cc @@ -4,8 +4,8 @@ #include "cloud_print/gcp20/prototype/dns_response_builder.h" +#include "base/big_endian.h" #include "base/logging.h" -#include "net/base/big_endian.h" #include "net/base/dns_util.h" #include "net/base/io_buffer.h" #include "net/base/ip_endpoint.h" @@ -61,7 +61,8 @@ void DnsResponseBuilder::AppendSrv(const std::string& service_name, std::vector<uint8> rdata(2 + 2 + 2 + domain_name.size()); - net::BigEndianWriter writer(rdata.data(), rdata.size()); + base::BigEndianWriter writer(reinterpret_cast<char*>(rdata.data()), + rdata.size()); success = writer.WriteU16(priority) && writer.WriteU16(weight) && writer.WriteU16(http_port) && @@ -136,7 +137,7 @@ scoped_refptr<net::IOBufferWithSize> DnsResponseBuilder::Build() { responses_.size()); scoped_refptr<net::IOBufferWithSize> message( new net::IOBufferWithSize(static_cast<int>(size))); - net::BigEndianWriter writer(message->data(), message->size()); + base::BigEndianWriter writer(message->data(), message->size()); bool success = writer.WriteU16(header_.id) && writer.WriteU16(header_.flags) && writer.WriteU16(header_.qdcount) && diff --git a/cloud_print/gcp20/prototype/dns_sd_server.cc b/cloud_print/gcp20/prototype/dns_sd_server.cc index f5500de..1419cc7 100644 --- a/cloud_print/gcp20/prototype/dns_sd_server.cc +++ b/cloud_print/gcp20/prototype/dns_sd_server.cc @@ -13,7 +13,6 @@ #include "base/strings/stringprintf.h" #include "cloud_print/gcp20/prototype/dns_packet_parser.h" #include "cloud_print/gcp20/prototype/dns_response_builder.h" -#include "net/base/big_endian.h" #include "net/base/dns_util.h" #include "net/base/net_errors.h" #include "net/base/net_util.h" diff --git a/media/cast/logging/log_serializer.cc b/media/cast/logging/log_serializer.cc index bc6a1ae..e467814 100644 --- a/media/cast/logging/log_serializer.cc +++ b/media/cast/logging/log_serializer.cc @@ -4,7 +4,7 @@ #include "media/cast/logging/log_serializer.h" -#include "net/base/big_endian.h" +#include "base/big_endian.h" namespace media { namespace cast { @@ -42,7 +42,7 @@ bool LogSerializer::SerializeEventsForStream( if (remaining_space <= 0) return false; - net::BigEndianWriter writer(&(*serialized_log_so_far_)[index_so_far_], + base::BigEndianWriter writer(&(*serialized_log_so_far_)[index_so_far_], remaining_space); // Write stream ID. diff --git a/media/cast/logging/logging_impl.cc b/media/cast/logging/logging_impl.cc index 5aebbe1..75a2396 100644 --- a/media/cast/logging/logging_impl.cc +++ b/media/cast/logging/logging_impl.cc @@ -2,9 +2,9 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. +#include "base/big_endian.h" #include "base/debug/trace_event.h" #include "media/cast/logging/logging_impl.h" -#include "net/base/big_endian.h" namespace media { namespace cast { @@ -89,9 +89,11 @@ void LoggingImpl::InsertPacketListEvent(const base::TimeTicks& time_of_event, uint32 rtp_timestamp; uint16 packet_id, max_packet_id; const uint8* packet_data = &packet[0]; - net::BigEndianReader big_endian_reader(packet_data + 4, 4); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(packet_data + 4), 4); big_endian_reader.ReadU32(&rtp_timestamp); - net::BigEndianReader cast_big_endian_reader(packet_data + 12 + 2, 4); + base::BigEndianReader cast_big_endian_reader( + reinterpret_cast<const char*>(packet_data + 12 + 2), 4); cast_big_endian_reader.ReadU16(&packet_id); cast_big_endian_reader.ReadU16(&max_packet_id); // rtp_timestamp is enough - no need for frame_id as well. diff --git a/media/cast/rtcp/rtcp.cc b/media/cast/rtcp/rtcp.cc index a6eae71..96789bf 100644 --- a/media/cast/rtcp/rtcp.cc +++ b/media/cast/rtcp/rtcp.cc @@ -4,6 +4,7 @@ #include "media/cast/rtcp/rtcp.h" +#include "base/big_endian.h" #include "base/rand_util.h" #include "media/cast/cast_config.h" #include "media/cast/cast_defines.h" @@ -13,7 +14,6 @@ #include "media/cast/rtcp/rtcp_sender.h" #include "media/cast/rtcp/rtcp_utility.h" #include "media/cast/transport/cast_transport_defines.h" -#include "net/base/big_endian.h" namespace media { namespace cast { @@ -205,7 +205,8 @@ bool Rtcp::IsRtcpPacket(const uint8* packet, size_t length) { uint32 Rtcp::GetSsrcOfSender(const uint8* rtcp_buffer, size_t length) { DCHECK_GE(length, kMinLengthOfRtcp) << "Invalid RTCP packet"; uint32 ssrc_of_sender; - net::BigEndianReader big_endian_reader(rtcp_buffer, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_buffer), length); big_endian_reader.Skip(4); // Skip header big_endian_reader.ReadU32(&ssrc_of_sender); return ssrc_of_sender; diff --git a/media/cast/rtcp/rtcp_sender.cc b/media/cast/rtcp/rtcp_sender.cc index 9730e77..bfd790a 100644 --- a/media/cast/rtcp/rtcp_sender.cc +++ b/media/cast/rtcp/rtcp_sender.cc @@ -7,13 +7,13 @@ #include <algorithm> #include <vector> +#include "base/big_endian.h" #include "base/logging.h" #include "media/cast/cast_environment.h" #include "media/cast/rtcp/rtcp_defines.h" #include "media/cast/rtcp/rtcp_utility.h" #include "media/cast/transport/cast_transport_defines.h" #include "media/cast/transport/pacing/paced_sender.h" -#include "net/base/big_endian.h" namespace media { namespace cast { @@ -193,7 +193,8 @@ void RtcpSender::BuildRR(const transport::RtcpReportBlock* report_block, uint16 number_of_rows = (report_block) ? 7 : 1; packet->resize(start_size + 8); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 8); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 8); big_endian_writer.WriteU8(0x80 + (report_block ? 1 : 0)); big_endian_writer.WriteU8(transport::kPacketTypeReceiverReport); big_endian_writer.WriteU16(number_of_rows); @@ -212,7 +213,8 @@ void RtcpSender::AddReportBlocks(const transport::RtcpReportBlock& report_block, packet->resize(start_size + 24); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 24); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 24); big_endian_writer.WriteU32(report_block.media_ssrc); big_endian_writer.WriteU8(report_block.fraction_lost); big_endian_writer.WriteU8(report_block.cumulative_lost >> 16); @@ -241,7 +243,8 @@ void RtcpSender::BuildSdec(Packet* packet) const { // SDES Source Description. packet->resize(start_size + 10); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 10); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 10); // We always need to add one SDES CNAME. big_endian_writer.WriteU8(0x80 + 1); big_endian_writer.WriteU8(transport::kPacketTypeSdes); @@ -282,7 +285,8 @@ void RtcpSender::BuildPli(uint32 remote_ssrc, Packet* packet) const { packet->resize(start_size + 12); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 12); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 12); uint8 FMT = 1; // Picture loss indicator. big_endian_writer.WriteU8(0x80 + FMT); big_endian_writer.WriteU8(transport::kPacketTypePayloadSpecific); @@ -307,7 +311,8 @@ void RtcpSender::BuildRpsi(const RtcpRpsiMessage* rpsi, Packet* packet) const { packet->resize(start_size + 24); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 24); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 24); uint8 FMT = 3; // Reference Picture Selection Indication. big_endian_writer.WriteU8(0x80 + FMT); big_endian_writer.WriteU8(transport::kPacketTypePayloadSpecific); @@ -361,7 +366,8 @@ void RtcpSender::BuildRemb(const RtcpRembMessage* remb, Packet* packet) const { packet->resize(start_size + remb_size); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), remb_size); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), remb_size); // Add application layer feedback. uint8 FMT = 15; @@ -401,7 +407,8 @@ void RtcpSender::BuildNack(const RtcpNackMessage* nack, Packet* packet) const { packet->resize(start_size + 16); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 16); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 16); uint8 FMT = 1; big_endian_writer.WriteU8(0x80 + FMT); @@ -439,7 +446,8 @@ void RtcpSender::BuildNack(const RtcpNackMessage* nack, Packet* packet) const { if (start_size + 4 > kMaxIpPacketSize) return; packet->resize(start_size + 4); - net::BigEndianWriter big_endian_nack_writer(&((*packet)[start_size]), 4); + base::BigEndianWriter big_endian_nack_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 4); big_endian_nack_writer.WriteU16(nack_sequence_number); big_endian_nack_writer.WriteU16(bitmask); number_of_nack_fields++; @@ -455,7 +463,8 @@ void RtcpSender::BuildBye(Packet* packet) const { packet->resize(start_size + 8); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 8); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 8); big_endian_writer.WriteU8(0x80 + 1); big_endian_writer.WriteU8(transport::kPacketTypeBye); big_endian_writer.WriteU16(1); // Length. @@ -470,7 +479,8 @@ void RtcpSender::BuildRrtr(const RtcpReceiverReferenceTimeReport* rrtr, packet->resize(start_size + 20); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 20); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 20); big_endian_writer.WriteU8(0x80); big_endian_writer.WriteU8(transport::kPacketTypeXr); @@ -492,7 +502,8 @@ void RtcpSender::BuildCast(const RtcpCastMessage* cast, Packet* packet) const { packet->resize(start_size + 20); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 20); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 20); uint8 FMT = 15; // Application layer feedback. big_endian_writer.WriteU8(0x80 + FMT); big_endian_writer.WriteU8(transport::kPacketTypePayloadSpecific); @@ -523,7 +534,8 @@ void RtcpSender::BuildCast(const RtcpCastMessage* cast, Packet* packet) const { // Special case all packets in a frame is missing. start_size = packet->size(); packet->resize(start_size + 4); - net::BigEndianWriter big_endian_nack_writer(&((*packet)[start_size]), 4); + base::BigEndianWriter big_endian_nack_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 4); big_endian_nack_writer.WriteU8(static_cast<uint8>(frame_it->first)); big_endian_nack_writer.WriteU16(kRtcpCastAllPacketsLost); big_endian_nack_writer.WriteU8(0); @@ -535,8 +547,8 @@ void RtcpSender::BuildCast(const RtcpCastMessage* cast, Packet* packet) const { start_size = packet->size(); packet->resize(start_size + 4); - net::BigEndianWriter big_endian_nack_writer(&((*packet)[start_size]), - 4); + base::BigEndianWriter big_endian_nack_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 4); // Write frame and packet id to buffer before calculating bitmask. big_endian_nack_writer.WriteU8(static_cast<uint8>(frame_it->first)); @@ -582,8 +594,8 @@ void RtcpSender::BuildReceiverLog( } packet->resize(packet_start_size + rtcp_log_size); - net::BigEndianWriter big_endian_writer(&((*packet)[packet_start_size]), - rtcp_log_size); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[packet_start_size])), rtcp_log_size); big_endian_writer.WriteU8(0x80 + kReceiverLogSubtype); big_endian_writer.WriteU8(transport::kPacketTypeApplicationDefined); big_endian_writer.WriteU16(static_cast<uint16>( diff --git a/media/cast/rtcp/rtcp_utility.cc b/media/cast/rtcp/rtcp_utility.cc index 08063bf..91488d9 100644 --- a/media/cast/rtcp/rtcp_utility.cc +++ b/media/cast/rtcp/rtcp_utility.cc @@ -4,9 +4,9 @@ #include "media/cast/rtcp/rtcp_utility.h" +#include "base/big_endian.h" #include "base/logging.h" #include "media/cast/transport/cast_transport_defines.h" -#include "net/base/big_endian.h" namespace media { namespace cast { @@ -309,7 +309,8 @@ bool RtcpParser::ParseRR() { field_type_ = kRtcpRrCode; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.Skip(4); // Skip header big_endian_reader.ReadU32(&field_.receiver_report.sender_ssrc); field_.receiver_report.number_of_report_blocks = number_of_blocks_; @@ -328,7 +329,8 @@ bool RtcpParser::ParseSR() { } field_type_ = kRtcpSrCode; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.Skip(4); // Skip header big_endian_reader.ReadU32(&field_.sender_report.sender_ssrc); big_endian_reader.ReadU32(&field_.sender_report.ntp_most_significant); @@ -358,7 +360,8 @@ bool RtcpParser::ParseReportBlockItem() { return false; } - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU32(&field_.report_block_item.ssrc); big_endian_reader.ReadU8(&field_.report_block_item.fraction_lost); @@ -418,7 +421,8 @@ bool RtcpParser::ParseSdesItem() { } uint32 ssrc; - net::BigEndianReader big_endian_reader(rtcp_data_, data_length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), data_length); big_endian_reader.ReadU32(&ssrc); rtcp_data_ += 4; @@ -437,7 +441,8 @@ bool RtcpParser::ParseSdesTypes() { // Only the c_name item is mandatory. RFC 3550 page 46. bool found_c_name = false; ptrdiff_t length = rtcp_block_end_ - rtcp_data_; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); while (big_endian_reader.remaining() > 0) { uint8 tag; @@ -503,7 +508,8 @@ bool RtcpParser::ParseByeItem() { field_type_ = kRtcpByeCode; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU32(&field_.bye.sender_ssrc); rtcp_data_ += 4; @@ -527,7 +533,8 @@ bool RtcpParser::ParseApplicationDefined(uint8 subtype) { uint32 sender_ssrc; uint32 name; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.Skip(4); // Skip header. big_endian_reader.ReadU32(&sender_ssrc); big_endian_reader.ReadU32(&name); @@ -564,7 +571,8 @@ bool RtcpParser::ParseCastReceiverLogFrameItem() { } uint32 rtp_timestamp; uint32 data; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU32(&rtp_timestamp); big_endian_reader.ReadU32(&data); @@ -596,7 +604,8 @@ bool RtcpParser::ParseCastReceiverLogEventItem() { uint16 delay_delta_or_packet_id; uint16 event_type_and_timestamp_delta; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU16(&delay_delta_or_packet_id); big_endian_reader.ReadU16(&event_type_and_timestamp_delta); @@ -621,7 +630,8 @@ bool RtcpParser::ParseCastSenderLogItem() { return false; } uint32 data; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU32(&data); rtcp_data_ += 4; @@ -647,7 +657,8 @@ bool RtcpParser::ParseFeedBackCommon(const RtcpCommonHeader& header) { uint32 sender_ssrc; uint32 media_ssrc; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.Skip(4); // Skip header. big_endian_reader.ReadU32(&sender_ssrc); big_endian_reader.ReadU32(&media_ssrc); @@ -756,7 +767,8 @@ bool RtcpParser::ParseRpsiItem() { field_type_ = kRtcpPayloadSpecificRpsiCode; uint8 padding_bits; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU8(&padding_bits); big_endian_reader.ReadU8(&field_.rpsi.payload_type); big_endian_reader.ReadBytes(&field_.rpsi.native_bit_string, length - 2); @@ -779,7 +791,8 @@ bool RtcpParser::ParseNackItem() { field_type_ = kRtcpGenericRtpFeedbackNackItemCode; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU16(&field_.nack_item.packet_id); big_endian_reader.ReadU16(&field_.nack_item.bitmask); rtcp_data_ += 4; @@ -795,7 +808,8 @@ bool RtcpParser::ParsePayloadSpecificAppItem() { return false; } uint32 name; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU32(&name); rtcp_data_ += 4; @@ -822,7 +836,8 @@ bool RtcpParser::ParsePayloadSpecificRembItem() { return false; } - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU8(&field_.remb_item.number_of_ssrcs); uint8 byte_1; @@ -861,7 +876,8 @@ bool RtcpParser::ParsePayloadSpecificCastItem() { } field_type_ = kRtcpPayloadSpecificCastCode; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU8(&field_.cast_item.last_frame_id); big_endian_reader.ReadU8(&field_.cast_item.number_of_lost_fields); @@ -887,7 +903,8 @@ bool RtcpParser::ParsePayloadSpecificCastNackItem() { } field_type_ = kRtcpPayloadSpecificCastNackItemCode; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU8(&field_.cast_nack_item.frame_id); big_endian_reader.ReadU16(&field_.cast_nack_item.packet_id); big_endian_reader.ReadU8(&field_.cast_nack_item.bitmask); @@ -907,7 +924,8 @@ bool RtcpParser::ParseFirItem() { } field_type_ = kRtcpPayloadSpecificFirItemCode; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU32(&field_.fir_item.ssrc); big_endian_reader.ReadU8(&field_.fir_item.command_sequence_number); @@ -922,7 +940,8 @@ bool RtcpParser::ParseExtendedReport() { field_type_ = kRtcpXrCode; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.Skip(4); // Skip header. big_endian_reader.ReadU32(&field_.extended_report.sender_ssrc); @@ -942,7 +961,8 @@ bool RtcpParser::ParseExtendedReportItem() { uint8 block_type; uint16 block_length; - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU8(&block_type); big_endian_reader.Skip(1); // Ignore reserved. big_endian_reader.ReadU16(&block_length); @@ -991,7 +1011,8 @@ bool RtcpParser::ParseExtendedReportReceiverReferenceTimeReport() { return false; } - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU32(&field_.rrtr.ntp_most_significant); big_endian_reader.ReadU32(&field_.rrtr.ntp_least_significant); @@ -1014,7 +1035,8 @@ bool RtcpParser::ParseExtendedReportDelaySinceLastReceiverReport() { return false; } - net::BigEndianReader big_endian_reader(rtcp_data_, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_data_), length); big_endian_reader.ReadU32(&field_.dlrr.receivers_ssrc); big_endian_reader.ReadU32(&field_.dlrr.last_receiver_report); big_endian_reader.ReadU32(&field_.dlrr.delay_last_receiver_report); diff --git a/media/cast/rtcp/test_rtcp_packet_builder.cc b/media/cast/rtcp/test_rtcp_packet_builder.cc index e434e01..28f3934 100644 --- a/media/cast/rtcp/test_rtcp_packet_builder.cc +++ b/media/cast/rtcp/test_rtcp_packet_builder.cc @@ -9,7 +9,8 @@ namespace media { namespace cast { TestRtcpPacketBuilder::TestRtcpPacketBuilder() - : ptr_of_length_(NULL), big_endian_writer_(buffer_, kMaxIpPacketSize) {} + : ptr_of_length_(NULL), + big_endian_writer_(reinterpret_cast<char*>(buffer_), kMaxIpPacketSize) {} void TestRtcpPacketBuilder::AddSr(uint32 sender_ssrc, int number_of_report_blocks) { diff --git a/media/cast/rtcp/test_rtcp_packet_builder.h b/media/cast/rtcp/test_rtcp_packet_builder.h index f15eab9..c2e791e 100644 --- a/media/cast/rtcp/test_rtcp_packet_builder.h +++ b/media/cast/rtcp/test_rtcp_packet_builder.h @@ -7,9 +7,9 @@ #ifndef MEDIA_CAST_RTCP_TEST_RTCP_PACKET_BUILDER_H_ #define MEDIA_CAST_RTCP_TEST_RTCP_PACKET_BUILDER_H_ +#include "base/big_endian.h" #include "media/cast/cast_config.h" #include "media/cast/rtcp/rtcp_defines.h" -#include "net/base/big_endian.h" namespace media { namespace cast { @@ -102,7 +102,7 @@ class TestRtcpPacketBuilder { // Note: 0 is not a legal value, it is used for "uninitialized". uint8 buffer_[kMaxIpPacketSize]; char* ptr_of_length_; - net::BigEndianWriter big_endian_writer_; + base::BigEndianWriter big_endian_writer_; DISALLOW_COPY_AND_ASSIGN(TestRtcpPacketBuilder); }; diff --git a/media/cast/rtp_receiver/rtp_parser/rtp_parser.cc b/media/cast/rtp_receiver/rtp_parser/rtp_parser.cc index 4d016d3..fabc5fd 100644 --- a/media/cast/rtp_receiver/rtp_parser/rtp_parser.cc +++ b/media/cast/rtp_receiver/rtp_parser/rtp_parser.cc @@ -4,10 +4,10 @@ #include "media/cast/rtp_receiver/rtp_parser/rtp_parser.h" +#include "base/big_endian.h" #include "base/logging.h" #include "media/cast/cast_defines.h" #include "media/cast/rtp_receiver/rtp_receiver.h" -#include "net/base/big_endian.h" namespace media { namespace cast { @@ -56,7 +56,8 @@ bool RtpParser::ParseCommon(const uint8* packet, uint16 sequence_number; uint32 rtp_timestamp, ssrc; - net::BigEndianReader big_endian_reader(packet + 2, 10); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(packet + 2), 10); big_endian_reader.ReadU16(&sequence_number); big_endian_reader.ReadU32(&rtp_timestamp); big_endian_reader.ReadU32(&ssrc); @@ -93,7 +94,8 @@ bool RtpParser::ParseCast(const uint8* packet, rtp_header->is_reference = (data_ptr[0] & kCastReferenceFrameIdBitMask); rtp_header->frame_id = frame_id_wrap_helper_.MapTo32bitsFrameId(data_ptr[1]); - net::BigEndianReader big_endian_reader(data_ptr + 2, 4); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(data_ptr + 2), 4); big_endian_reader.ReadU16(&rtp_header->packet_id); big_endian_reader.ReadU16(&rtp_header->max_packet_id); diff --git a/media/cast/rtp_receiver/rtp_parser/test/rtp_packet_builder.cc b/media/cast/rtp_receiver/rtp_parser/test/rtp_packet_builder.cc index 05f86a4..e251511 100644 --- a/media/cast/rtp_receiver/rtp_parser/test/rtp_packet_builder.cc +++ b/media/cast/rtp_receiver/rtp_parser/test/rtp_packet_builder.cc @@ -4,8 +4,8 @@ #include "media/cast/rtp_receiver/rtp_parser/test/rtp_packet_builder.h" +#include "base/big_endian.h" #include "base/logging.h" -#include "net/base/big_endian.h" namespace media { namespace cast { @@ -70,7 +70,7 @@ void RtpPacketBuilder::BuildCastHeader(uint8* data, uint32 data_length) { DCHECK_LE(kCastRtpHeaderLength, data_length); // Set the first 7 bytes to 0. memset(data, 0, kCastRtpHeaderLength); - net::BigEndianWriter big_endian_writer(data, 56); + base::BigEndianWriter big_endian_writer(reinterpret_cast<char*>(data), 56); big_endian_writer.WriteU8((is_key_ ? 0x80 : 0) | (is_reference_set_ ? 0x40 : 0)); big_endian_writer.WriteU8(frame_id_); @@ -83,7 +83,7 @@ void RtpPacketBuilder::BuildCastHeader(uint8* data, uint32 data_length) { void RtpPacketBuilder::BuildCommonHeader(uint8* data, uint32 data_length) { DCHECK_LE(kGenericRtpHeaderLength, data_length); - net::BigEndianWriter big_endian_writer(data, 96); + base::BigEndianWriter big_endian_writer(reinterpret_cast<char*>(data), 96); big_endian_writer.WriteU8(0x80); big_endian_writer.WriteU8(payload_type_ | (marker_ ? kRtpMarkerBitMask : 0)); big_endian_writer.WriteU16(sequence_number_); diff --git a/media/cast/rtp_receiver/rtp_receiver.cc b/media/cast/rtp_receiver/rtp_receiver.cc index 54e95b6..808235f 100644 --- a/media/cast/rtp_receiver/rtp_receiver.cc +++ b/media/cast/rtp_receiver/rtp_receiver.cc @@ -4,11 +4,11 @@ #include "media/cast/rtp_receiver/rtp_receiver.h" +#include "base/big_endian.h" #include "base/logging.h" #include "media/cast/rtp_receiver/receiver_stats.h" #include "media/cast/rtp_receiver/rtp_parser/rtp_parser.h" #include "media/cast/rtp_receiver/rtp_receiver_defines.h" -#include "net/base/big_endian.h" namespace media { namespace cast { @@ -42,7 +42,8 @@ RtpReceiver::~RtpReceiver() {} uint32 RtpReceiver::GetSsrcOfSender(const uint8* rtcp_buffer, size_t length) { DCHECK_GE(length, kMinLengthOfRtp) << "Invalid RTP packet"; uint32 ssrc_of_sender; - net::BigEndianReader big_endian_reader(rtcp_buffer, length); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(rtcp_buffer), length); big_endian_reader.Skip(8); // Skip header big_endian_reader.ReadU32(&ssrc_of_sender); return ssrc_of_sender; diff --git a/media/cast/test/sender.cc b/media/cast/test/sender.cc index 58b44dd..2ab957c 100644 --- a/media/cast/test/sender.cc +++ b/media/cast/test/sender.cc @@ -25,7 +25,6 @@ #include "media/cast/transport/cast_transport_defines.h" #include "media/cast/transport/cast_transport_sender.h" #include "media/cast/transport/transport/udp_transport.h" -#include "net/base/big_endian.h" #include "ui/gfx/size.h" namespace media { diff --git a/media/cast/transport/rtcp/rtcp_builder.cc b/media/cast/transport/rtcp/rtcp_builder.cc index 6ab8c8b..b0f7351 100644 --- a/media/cast/transport/rtcp/rtcp_builder.cc +++ b/media/cast/transport/rtcp/rtcp_builder.cc @@ -8,10 +8,10 @@ #include <string> #include <vector> +#include "base/big_endian.h" #include "base/logging.h" #include "media/cast/transport/cast_transport_defines.h" #include "media/cast/transport/pacing/paced_sender.h" -#include "net/base/big_endian.h" static const size_t kRtcpCastLogHeaderSize = 12; static const size_t kRtcpSenderFrameLogSize = 4; @@ -85,7 +85,8 @@ bool RtcpBuilder::BuildSR(const RtcpSenderInfo& sender_info, uint16 number_of_rows = 6; packet->resize(start_size + 28); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 28); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 28); big_endian_writer.WriteU8(0x80); big_endian_writer.WriteU8(kPacketTypeSenderReport); big_endian_writer.WriteU16(number_of_rows); @@ -108,7 +109,8 @@ bool RtcpBuilder::BuildSdec(Packet* packet) const { // SDES Source Description. packet->resize(start_size + 10); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 10); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 10); // We always need to add one SDES CNAME. big_endian_writer.WriteU8(0x80 + 1); big_endian_writer.WriteU8(kPacketTypeSdes); @@ -152,7 +154,8 @@ bool RtcpBuilder::BuildBye(Packet* packet) const { packet->resize(start_size + 8); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 8); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 8); big_endian_writer.WriteU8(0x80 + 1); big_endian_writer.WriteU8(kPacketTypeBye); big_endian_writer.WriteU16(1); // Length. @@ -187,7 +190,8 @@ bool RtcpBuilder::BuildDlrrRb(const RtcpDlrrReportBlock& dlrr, packet->resize(start_size + 24); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 24); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 24); big_endian_writer.WriteU8(0x80); big_endian_writer.WriteU8(kPacketTypeXr); big_endian_writer.WriteU16(5); // Length. @@ -220,7 +224,8 @@ bool RtcpBuilder::BuildSenderLog(const RtcpSenderLogMessage& sender_log_message, number_of_messages * kRtcpSenderFrameLogSize; packet->resize(start_size + log_size); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), log_size); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), log_size); big_endian_writer.WriteU8(0x80 + kSenderLogSubtype); big_endian_writer.WriteU8(kPacketTypeApplicationDefined); big_endian_writer.WriteU16(static_cast<uint16>(2 + number_of_messages)); diff --git a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc index 6690a6e..d438676 100644 --- a/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc +++ b/media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.cc @@ -4,9 +4,9 @@ #include "media/cast/transport/rtp_sender/rtp_packetizer/rtp_packetizer.h" +#include "base/big_endian.h" #include "base/logging.h" #include "media/cast/transport/pacing/paced_sender.h" -#include "net/base/big_endian.h" namespace media { namespace cast { @@ -124,7 +124,8 @@ void RtpPacketizer::Cast(bool is_key, packet.push_back(frame_id); size_t start_size = packet.size(); packet.resize(start_size + 4); - net::BigEndianWriter big_endian_writer(&(packet[start_size]), 4); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&(packet[start_size])), 4); big_endian_writer.WriteU16(packet_id_); big_endian_writer.WriteU16(static_cast<uint16>(num_packets - 1)); packet.push_back(static_cast<uint8>(reference_frame_id)); @@ -159,7 +160,8 @@ void RtpPacketizer::BuildCommonRTPheader(Packet* packet, (marker_bit ? kRtpMarkerBitMask : 0)); size_t start_size = packet->size(); packet->resize(start_size + 10); - net::BigEndianWriter big_endian_writer(&((*packet)[start_size]), 10); + base::BigEndianWriter big_endian_writer( + reinterpret_cast<char*>(&((*packet)[start_size])), 10); big_endian_writer.WriteU16(sequence_number_); big_endian_writer.WriteU32(time_stamp); big_endian_writer.WriteU32(config_.ssrc); diff --git a/media/cast/transport/rtp_sender/rtp_packetizer/test/rtp_header_parser.cc b/media/cast/transport/rtp_sender/rtp_packetizer/test/rtp_header_parser.cc index 1019d9c..ddadcb2 100644 --- a/media/cast/transport/rtp_sender/rtp_packetizer/test/rtp_header_parser.cc +++ b/media/cast/transport/rtp_sender/rtp_packetizer/test/rtp_header_parser.cc @@ -6,7 +6,7 @@ #include <cstddef> -#include "net/base/big_endian.h" +#include "base/big_endian.h" namespace media { namespace cast { @@ -61,7 +61,8 @@ bool RtpHeaderParser::ParseCommon(RtpCastTestHeader* parsed_packet) const { const uint8* ptr = &rtp_data_begin_[4]; - net::BigEndianReader big_endian_reader(ptr, 8); + base::BigEndianReader big_endian_reader(reinterpret_cast<const char*>(ptr), + 8); uint32 rtp_timestamp, ssrc; big_endian_reader.ReadU32(&rtp_timestamp); big_endian_reader.ReadU32(&ssrc); @@ -87,7 +88,8 @@ bool RtpHeaderParser::ParseCast(RtpCastTestHeader* parsed_packet) const { parsed_packet->is_reference = (data[0] & kCastReferenceFrameIdBitMask); parsed_packet->frame_id = frame_id_wrap_helper_.MapTo32bitsFrameId(data[1]); - net::BigEndianReader big_endian_reader(data + 2, 8); + base::BigEndianReader big_endian_reader( + reinterpret_cast<const char*>(data + 2), 8); big_endian_reader.ReadU16(&parsed_packet->packet_id); big_endian_reader.ReadU16(&parsed_packet->max_packet_id); diff --git a/media/cast/transport/rtp_sender/rtp_sender.cc b/media/cast/transport/rtp_sender/rtp_sender.cc index 7bcfbca..91122de 100644 --- a/media/cast/transport/rtp_sender/rtp_sender.cc +++ b/media/cast/transport/rtp_sender/rtp_sender.cc @@ -8,7 +8,6 @@ #include "base/rand_util.h" #include "media/cast/transport/cast_transport_defines.h" #include "media/cast/transport/pacing/paced_sender.h" -#include "net/base/big_endian.h" namespace media { namespace cast { diff --git a/net/dns/dns_query.cc b/net/dns/dns_query.cc index 270757e..530508a 100644 --- a/net/dns/dns_query.cc +++ b/net/dns/dns_query.cc @@ -6,8 +6,8 @@ #include <limits> +#include "base/big_endian.h" #include "base/sys_byteorder.h" -#include "net/base/big_endian.h" #include "net/base/dns_util.h" #include "net/base/io_buffer.h" #include "net/dns/dns_protocol.h" @@ -33,7 +33,8 @@ DnsQuery::DnsQuery(uint16 id, const base::StringPiece& qname, uint16 qtype) header->qdcount = base::HostToNet16(1); // Write question section after the header. - BigEndianWriter writer(reinterpret_cast<char*>(header + 1), question_size); + base::BigEndianWriter writer(reinterpret_cast<char*>(header + 1), + question_size); writer.WriteBytes(qname.data(), qname.size()); writer.WriteU16(qtype); writer.WriteU16(dns_protocol::kClassIN); @@ -59,9 +60,8 @@ base::StringPiece DnsQuery::qname() const { uint16 DnsQuery::qtype() const { uint16 type; - ReadBigEndian<uint16>(io_buffer_->data() + - sizeof(dns_protocol::Header) + - qname_size_, &type); + base::ReadBigEndian<uint16>( + io_buffer_->data() + sizeof(dns_protocol::Header) + qname_size_, &type); return type; } diff --git a/net/dns/dns_response.cc b/net/dns/dns_response.cc index d29d3c4..64db818 100644 --- a/net/dns/dns_response.cc +++ b/net/dns/dns_response.cc @@ -4,10 +4,10 @@ #include "net/dns/dns_response.h" +#include "base/big_endian.h" #include "base/strings/string_util.h" #include "base/sys_byteorder.h" #include "net/base/address_list.h" -#include "net/base/big_endian.h" #include "net/base/dns_util.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" @@ -73,7 +73,7 @@ unsigned DnsRecordParser::ReadName(const void* const vpos, if (seen > length_) return 0; uint16 offset; - ReadBigEndian<uint16>(p, &offset); + base::ReadBigEndian<uint16>(p, &offset); offset &= dns_protocol::kOffsetMask; p = packet_ + offset; if (p >= end) @@ -113,8 +113,8 @@ bool DnsRecordParser::ReadRecord(DnsResourceRecord* out) { size_t consumed = ReadName(cur_, &out->name); if (!consumed) return false; - BigEndianReader reader(cur_ + consumed, - packet_ + length_ - (cur_ + consumed)); + base::BigEndianReader reader(cur_ + consumed, + packet_ + length_ - (cur_ + consumed)); uint16 rdlen; if (reader.ReadU16(&out->type) && reader.ReadU16(&out->klass) && @@ -251,7 +251,7 @@ uint16 DnsResponse::qtype() const { // QTYPE starts where QNAME ends. const size_t type_offset = parser_.GetOffset() - 2 * sizeof(uint16); uint16 type; - ReadBigEndian<uint16>(io_buffer_->data() + type_offset, &type); + base::ReadBigEndian<uint16>(io_buffer_->data() + type_offset, &type); return type; } diff --git a/net/dns/dns_test_util.cc b/net/dns/dns_test_util.cc index 6301421..01acb34 100644 --- a/net/dns/dns_test_util.cc +++ b/net/dns/dns_test_util.cc @@ -6,11 +6,11 @@ #include <string> +#include "base/big_endian.h" #include "base/bind.h" #include "base/memory/weak_ptr.h" #include "base/message_loop/message_loop.h" #include "base/sys_byteorder.h" -#include "net/base/big_endian.h" #include "net/base/dns_util.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" @@ -119,7 +119,7 @@ class MockTransaction : public DnsTransaction, // Write answer with loopback IP address. header->ancount = base::HostToNet16(1); - BigEndianWriter writer(buffer + nbytes, answer_size); + base::BigEndianWriter writer(buffer + nbytes, answer_size); writer.WriteU16(kPointerToQueryName); writer.WriteU16(qtype_); writer.WriteU16(net::dns_protocol::kClassIN); diff --git a/net/dns/dns_transaction.cc b/net/dns/dns_transaction.cc index 170ea67..130922c 100644 --- a/net/dns/dns_transaction.cc +++ b/net/dns/dns_transaction.cc @@ -8,6 +8,7 @@ #include <string> #include <vector> +#include "base/big_endian.h" #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" @@ -21,7 +22,6 @@ #include "base/threading/non_thread_safe.h" #include "base/timer/timer.h" #include "base/values.h" -#include "net/base/big_endian.h" #include "net/base/completion_callback.h" #include "net/base/dns_util.h" #include "net/base/io_buffer.h" @@ -388,7 +388,8 @@ class DnsTCPAttempt : public DnsAttempt { if (rv < 0) return rv; - WriteBigEndian<uint16>(length_buffer_->data(), query_->io_buffer()->size()); + base::WriteBigEndian<uint16>(length_buffer_->data(), + query_->io_buffer()->size()); buffer_ = new DrainableIOBuffer(length_buffer_.get(), length_buffer_->size()); next_state_ = STATE_SEND_LENGTH; @@ -446,7 +447,7 @@ class DnsTCPAttempt : public DnsAttempt { buffer_->BytesRemaining(), base::Bind(&DnsTCPAttempt::OnIOComplete, base::Unretained(this))); } - ReadBigEndian<uint16>(length_buffer_->data(), &response_length_); + base::ReadBigEndian<uint16>(length_buffer_->data(), &response_length_); // Check if advertised response is too short. (Optimization only.) if (response_length_ < query_->io_buffer()->size()) return ERR_DNS_MALFORMED_RESPONSE; diff --git a/net/dns/dns_transaction_unittest.cc b/net/dns/dns_transaction_unittest.cc index 7040e44..67a0457 100644 --- a/net/dns/dns_transaction_unittest.cc +++ b/net/dns/dns_transaction_unittest.cc @@ -10,7 +10,6 @@ #include "base/rand_util.h" #include "base/sys_byteorder.h" #include "base/test/test_timeouts.h" -#include "net/base/big_endian.h" #include "net/base/dns_util.h" #include "net/base/net_log.h" #include "net/dns/dns_protocol.h" diff --git a/net/dns/record_rdata.cc b/net/dns/record_rdata.cc index 4ebc643..0c60559 100644 --- a/net/dns/record_rdata.cc +++ b/net/dns/record_rdata.cc @@ -4,7 +4,7 @@ #include "net/dns/record_rdata.h" -#include "net/base/big_endian.h" +#include "base/big_endian.h" #include "net/base/dns_util.h" #include "net/dns/dns_protocol.h" #include "net/dns/dns_response.h" @@ -29,7 +29,7 @@ scoped_ptr<SrvRecordRdata> SrvRecordRdata::Create( scoped_ptr<SrvRecordRdata> rdata(new SrvRecordRdata); - BigEndianReader reader(data.data(), data.size()); + base::BigEndianReader reader(data.data(), data.size()); // 2 bytes for priority, 2 bytes for weight, 2 bytes for port. reader.ReadU16(&rdata->priority_); reader.ReadU16(&rdata->weight_); diff --git a/net/dns/record_rdata.h b/net/dns/record_rdata.h index f83a4865..def8e33 100644 --- a/net/dns/record_rdata.h +++ b/net/dns/record_rdata.h @@ -12,7 +12,6 @@ #include "base/compiler_specific.h" #include "base/memory/scoped_ptr.h" #include "base/strings/string_piece.h" -#include "net/base/big_endian.h" #include "net/base/net_export.h" #include "net/base/net_util.h" #include "net/dns/dns_protocol.h" diff --git a/net/net.gyp b/net/net.gyp index 6120f92..82cacf9 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -92,8 +92,6 @@ 'base/backoff_entry.h', 'base/bandwidth_metrics.cc', 'base/bandwidth_metrics.h', - 'base/big_endian.cc', - 'base/big_endian.h', 'base/cache_type.h', 'base/completion_callback.h', 'base/connection_type_histograms.cc', @@ -1660,7 +1658,6 @@ 'base/address_list_unittest.cc', 'base/address_tracker_linux_unittest.cc', 'base/backoff_entry_unittest.cc', - 'base/big_endian_unittest.cc', 'base/data_url_unittest.cc', 'base/directory_lister_unittest.cc', 'base/dns_util_unittest.cc', diff --git a/net/websockets/websocket_basic_stream_test.cc b/net/websockets/websocket_basic_stream_test.cc index 4dcb8e2..71af079 100644 --- a/net/websockets/websocket_basic_stream_test.cc +++ b/net/websockets/websocket_basic_stream_test.cc @@ -13,8 +13,8 @@ #include <string> #include "base/basictypes.h" +#include "base/big_endian.h" #include "base/port.h" -#include "net/base/big_endian.h" #include "net/base/capturing_net_log.h" #include "net/base/test_completion_callback.h" #include "net/socket/socket_test_util.h" @@ -803,7 +803,7 @@ TEST_F(WebSocketBasicStreamSocketChunkedReadTest, OneMegFrame) { (kWireSize + kReadBufferSize - 1) / kReadBufferSize; scoped_ptr<char[]> big_frame(new char[kWireSize]); memcpy(big_frame.get(), "\x81\x7F", 2); - WriteBigEndian(big_frame.get() + 2, kPayloadSize); + base::WriteBigEndian(big_frame.get() + 2, kPayloadSize); memset(big_frame.get() + kLargeFrameHeaderSize, 'A', kPayloadSize); CreateChunkedRead(ASYNC, diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc index 96d0b76..e1d478f89 100644 --- a/net/websockets/websocket_channel.cc +++ b/net/websockets/websocket_channel.cc @@ -7,6 +7,7 @@ #include <algorithm> #include "base/basictypes.h" // for size_t +#include "base/big_endian.h" #include "base/bind.h" #include "base/compiler_specific.h" #include "base/memory/weak_ptr.h" @@ -15,7 +16,6 @@ #include "base/stl_util.h" #include "base/strings/stringprintf.h" #include "base/time/time.h" -#include "net/base/big_endian.h" #include "net/base/io_buffer.h" #include "net/base/net_log.h" #include "net/http/http_request_headers.h" @@ -878,7 +878,7 @@ ChannelState WebSocketChannel::SendClose(uint16 code, const size_t payload_length = kWebSocketCloseCodeLength + reason.length(); body = new IOBuffer(payload_length); size = payload_length; - WriteBigEndian(body->data(), code); + base::WriteBigEndian(body->data(), code); COMPILE_ASSERT(sizeof(code) == kWebSocketCloseCodeLength, they_should_both_be_two); std::copy( @@ -921,7 +921,7 @@ bool WebSocketChannel::ParseClose(const scoped_refptr<IOBuffer>& buffer, } const char* data = buffer->data(); uint16 unchecked_code = 0; - ReadBigEndian(data, &unchecked_code); + base::ReadBigEndian(data, &unchecked_code); COMPILE_ASSERT(sizeof(unchecked_code) == kWebSocketCloseCodeLength, they_should_both_be_two_bytes); switch (unchecked_code) { diff --git a/net/websockets/websocket_frame.cc b/net/websockets/websocket_frame.cc index 763712a..6fe972b 100644 --- a/net/websockets/websocket_frame.cc +++ b/net/websockets/websocket_frame.cc @@ -7,9 +7,9 @@ #include <algorithm> #include "base/basictypes.h" +#include "base/big_endian.h" #include "base/logging.h" #include "base/rand_util.h" -#include "net/base/big_endian.h" #include "net/base/io_buffer.h" #include "net/base/net_errors.h" @@ -131,10 +131,10 @@ int WriteWebSocketFrameHeader(const WebSocketFrameHeader& header, // Writes "extended payload length" field. if (extended_length_size == 2) { uint16 payload_length_16 = static_cast<uint16>(header.payload_length); - WriteBigEndian(buffer + buffer_index, payload_length_16); + base::WriteBigEndian(buffer + buffer_index, payload_length_16); buffer_index += sizeof(payload_length_16); } else if (extended_length_size == 8) { - WriteBigEndian(buffer + buffer_index, header.payload_length); + base::WriteBigEndian(buffer + buffer_index, header.payload_length); buffer_index += sizeof(header.payload_length); } diff --git a/net/websockets/websocket_frame_parser.cc b/net/websockets/websocket_frame_parser.cc index 3b19912..2e4c58f 100644 --- a/net/websockets/websocket_frame_parser.cc +++ b/net/websockets/websocket_frame_parser.cc @@ -8,11 +8,11 @@ #include <limits> #include "base/basictypes.h" +#include "base/big_endian.h" #include "base/logging.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" #include "base/memory/scoped_vector.h" -#include "net/base/big_endian.h" #include "net/base/io_buffer.h" #include "net/websockets/websocket_frame.h" @@ -124,7 +124,7 @@ void WebSocketFrameParser::DecodeFrameHeader() { if (end - current < 2) return; uint16 payload_length_16; - ReadBigEndian(current, &payload_length_16); + base::ReadBigEndian(current, &payload_length_16); current += 2; payload_length = payload_length_16; if (payload_length <= kMaxPayloadLengthWithoutExtendedLengthField) @@ -132,7 +132,7 @@ void WebSocketFrameParser::DecodeFrameHeader() { } else if (payload_length == kPayloadLengthWithEightByteExtendedLengthField) { if (end - current < 8) return; - ReadBigEndian(current, &payload_length); + base::ReadBigEndian(current, &payload_length); current += 8; if (payload_length <= kuint16max || payload_length > static_cast<uint64>(kint64max)) { diff --git a/sql/test/test_helpers.cc b/sql/test/test_helpers.cc index 8d56140..fb055cf 100644 --- a/sql/test/test_helpers.cc +++ b/sql/test/test_helpers.cc @@ -42,7 +42,7 @@ bool GetRootPage(sql::Connection* db, const char* name, int* page_number) { } // Helper for reading a number from the SQLite header. -// See net/base/big_endian.h. +// See base/big_endian.h. unsigned ReadBigEndian(unsigned char* buf, size_t bytes) { unsigned r = buf[0]; for (size_t i = 1; i < bytes; i++) { diff --git a/ui/base/resource/resource_bundle.cc b/ui/base/resource/resource_bundle.cc index d469d78..7425fe3 100644 --- a/ui/base/resource/resource_bundle.cc +++ b/ui/base/resource/resource_bundle.cc @@ -6,6 +6,7 @@ #include <vector> +#include "base/big_endian.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/files/file.h" @@ -19,7 +20,6 @@ #include "base/synchronization/lock.h" #include "build/build_config.h" #include "grit/app_locale_settings.h" -#include "net/base/big_endian.h" #include "skia/ext/image_operations.h" #include "third_party/skia/include/core/SkBitmap.h" #include "ui/base/l10n/l10n_util.h" @@ -764,7 +764,7 @@ bool ResourceBundle::ShouldHighlightMissingScaledResources() { // static bool ResourceBundle::PNGContainsFallbackMarker(const unsigned char* buf, - size_t size) { + size_t size) { if (size < arraysize(kPngMagic) || memcmp(buf, kPngMagic, arraysize(kPngMagic)) != 0) { // Data invalid or a JPEG. @@ -778,7 +778,7 @@ bool ResourceBundle::PNGContainsFallbackMarker(const unsigned char* buf, if (size - pos < kPngChunkMetadataSize) break; uint32 length = 0; - net::ReadBigEndian(reinterpret_cast<const char*>(buf + pos), &length); + base::ReadBigEndian(reinterpret_cast<const char*>(buf + pos), &length); if (size - pos - kPngChunkMetadataSize < length) break; if (length == 0 && memcmp(buf + pos + sizeof(uint32), kPngScaleChunkType, diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc index 945a596..cfd4a44 100644 --- a/ui/base/resource/resource_bundle_unittest.cc +++ b/ui/base/resource/resource_bundle_unittest.cc @@ -5,6 +5,7 @@ #include "ui/base/resource/resource_bundle.h" #include "base/base_paths.h" +#include "base/big_endian.h" #include "base/file_util.h" #include "base/files/file_path.h" #include "base/files/scoped_temp_dir.h" @@ -12,7 +13,7 @@ #include "base/memory/ref_counted_memory.h" #include "base/path_service.h" #include "base/strings/utf_string_conversions.h" -#include "net/base/big_endian.h" +#include "grit/ui_resources.h" #include "testing/gmock/include/gmock/gmock.h" #include "testing/gtest/include/gtest/gtest.h" #include "third_party/skia/include/core/SkBitmap.h" @@ -21,8 +22,6 @@ #include "ui/gfx/codec/png_codec.h" #include "ui/gfx/image/image_skia.h" -#include "grit/ui_resources.h" - using ::testing::_; using ::testing::Between; using ::testing::Property; @@ -106,8 +105,8 @@ void AddCustomChunk(const base::StringPiece& custom_chunk, for (size_t i = 0; i < sizeof(uint32); ++i) ihdr_length_data[i] = *(ihdr_start + i); uint32 ihdr_chunk_length = 0; - net::ReadBigEndian(reinterpret_cast<char*>(ihdr_length_data), - &ihdr_chunk_length); + base::ReadBigEndian(reinterpret_cast<char*>(ihdr_length_data), + &ihdr_chunk_length); EXPECT_TRUE(std::equal( ihdr_start + sizeof(uint32), ihdr_start + sizeof(uint32) + sizeof(kPngIHDRChunkType), |