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

Unified Diff: media/formats/mp2t/ts_packet.cc

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years 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/formats/mp2t/ts_packet.cc
diff --git a/media/formats/mp2t/ts_packet.cc b/media/formats/mp2t/ts_packet.cc
index e134aed9e69e0e0cc89554404b00c367ff6f276f..2c03cb6ecd22f48e0d3490ff306595e6cb0eca20 100644
--- a/media/formats/mp2t/ts_packet.cc
+++ b/media/formats/mp2t/ts_packet.cc
@@ -11,10 +11,10 @@
namespace media {
namespace mp2t {
-static const uint8 kTsHeaderSyncword = 0x47;
+static const uint8_t kTsHeaderSyncword = 0x47;
// static
-int TsPacket::Sync(const uint8* buf, int size) {
+int TsPacket::Sync(const uint8_t* buf, int size) {
int k = 0;
for (; k < size; k++) {
// Verify that we have 4 syncwords in a row when possible,
@@ -43,7 +43,7 @@ int TsPacket::Sync(const uint8* buf, int size) {
}
// static
-TsPacket* TsPacket::Parse(const uint8* buf, int size) {
+TsPacket* TsPacket::Parse(const uint8_t* buf, int size) {
if (size < kPacketSize) {
DVLOG(1) << "Buffer does not hold one full TS packet:"
<< " buffer_size=" << size;
@@ -73,7 +73,7 @@ TsPacket::TsPacket() {
TsPacket::~TsPacket() {
}
-bool TsPacket::ParseHeader(const uint8* buf) {
+bool TsPacket::ParseHeader(const uint8_t* buf) {
BitReader bit_reader(buf, kPacketSize);
payload_ = buf;
payload_size_ = kPacketSize;
@@ -161,7 +161,7 @@ bool TsPacket::ParseAdaptationField(BitReader* bit_reader,
random_access_indicator_ = (random_access_indicator != 0);
if (pcr_flag) {
- int64 program_clock_reference_base;
+ int64_t program_clock_reference_base;
int reserved;
int program_clock_reference_extension;
RCHECK(bit_reader->ReadBits(33, &program_clock_reference_base));
@@ -170,7 +170,7 @@ bool TsPacket::ParseAdaptationField(BitReader* bit_reader,
}
if (opcr_flag) {
- int64 original_program_clock_reference_base;
+ int64_t original_program_clock_reference_base;
int reserved;
int original_program_clock_reference_extension;
RCHECK(bit_reader->ReadBits(33, &original_program_clock_reference_base));

Powered by Google App Engine
This is Rietveld 408576698