Index: media/filters/audio_renderer_algorithm_unittest.cc |
diff --git a/media/filters/audio_renderer_algorithm_unittest.cc b/media/filters/audio_renderer_algorithm_unittest.cc |
index 986d6b5d8da887d24210c1813bf665ef0fa29f1e..37320b83c2c0f666a37fba28e667cd65c7e2fced 100644 |
--- a/media/filters/audio_renderer_algorithm_unittest.cc |
+++ b/media/filters/audio_renderer_algorithm_unittest.cc |
@@ -105,37 +105,22 @@ class AudioRendererAlgorithmTest : public testing::Test { |
while (!algorithm_.IsQueueFull()) { |
switch (sample_format_) { |
case kSampleFormatU8: |
- buffer = MakeAudioBuffer<uint8>( |
- sample_format_, |
- channel_layout_, |
- ChannelLayoutToChannelCount(channel_layout_), |
- samples_per_second_, |
- 1, |
- 1, |
- kFrameSize, |
- kNoTimestamp()); |
+ buffer = MakeAudioBuffer<uint8_t>( |
+ sample_format_, channel_layout_, |
+ ChannelLayoutToChannelCount(channel_layout_), samples_per_second_, |
+ 1, 1, kFrameSize, kNoTimestamp()); |
break; |
case kSampleFormatS16: |
- buffer = MakeAudioBuffer<int16>( |
- sample_format_, |
- channel_layout_, |
- ChannelLayoutToChannelCount(channel_layout_), |
- samples_per_second_, |
- 1, |
- 1, |
- kFrameSize, |
- kNoTimestamp()); |
+ buffer = MakeAudioBuffer<int16_t>( |
+ sample_format_, channel_layout_, |
+ ChannelLayoutToChannelCount(channel_layout_), samples_per_second_, |
+ 1, 1, kFrameSize, kNoTimestamp()); |
break; |
case kSampleFormatS32: |
- buffer = MakeAudioBuffer<int32>( |
- sample_format_, |
- channel_layout_, |
- ChannelLayoutToChannelCount(channel_layout_), |
- samples_per_second_, |
- 1, |
- 1, |
- kFrameSize, |
- kNoTimestamp()); |
+ buffer = MakeAudioBuffer<int32_t>( |
+ sample_format_, channel_layout_, |
+ ChannelLayoutToChannelCount(channel_layout_), samples_per_second_, |
+ 1, 1, kFrameSize, kNoTimestamp()); |
break; |
default: |
NOTREACHED() << "Unrecognized format " << sample_format_; |
@@ -268,7 +253,7 @@ class AudioRendererAlgorithmTest : public testing::Test { |
kSampleRateHz, |
kPulseWidthSamples); |
- const std::vector<uint8*>& channel_data = input->channel_data(); |
+ const std::vector<uint8_t*>& channel_data = input->channel_data(); |
// Fill |input| channels. |
FillWithSquarePulseTrain(kHalfPulseWidthSamples, 0, kPulseWidthSamples, |