Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(703)

Unified Diff: media/audio/mac/audio_low_latency_input_mac_unittest.cc

Issue 1534273002: Switch to standard integer types in media/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: more Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: media/audio/mac/audio_low_latency_input_mac_unittest.cc
diff --git a/media/audio/mac/audio_low_latency_input_mac_unittest.cc b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
index b1a8b3b69aca00c8da65caa9003b2af3d59bc052..22691a734c0fba9355927169ccf58850f2185765 100644
--- a/media/audio/mac/audio_low_latency_input_mac_unittest.cc
+++ b/media/audio/mac/audio_low_latency_input_mac_unittest.cc
@@ -2,7 +2,6 @@
// 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"
@@ -35,7 +34,7 @@ class MockAudioInputCallback : public AudioInputStream::AudioInputCallback {
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));
};
@@ -60,7 +59,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback {
~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.
@@ -78,10 +77,10 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback {
// 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());
@@ -89,7 +88,7 @@ class WriteToFileAudioSink : public AudioInputStream::AudioInputCallback {
// 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;
}
}

Powered by Google App Engine
This is Rietveld 408576698