Switch to standard integer types in media/.

media/formats/mp2t/es_parser_mpeg1audio.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/mp2t/es_parser_mpeg1audio.h"
 
 #include <vector>
 
-#include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "media/base/audio_timestamp_helper.h"
 #include "media/base/bit_reader.h"
 #include "media/base/channel_layout.h"
 #include "media/base/stream_parser_buffer.h"
 #include "media/base/timestamp_constants.h"
 #include "media/formats/common/offset_byte_queue.h"
 #include "media/formats/mp2t/mp2t_common.h"
 #include "media/formats/mpeg/mpeg1_audio_stream_parser.h"
 
 namespace media {
 namespace mp2t {
 
 struct EsParserMpeg1Audio::Mpeg1AudioFrame {
   // Pointer to the ES data.
-  const uint8* data;
+  const uint8_t* data;
 
   // Frame size.
   int size;
 
   // Number of samples in the frame.
   int sample_count;
 
   // Frame offset in the ES queue.
-  int64 queue_offset;
+  int64_t queue_offset;
 };
 
 EsParserMpeg1Audio::EsParserMpeg1Audio(
     const NewAudioConfigCB& new_audio_config_cb,
     const EmitBufferCB& emit_buffer_cb,
     const scoped_refptr<MediaLog>& media_log)
     : media_log_(media_log),
       new_audio_config_cb_(new_audio_config_cb),
       emit_buffer_cb_(emit_buffer_cb) {
 }
@@ skipping 54 matching lines @@
 void EsParserMpeg1Audio::Flush() {
 }
 
 void EsParserMpeg1Audio::ResetInternal() {
   last_audio_decoder_config_ = AudioDecoderConfig();
 }
 
 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;
   if (max_offset <= 0)
     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;
 
     int remaining_size = es_size - offset;
     DCHECK_GE(remaining_size, MPEG1AudioStreamParser::kHeaderSize);
     MPEG1AudioStreamParser::Header header;
     if (!MPEG1AudioStreamParser::ParseHeader(media_log_, cur_buf, &header))
       continue;
 
     if (remaining_size < header.frame_size) {
@@ skipping 24 matching lines @@
         << base::HexEncode(mpeg1audio_frame->data,
                            MPEG1AudioStreamParser::kHeaderSize);
     return true;
   }
 
   es_queue_->Pop(max_offset);
   return false;
 }
 
 bool EsParserMpeg1Audio::UpdateAudioConfiguration(
-    const uint8* mpeg1audio_header) {
+    const uint8_t* mpeg1audio_header) {
   MPEG1AudioStreamParser::Header header;
   if (!MPEG1AudioStreamParser::ParseHeader(media_log_, mpeg1audio_header,
                                            &header)) {
     return false;
   }
 
   // TODO(damienv): Verify whether Android playback requires the extra data
   // field for Mpeg1 audio. If yes, we should generate this field.
   AudioDecoderConfig audio_decoder_config(
       kCodecMP3,
@@ skipping 26 matching lines @@
 }
 
 void EsParserMpeg1Audio::SkipMpeg1AudioFrame(
     const Mpeg1AudioFrame& mpeg1audio_frame) {
   DCHECK_EQ(mpeg1audio_frame.queue_offset, es_queue_->head());
   es_queue_->Pop(mpeg1audio_frame.size);
 }
 
 }  // namespace mp2t
 }  // namespace media