Switch to standard integer types in media/.

media/audio/mac/audio_low_latency_input_mac_unittest.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 "base/basictypes.h"
 #include "base/environment.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
 #include "base/threading/platform_thread.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_manager_base.h"
 #include "media/audio/audio_unittest_util.h"
 #include "media/audio/mac/audio_low_latency_input_mac.h"
 #include "media/base/seekable_buffer.h"
@@ skipping 12 matching lines @@
   if (++*count >= limit) {
     loop->PostTask(FROM_HERE, closure);
   }
 }
 
 class MockAudioInputCallback : public AudioInputStream::AudioInputCallback {
  public:
   MOCK_METHOD4(OnData,
                void(AudioInputStream* stream,
                     const AudioBus* src,
-                    uint32 hardware_delay_bytes,
+                    uint32_t hardware_delay_bytes,
                     double volume));
   MOCK_METHOD1(OnError, void(AudioInputStream* stream));
 };
 
 // This audio sink implementation should be used for manual tests only since
 // the recorded data is stored on a raw binary data file.
 // The last test (WriteToFileAudioSink) - which is disabled by default -
 // can use this audio sink to store the captured data on a file for offline
 // analysis.
 class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback {
  public:
   // Allocate space for ~10 seconds of data @ 48kHz in stereo:
   // 2 bytes per sample, 2 channels, 10ms @ 48kHz, 10 seconds <=> 1920000 bytes.
   static const int kMaxBufferSize = 2 * 2 * 480 * 100 * 10;
 
   explicit WriteToFileAudioSink(const char* file_name)
       : buffer_(0, kMaxBufferSize),
         file_(fopen(file_name, "wb")),
         bytes_to_write_(0) {
   }
 
   ~WriteToFileAudioSink() override {
     int bytes_written = 0;
     while (bytes_written < bytes_to_write_) {
-      const uint8* chunk;
+      const uint8_t* chunk;
       int chunk_size;
 
       // Stop writing if no more data is available.
       if (!buffer_.GetCurrentChunk(&chunk, &chunk_size))
         break;
 
       // Write recorded data chunk to the file and prepare for next chunk.
       fwrite(chunk, 1, chunk_size, file_);
       buffer_.Seek(chunk_size);
       bytes_written += chunk_size;
     }
     fclose(file_);
   }
 
   // AudioInputStream::AudioInputCallback implementation.
   void OnData(AudioInputStream* stream,
               const AudioBus* src,
-              uint32 hardware_delay_bytes,
+              uint32_t hardware_delay_bytes,
               double volume) override {
     const int num_samples = src->frames() * src->channels();
-    scoped_ptr<int16> interleaved(new int16[num_samples]);
+    scoped_ptr<int16_t> interleaved(new int16_t[num_samples]);
     const int bytes_per_sample = sizeof(*interleaved);
     src->ToInterleaved(src->frames(), bytes_per_sample, interleaved.get());
 
     // Store data data in a temporary buffer to avoid making blocking
     // fwrite() calls in the audio callback. The complete buffer will be
     // written to file in the destructor.
     const int size = bytes_per_sample * num_samples;
-    if (buffer_.Append((const uint8*)interleaved.get(), size)) {
+    if (buffer_.Append((const uint8_t*)interleaved.get(), size)) {
       bytes_to_write_ += size;
     }
   }
 
   void OnError(AudioInputStream* stream) override {}
 
  private:
   media::SeekableBuffer buffer_;
   FILE* file_;
   int bytes_to_write_;
@@ skipping 186 matching lines @@
   WriteToFileAudioSink file_sink(file_name);
   fprintf(stderr, "               >> Speak into the mic while recording...\n");
   ais->Start(&file_sink);
   base::PlatformThread::Sleep(TestTimeouts::action_timeout());
   ais->Stop();
   fprintf(stderr, "               >> Recording has stopped.\n");
   ais->Close();
 }
 
 }  // namespace media