Switch to standard integer types in media/.

media/formats/mpeg/mpeg1_audio_stream_parser.cc

 // 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 "media/formats/mpeg/mpeg1_audio_stream_parser.h"
 
 namespace media {
 
-static const uint32 kMPEG1StartCodeMask = 0xffe00000;
+static const uint32_t kMPEG1StartCodeMask = 0xffe00000;
 
 // Map that determines which bitrate_index & channel_mode combinations
 // are allowed.
 // Derived from: http://mpgedit.org/mpgedit/mpeg_format/MP3Format.html
 static const bool kIsAllowed[17][4] = {
   { true, true, true, true },      // free
   { true, false, false, false },   // 32
   { true, false, false, false },   // 48
   { true, false, false, false },   // 56
   { true, true, true, true },      // 64
@@ skipping 61 matching lines @@
 
 // Frame header field constants.
 static const int kBitrateFree = 0;
 static const int kBitrateBad = 0xf;
 static const int kSampleRateReserved = 3;
 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;
   int version;
   int layer;
   int is_protected;
   int bitrate_index;
   int sample_rate_index;
   int has_padding;
   int is_private;
@@ skipping 112 matching lines @@
   header->channel_mode = channel_mode;
   return true;
 }
 
 
 MPEG1AudioStreamParser::MPEG1AudioStreamParser()
     : MPEGAudioStreamParserBase(kMPEG1StartCodeMask, kCodecMP3, kCodecDelay) {}
 
 MPEG1AudioStreamParser::~MPEG1AudioStreamParser() {}
 
-int MPEG1AudioStreamParser::ParseFrameHeader(const uint8* data,
+int MPEG1AudioStreamParser::ParseFrameHeader(const uint8_t* data,
                                              int size,
                                              int* frame_size,
                                              int* sample_rate,
                                              ChannelLayout* channel_layout,
                                              int* sample_count,
                                              bool* metadata_frame) const {
   DCHECK(data);
   DCHECK_GE(size, 0);
   DCHECK(frame_size);
 
@@ skipping 44 matching lines @@
     if (metadata_frame)
       *metadata_frame = true;
     return header_bytes_read + reader.bits_read() / 8;
   }
 
   // If it wasn't a XING frame, just return the number consumed bytes.
   return header_bytes_read;
 }
 
 }  // namespace media