Switch to standard integer types in media/.

media/audio/win/waveout_output_win.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/win/waveout_output_win.h"
 
 #pragma comment(lib, "winmm.lib")
 
 #include "base/atomicops.h"
-#include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/trace_event/trace_event.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/win/audio_manager_win.h"
 
 namespace media {
 
 // Some general thoughts about the waveOut API which is badly documented :
 // - We use CALLBACK_EVENT mode in which XP signals events such as buffer
 //   releases.
 // - We use RegisterWaitForSingleObject() so one of threads in thread pool
 //   automatically calls our callback that feeds more data to Windows.
 // - Windows does not provide a way to query if the device is playing or paused
 //   thus it forces you to maintain state, which naturally is not exactly
 //   synchronized to the actual device state.
 
 // Sixty four MB is the maximum buffer size per AudioOutputStream.
-static const uint32 kMaxOpenBufferSize = 1024 * 1024 * 64;
+static const uint32_t kMaxOpenBufferSize = 1024 * 1024 * 64;
 
 // See Also
 // http://www.thx.com/consumer/home-entertainment/home-theater/surround-sound-speaker-set-up/
 // http://en.wikipedia.org/wiki/Surround_sound
 
 static const int kMaxChannelsToMask = 8;
 static const unsigned int kChannelsToMask[kMaxChannelsToMask + 1] = {
   0,
   // 1 = Mono
   SPEAKER_FRONT_CENTER,
@@ skipping 280 matching lines @@
     callback_->OnError(this);
 }
 
 void PCMWaveOutAudioOutputStream::QueueNextPacket(WAVEHDR *buffer) {
   DCHECK_EQ(channels_, format_.Format.nChannels);
   // Call the source which will fill our buffer with pleasant sounds and
   // return to us how many bytes were used.
   // TODO(fbarchard): Handle used 0 by queueing more.
 
   // TODO(sergeyu): Specify correct hardware delay for |total_delay_bytes|.
-  uint32 total_delay_bytes = pending_bytes_;
+  uint32_t total_delay_bytes = pending_bytes_;
   int frames_filled =
       callback_->OnMoreData(audio_bus_.get(), total_delay_bytes, 0);
-  uint32 used = frames_filled * audio_bus_->channels() *
-      format_.Format.wBitsPerSample / 8;
+  uint32_t used = frames_filled * audio_bus_->channels() *
+                  format_.Format.wBitsPerSample / 8;
 
   if (used <= buffer_size_) {
     // Note: If this ever changes to output raw float the data must be clipped
     // and sanitized since it may come from an untrusted source such as NaCl.
     audio_bus_->Scale(volume_);
     audio_bus_->ToInterleaved(
         frames_filled, format_.Format.wBitsPerSample / 8, buffer->lpData);
 
     buffer->dwBufferLength = used * format_.Format.nChannels / channels_;
   } else {
@@ skipping 44 matching lines @@
                                        buffer,
                                        sizeof(WAVEHDR));
       if (result != MMSYSERR_NOERROR)
         stream->HandleError(result);
       stream->pending_bytes_ += buffer->dwBufferLength;
     }
   }
 }
 
 }  // namespace media