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

Unified Diff: media/formats/mp2t/es_parser_mpeg1audio.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/es_parser_mpeg1audio.cc
diff --git a/media/formats/mp2t/es_parser_mpeg1audio.cc b/media/formats/mp2t/es_parser_mpeg1audio.cc
index 81abc2b85fb63c83c8cb69fd6abdf00489325204..5032887593c0ef78ea2e0095f89828a890b5f58a 100644
--- a/media/formats/mp2t/es_parser_mpeg1audio.cc
+++ b/media/formats/mp2t/es_parser_mpeg1audio.cc
@@ -6,7 +6,6 @@
#include <vector>
-#include "base/basictypes.h"
#include "base/bind.h"
#include "base/logging.h"
#include "base/strings/string_number_conversions.h"
@@ -24,7 +23,7 @@ namespace mp2t {
struct EsParserMpeg1Audio::Mpeg1AudioFrame {
// Pointer to the ES data.
- const uint8* data;
+ const uint8_t* data;
// Frame size.
int size;
@@ -33,7 +32,7 @@ struct EsParserMpeg1Audio::Mpeg1AudioFrame {
int sample_count;
// Frame offset in the ES queue.
- int64 queue_offset;
+ int64_t queue_offset;
};
EsParserMpeg1Audio::EsParserMpeg1Audio(
@@ -108,7 +107,7 @@ void EsParserMpeg1Audio::ResetInternal() {
bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
Mpeg1AudioFrame* mpeg1audio_frame) {
int es_size;
- const uint8* es;
+ const uint8_t* es;
es_queue_->Peek(&es, &es_size);
int max_offset = es_size - MPEG1AudioStreamParser::kHeaderSize;
@@ -116,7 +115,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
return false;
for (int offset = 0; offset < max_offset; offset++) {
- const uint8* cur_buf = &es[offset];
+ const uint8_t* cur_buf = &es[offset];
if (cur_buf[0] != 0xff)
continue;
@@ -161,7 +160,7 @@ bool EsParserMpeg1Audio::LookForMpeg1AudioFrame(
}
bool EsParserMpeg1Audio::UpdateAudioConfiguration(
- const uint8* mpeg1audio_header) {
+ const uint8_t* mpeg1audio_header) {
MPEG1AudioStreamParser::Header header;
if (!MPEG1AudioStreamParser::ParseHeader(media_log_, mpeg1audio_header,
&header)) {

Powered by Google App Engine
This is Rietveld 408576698