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

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

Issue 2700983002: Remove the Windows Wave audio device implementation. (Closed)
Patch Set: Remove kAudioWindowsWave (silly me only removing kWindowsWaveAudio). Created 3 years, 10 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 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
163 163
164 // Windows: 164 // Windows:
165 // if (WEBRTC_WINDOWS_CORE_AUDIO_BUILD) 165 // if (WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
166 // user can select between default (Core) or Wave 166 // user can select between default (Core) or Wave
167 // else 167 // else
168 // user can select between default (Wave) or Wave 168 // user can select between default (Wave) or Wave
169 const int32_t kId = 444; 169 const int32_t kId = 444;
170 170
171 #if defined(_WIN32) 171 #if defined(_WIN32)
172 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 172 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
173 kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL); 173 kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
the sun 2017/02/17 18:41:55 Should this go in the #else part instead? And remo
tommi 2017/02/17 21:44:22 Oddly, this is to test that creating an instance o
tommi 2017/02/17 21:44:46 and by 'test', I mean expectation.
174 #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) 174 #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
175 TEST_LOG("WEBRTC_WINDOWS_CORE_AUDIO_BUILD is defined!\n\n"); 175 TEST_LOG("WEBRTC_WINDOWS_CORE_AUDIO_BUILD is defined!\n\n");
176 // create default implementation (=Core Audio) instance 176 // create default implementation (=Core Audio) instance
177 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 177 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
178 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); 178 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
179 EXPECT_EQ(0, audio_device_.release()->Release()); 179 EXPECT_EQ(0, audio_device_.release()->Release());
180 // create non-default (=Wave Audio) instance
181 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
182 kId, AudioDeviceModule::kWindowsWaveAudio)) != NULL);
183 EXPECT_EQ(0, audio_device_.release()->Release()); 180 EXPECT_EQ(0, audio_device_.release()->Release());
184 // explicitly specify usage of Core Audio (same as default) 181 // explicitly specify usage of Core Audio (same as default)
185 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 182 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
186 kId, AudioDeviceModule::kWindowsCoreAudio)) != NULL); 183 kId, AudioDeviceModule::kWindowsCoreAudio)) != NULL);
187 #else 184 #else
188 TEST_LOG("WEBRTC_WINDOWS_CORE_AUDIO_BUILD is *not* defined!\n"); 185 TEST_LOG("WEBRTC_WINDOWS_CORE_AUDIO_BUILD is *not* defined!\n");
189 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 186 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
190 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL); 187 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
191 // create default implementation (=Wave Audio) instance 188 // create default implementation (=Wave Audio) instance
192 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 189 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
193 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); 190 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
194 EXPECT_EQ(0, audio_device_.release()->Release()); 191 EXPECT_EQ(0, audio_device_.release()->Release());
195 // explicitly specify usage of Wave Audio (same as default)
196 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
197 kId, AudioDeviceModule::kWindowsWaveAudio)) != NULL);
198 #endif 192 #endif
199 #endif 193 #endif
200 194
201 #if defined(ANDROID) 195 #if defined(ANDROID)
202 // Fails tests 196 // Fails tests
203 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 197 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
204 kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
205 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
206 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL); 198 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
207 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 199 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
208 kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL); 200 kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
209 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 201 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
210 kId, AudioDeviceModule::kLinuxPulseAudio)) == NULL); 202 kId, AudioDeviceModule::kLinuxPulseAudio)) == NULL);
211 // Create default implementation instance 203 // Create default implementation instance
212 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 204 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
213 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); 205 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
214 #elif defined(WEBRTC_LINUX) 206 #elif defined(WEBRTC_LINUX)
215 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 207 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
216 kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
217 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
218 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL); 208 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
219 // create default implementation instance 209 // create default implementation instance
220 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 210 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
221 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); 211 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
222 EXPECT_EQ(0, audio_device_->Terminate()); 212 EXPECT_EQ(0, audio_device_->Terminate());
223 EXPECT_EQ(0, audio_device_.release()->Release()); 213 EXPECT_EQ(0, audio_device_.release()->Release());
224 // explicitly specify usage of Pulse Audio (same as default) 214 // explicitly specify usage of Pulse Audio (same as default)
225 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 215 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
226 kId, AudioDeviceModule::kLinuxPulseAudio)) != NULL); 216 kId, AudioDeviceModule::kLinuxPulseAudio)) != NULL);
227 #endif 217 #endif
228 218
229 #if defined(WEBRTC_MAC) 219 #if defined(WEBRTC_MAC)
230 // Fails tests 220 // Fails tests
231 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 221 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
232 kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
233 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
234 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL); 222 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
235 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 223 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
236 kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL); 224 kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
237 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 225 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
238 kId, AudioDeviceModule::kLinuxPulseAudio)) == NULL); 226 kId, AudioDeviceModule::kLinuxPulseAudio)) == NULL);
239 // Create default implementation instance 227 // Create default implementation instance
240 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 228 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
241 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); 229 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
242 #endif 230 #endif
243 231
(...skipping 1461 matching lines...) Expand 10 before | Expand all | Expand 10 after
1705 EXPECT_EQ(48000, sampleRate); 1693 EXPECT_EQ(48000, sampleRate);
1706 #elif defined(ANDROID) 1694 #elif defined(ANDROID)
1707 TEST_LOG("Playout sample rate is %u\n\n", sampleRate); 1695 TEST_LOG("Playout sample rate is %u\n\n", sampleRate);
1708 EXPECT_TRUE((sampleRate == 44000) || (sampleRate == 16000)); 1696 EXPECT_TRUE((sampleRate == 44000) || (sampleRate == 16000));
1709 #elif defined(WEBRTC_IOS) 1697 #elif defined(WEBRTC_IOS)
1710 TEST_LOG("Playout sample rate is %u\n\n", sampleRate); 1698 TEST_LOG("Playout sample rate is %u\n\n", sampleRate);
1711 EXPECT_TRUE((sampleRate == 44000) || (sampleRate == 16000) || 1699 EXPECT_TRUE((sampleRate == 44000) || (sampleRate == 16000) ||
1712 (sampleRate == 8000)); 1700 (sampleRate == 8000));
1713 #endif 1701 #endif
1714 } 1702 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698