Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(136)

Unified Diff: media/cast/rtcp/rtcp_sender.cc

Issue 145873006: ui/base/resource: Roll our own version of ReadBigEndian() function. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: base/big_endian Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/cast/rtcp/rtcp_sender.cc
diff --git a/media/cast/rtcp/rtcp_sender.cc b/media/cast/rtcp/rtcp_sender.cc
index af9042f4f498293003983589fceae8b33a336508..043bdc7d4cf5c252438ba75fa4dddd852e9df651 100644
--- a/media/cast/rtcp/rtcp_sender.cc
+++ b/media/cast/rtcp/rtcp_sender.cc
@@ -7,6 +7,7 @@
#include <algorithm>
#include <vector>
+#include "base/big_endian.h"
#include "base/logging.h"
#include "media/cast/cast_environment.h"
#include "media/cast/rtcp/receiver_rtcp_event_subscriber.h"
@@ -14,7 +15,6 @@
#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 {
@@ -206,7 +206,7 @@ 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(&((*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);
@@ -225,7 +225,7 @@ 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(&((*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);
@@ -254,7 +254,7 @@ 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(&((*packet)[start_size]), 10);
// We always need to add one SDES CNAME.
big_endian_writer.WriteU8(0x80 + 1);
big_endian_writer.WriteU8(transport::kPacketTypeSdes);
@@ -295,7 +295,7 @@ 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(&((*packet)[start_size]), 12);
uint8 FMT = 1; // Picture loss indicator.
big_endian_writer.WriteU8(0x80 + FMT);
big_endian_writer.WriteU8(transport::kPacketTypePayloadSpecific);
@@ -320,7 +320,7 @@ 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(&((*packet)[start_size]), 24);
uint8 FMT = 3; // Reference Picture Selection Indication.
big_endian_writer.WriteU8(0x80 + FMT);
big_endian_writer.WriteU8(transport::kPacketTypePayloadSpecific);
@@ -374,7 +374,7 @@ 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(&((*packet)[start_size]), remb_size);
// Add application layer feedback.
uint8 FMT = 15;
@@ -414,7 +414,7 @@ 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(&((*packet)[start_size]), 16);
uint8 FMT = 1;
big_endian_writer.WriteU8(0x80 + FMT);
@@ -452,7 +452,7 @@ 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(&((*packet)[start_size]), 4);
big_endian_nack_writer.WriteU16(nack_sequence_number);
big_endian_nack_writer.WriteU16(bitmask);
number_of_nack_fields++;
@@ -468,7 +468,7 @@ 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(&((*packet)[start_size]), 8);
big_endian_writer.WriteU8(0x80 + 1);
big_endian_writer.WriteU8(transport::kPacketTypeBye);
big_endian_writer.WriteU16(1); // Length.
@@ -483,7 +483,7 @@ 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(&((*packet)[start_size]), 20);
big_endian_writer.WriteU8(0x80);
big_endian_writer.WriteU8(transport::kPacketTypeXr);
@@ -505,7 +505,7 @@ 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(&((*packet)[start_size]), 20);
uint8 FMT = 15; // Application layer feedback.
big_endian_writer.WriteU8(0x80 + FMT);
big_endian_writer.WriteU8(transport::kPacketTypePayloadSpecific);
@@ -536,7 +536,7 @@ 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(&((*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);
@@ -548,8 +548,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(&((*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));
@@ -591,8 +591,8 @@ void RtcpSender::BuildReceiverLog(RtcpReceiverLogMessage* receiver_log_message,
}
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(&((*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>(

Powered by Google App Engine
This is Rietveld 408576698