Switch to standard integer types in media/.

media/audio/mac/audio_low_latency_input_mac.cc

 // Copyright (c) 2012 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/audio/mac/audio_low_latency_input_mac.h"
 
 #include <CoreServices/CoreServices.h>
 
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/mac/mac_logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/sparse_histogram.h"
 #include "base/time/time.h"
 #include "media/audio/mac/audio_manager_mac.h"
 #include "media/base/audio_bus.h"
 #include "media/base/data_buffer.h"
 
 namespace media {
@@ skipping 62 matching lines @@
 
   DVLOG(1) << "Desired ouput format: " << format_;
 
   // Derive size (in bytes) of the buffers that we will render to.
   UInt32 data_byte_size = number_of_frames_ * format_.mBytesPerFrame;
   DVLOG(1) << "Size of data buffer in bytes : " << data_byte_size;
 
   // Allocate AudioBuffers to be used as storage for the received audio.
   // The AudioBufferList structure works as a placeholder for the
   // AudioBuffer structure, which holds a pointer to the actual data buffer.
-  audio_data_buffer_.reset(new uint8[data_byte_size]);
+  audio_data_buffer_.reset(new uint8_t[data_byte_size]);
   audio_buffer_list_.mNumberBuffers = 1;
 
   AudioBuffer* audio_buffer = audio_buffer_list_.mBuffers;
   audio_buffer->mNumberChannels = input_params.channels();
   audio_buffer->mDataByteSize = data_byte_size;
   audio_buffer->mData = audio_data_buffer_.get();
 }
 
 AUAudioInputStream::~AUAudioInputStream() {}
 
@@ skipping 411 matching lines @@
   // See crbug/428706 for details.
   UInt32 new_size = number_of_frames * audio_input->format_.mBytesPerFrame;
   AudioBuffer* audio_buffer = audio_input->audio_buffer_list()->mBuffers;
   if (new_size != audio_buffer->mDataByteSize) {
     if (new_size > audio_buffer->mDataByteSize) {
       // This can happen if the device is unpluged during recording. We
       // allocate enough memory here to avoid depending on how CoreAudio
       // handles it.
       // See See http://www.crbug.com/434681 for one example when we can enter
       // this scope.
-      audio_input->audio_data_buffer_.reset(new uint8[new_size]);
+      audio_input->audio_data_buffer_.reset(new uint8_t[new_size]);
       audio_buffer->mData = audio_input->audio_data_buffer_.get();
     }
 
     // Update the |mDataByteSize| to match |number_of_frames|.
     audio_buffer->mDataByteSize = new_size;
   }
 
   // Receive audio from the AUHAL from the output scope of the Audio Unit.
   OSStatus result = AudioUnitRender(audio_input->audio_unit(),
                                     flags,
@@ skipping 40 matching lines @@
   // Update the capture latency.
   double capture_latency_frames = GetCaptureLatency(time_stamp);
 
   // The AGC volume level is updated once every second on a separate thread.
   // Note that, |volume| is also updated each time SetVolume() is called
   // through IPC by the render-side AGC.
   double normalized_volume = 0.0;
   GetAgcVolume(&normalized_volume);
 
   AudioBuffer& buffer = io_data->mBuffers[0];
-  uint8* audio_data = reinterpret_cast<uint8*>(buffer.mData);
-  uint32 capture_delay_bytes = static_cast<uint32>
-      ((capture_latency_frames + 0.5) * format_.mBytesPerFrame);
+  uint8_t* audio_data = reinterpret_cast<uint8_t*>(buffer.mData);
+  uint32_t capture_delay_bytes = static_cast<uint32_t>(
+      (capture_latency_frames + 0.5) * format_.mBytesPerFrame);
   DCHECK(audio_data);
   if (!audio_data)
     return kAudioUnitErr_InvalidElement;
 
   // Dynamically increase capacity of the FIFO to handle larger buffers from
   // CoreAudio. This can happen in combination with Apple Thunderbolt Displays
   // when the Display Audio is used as capture source and the cable is first
   // remove and then inserted again.
   // See http://www.crbug.com/434681 for details.
   if (static_cast<int>(number_of_frames) > fifo_.GetUnfilledFrames()) {
@@ skipping 205 matching lines @@
                         buffer_size_was_changed_);
   UMA_HISTOGRAM_COUNTS_1000("Media.Audio.NumberOfOutputStreamsMac",
                             manager_->output_streams());
   UMA_HISTOGRAM_COUNTS_1000("Media.Audio.NumberOfLowLatencyInputStreamsMac",
                             manager_->low_latency_input_streams());
   UMA_HISTOGRAM_COUNTS_1000("Media.Audio.NumberOfBasicInputStreamsMac",
                             manager_->basic_input_streams());
 }
 
 }  // namespace media