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

Unified Diff: media/formats/mpeg/mpeg1_audio_stream_parser.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/mpeg/mpeg1_audio_stream_parser.cc
diff --git a/media/formats/mpeg/mpeg1_audio_stream_parser.cc b/media/formats/mpeg/mpeg1_audio_stream_parser.cc
index 67b3705b0308f75ee77ee31196fa1cb1bbf71504..410c70d9201b711f01821aaf973145ac99201567 100644
--- a/media/formats/mpeg/mpeg1_audio_stream_parser.cc
+++ b/media/formats/mpeg/mpeg1_audio_stream_parser.cc
@@ -6,7 +6,7 @@
namespace media {
-static const uint32 kMPEG1StartCodeMask = 0xffe00000;
+static const uint32_t kMPEG1StartCodeMask = 0xffe00000;
// Map that determines which bitrate_index & channel_mode combinations
// are allowed.
@@ -88,7 +88,7 @@ static const int kCodecDelay = 529;
// static
bool MPEG1AudioStreamParser::ParseHeader(
const scoped_refptr<MediaLog>& media_log,
- const uint8* data,
+ const uint8_t* data,
Header* header) {
BitReader reader(data, kHeaderSize);
int sync;
@@ -221,7 +221,7 @@ MPEG1AudioStreamParser::MPEG1AudioStreamParser()
MPEG1AudioStreamParser::~MPEG1AudioStreamParser() {}
-int MPEG1AudioStreamParser::ParseFrameHeader(const uint8* data,
+int MPEG1AudioStreamParser::ParseFrameHeader(const uint8_t* data,
int size,
int* frame_size,
int* sample_rate,

Powered by Google App Engine
This is Rietveld 408576698