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

Side by Side Diff: webrtc/modules/audio_device/test/audio_device_test_api.cc

Issue 1534193008: Misc. small cleanups (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Unnecessary parens Created 4 years, 11 months 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 unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 if (nChannels == 1) { 121 if (nChannels == 1) {
122 TEST_LOG("+"); 122 TEST_LOG("+");
123 } else { 123 } else {
124 TEST_LOG("++"); 124 TEST_LOG("++");
125 } 125 }
126 } 126 }
127 nSamplesOut = 480; 127 nSamplesOut = 480;
128 return 0; 128 return 0;
129 } 129 }
130 130
131 int OnDataAvailable(const int voe_channels[],
132 int number_of_voe_channels,
133 const int16_t* audio_data,
134 int sample_rate,
135 int number_of_channels,
136 size_t number_of_frames,
137 int audio_delay_milliseconds,
138 int current_volume,
139 bool key_pressed,
140 bool need_audio_processing) override {
141 return 0;
142 }
143
144 void PushCaptureData(int voe_channel, const void* audio_data,
145 int bits_per_sample, int sample_rate,
146 int number_of_channels,
147 size_t number_of_frames) override {}
148
149 void PullRenderData(int bits_per_sample, int sample_rate,
150 int number_of_channels, size_t number_of_frames,
151 void* audio_data,
152 int64_t* elapsed_time_ms,
153 int64_t* ntp_time_ms) override {}
154 private: 131 private:
155 uint32_t rec_count_; 132 uint32_t rec_count_;
156 uint32_t play_count_; 133 uint32_t play_count_;
157 }; 134 };
158 135
159 class AudioDeviceAPITest: public testing::Test { 136 class AudioDeviceAPITest: public testing::Test {
160 protected: 137 protected:
161 AudioDeviceAPITest() {} 138 AudioDeviceAPITest() {}
162 139
163 virtual ~AudioDeviceAPITest() {} 140 virtual ~AudioDeviceAPITest() {}
(...skipping 1658 matching lines...) Expand 10 before | Expand all | Expand 10 after
1822 // TODO(kjellander): Fix so these tests pass on Mac. 1799 // TODO(kjellander): Fix so these tests pass on Mac.
1823 #if !defined(WEBRTC_MAC) 1800 #if !defined(WEBRTC_MAC)
1824 EXPECT_EQ(0, audio_device_->InitPlayout()); 1801 EXPECT_EQ(0, audio_device_->InitPlayout());
1825 EXPECT_EQ(0, audio_device_->StartPlayout()); 1802 EXPECT_EQ(0, audio_device_->StartPlayout());
1826 #endif 1803 #endif
1827 1804
1828 EXPECT_EQ(-1, audio_device_->GetLoudspeakerStatus(&loudspeakerOn)); 1805 EXPECT_EQ(-1, audio_device_->GetLoudspeakerStatus(&loudspeakerOn));
1829 #endif 1806 #endif
1830 EXPECT_EQ(0, audio_device_->StopPlayout()); 1807 EXPECT_EQ(0, audio_device_->StopPlayout());
1831 } 1808 }
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/dummy/file_audio_device.cc ('k') | webrtc/modules/audio_device/test/func_test_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698