Chromium Code Reviews| Index: webrtc/modules/audio_processing/utility/audio_ring_buffer_unittest.cc |
| diff --git a/webrtc/common_audio/audio_ring_buffer_unittest.cc b/webrtc/modules/audio_processing/utility/audio_ring_buffer_unittest.cc |
| similarity index 91% |
| rename from webrtc/common_audio/audio_ring_buffer_unittest.cc |
| rename to webrtc/modules/audio_processing/utility/audio_ring_buffer_unittest.cc |
| index c5c38de56db4f82f3868ee2a54b09b57980f94bb..fa1f31072661b3d8585f55f333ed616139e232e4 100644 |
| --- a/webrtc/common_audio/audio_ring_buffer_unittest.cc |
| +++ b/webrtc/modules/audio_processing/utility/audio_ring_buffer_unittest.cc |
| @@ -9,16 +9,17 @@ |
| */ |
| #include <memory> |
| +#include <tuple> |
| -#include "webrtc/common_audio/audio_ring_buffer.h" |
| +#include "webrtc/modules/audio_processing/utility/audio_ring_buffer.h" |
| #include "testing/gtest/include/gtest/gtest.h" |
| #include "webrtc/common_audio/channel_buffer.h" |
| namespace webrtc { |
| -class AudioRingBufferTest : |
| - public ::testing::TestWithParam< ::testing::tuple<int, int, int, int> > { |
| +class AudioRingBufferTest |
| + : public ::testing::TestWithParam< ::testing::tuple<int, int, int, int> > { |
| }; |
| void ReadAndWriteTest(const ChannelBuffer<float>& input, |
| @@ -72,10 +73,8 @@ TEST_P(AudioRingBufferTest, ReadDataMatchesWrittenData) { |
| input.channels()[i][j] = (i + 1) * (j + 1); |
| ChannelBuffer<float> output(kFrames, static_cast<int>(num_channels)); |
| - ReadAndWriteTest(input, |
| - ::testing::get<0>(GetParam()), |
| - ::testing::get<1>(GetParam()), |
| - ::testing::get<2>(GetParam()), |
| + ReadAndWriteTest(input, ::testing::get<0>(GetParam()), |
|
hlundin-webrtc
2016/04/01 10:54:39
Could you hang on to the old line-breaking? I know
peah-webrtc
2016/04/01 20:54:39
Done.
|
| + ::testing::get<1>(GetParam()), ::testing::get<2>(GetParam()), |
| &output); |
| // Verify the read data matches the input. |
| @@ -85,7 +84,8 @@ TEST_P(AudioRingBufferTest, ReadDataMatchesWrittenData) { |
| } |
| INSTANTIATE_TEST_CASE_P( |
| - AudioRingBufferTest, AudioRingBufferTest, |
| + AudioRingBufferTest, |
| + AudioRingBufferTest, |
| ::testing::Combine(::testing::Values(10, 20, 42), // num_write_chunk_frames |
| ::testing::Values(1, 10, 17), // num_read_chunk_frames |
| ::testing::Values(100, 256), // buffer_frames |