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

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

Issue 2685783014: Replace NULL with nullptr in all C++ files. (Closed)
Patch Set: Fixing android. 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)) == nullptr);
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)) !=
179 nullptr);
179 EXPECT_EQ(0, audio_device_.release()->Release()); 180 EXPECT_EQ(0, audio_device_.release()->Release());
180 // create non-default (=Wave Audio) instance 181 // create non-default (=Wave Audio) instance
181 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 182 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
182 kId, AudioDeviceModule::kWindowsWaveAudio)) != NULL); 183 kId, AudioDeviceModule::kWindowsWaveAudio)) != nullptr);
183 EXPECT_EQ(0, audio_device_.release()->Release()); 184 EXPECT_EQ(0, audio_device_.release()->Release());
184 // explicitly specify usage of Core Audio (same as default) 185 // explicitly specify usage of Core Audio (same as default)
185 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 186 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
186 kId, AudioDeviceModule::kWindowsCoreAudio)) != NULL); 187 kId, AudioDeviceModule::kWindowsCoreAudio)) != nullptr);
187 #else 188 #else
188 TEST_LOG("WEBRTC_WINDOWS_CORE_AUDIO_BUILD is *not* defined!\n"); 189 TEST_LOG("WEBRTC_WINDOWS_CORE_AUDIO_BUILD is *not* defined!\n");
189 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 190 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
190 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL); 191 kId, AudioDeviceModule::kWindowsCoreAudio)) == nullptr);
191 // create default implementation (=Wave Audio) instance 192 // create default implementation (=Wave Audio) instance
192 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 193 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
193 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); 194 kId, AudioDeviceModule::kPlatformDefaultAudio)) !=
195 nullptr);
194 EXPECT_EQ(0, audio_device_.release()->Release()); 196 EXPECT_EQ(0, audio_device_.release()->Release());
195 // explicitly specify usage of Wave Audio (same as default) 197 // explicitly specify usage of Wave Audio (same as default)
196 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 198 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
197 kId, AudioDeviceModule::kWindowsWaveAudio)) != NULL); 199 kId, AudioDeviceModule::kWindowsWaveAudio)) != nullptr);
198 #endif 200 #endif
199 #endif 201 #endif
200 202
201 #if defined(ANDROID) 203 #if defined(ANDROID)
202 // Fails tests 204 // Fails tests
203 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 205 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
204 kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL); 206 kId, AudioDeviceModule::kWindowsWaveAudio)) == nullptr);
205 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 207 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
206 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL); 208 kId, AudioDeviceModule::kWindowsCoreAudio)) == nullptr);
207 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 209 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
208 kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL); 210 kId, AudioDeviceModule::kLinuxAlsaAudio)) == nullptr);
209 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 211 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
210 kId, AudioDeviceModule::kLinuxPulseAudio)) == NULL); 212 kId, AudioDeviceModule::kLinuxPulseAudio)) == nullptr);
211 // Create default implementation instance 213 // Create default implementation instance
212 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 214 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
213 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); 215 kId, AudioDeviceModule::kPlatformDefaultAudio)) !=
216 nullptr);
214 #elif defined(WEBRTC_LINUX) 217 #elif defined(WEBRTC_LINUX)
215 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 218 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
216 kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL); 219 kId, AudioDeviceModule::kWindowsWaveAudio)) == nullptr);
217 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 220 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
218 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL); 221 kId, AudioDeviceModule::kWindowsCoreAudio)) == nullptr);
219 // create default implementation instance 222 // create default implementation instance
220 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 223 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
221 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); 224 kId, AudioDeviceModule::kPlatformDefaultAudio)) !=
225 nullptr);
222 EXPECT_EQ(0, audio_device_->Terminate()); 226 EXPECT_EQ(0, audio_device_->Terminate());
223 EXPECT_EQ(0, audio_device_.release()->Release()); 227 EXPECT_EQ(0, audio_device_.release()->Release());
224 // explicitly specify usage of Pulse Audio (same as default) 228 // explicitly specify usage of Pulse Audio (same as default)
225 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 229 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
226 kId, AudioDeviceModule::kLinuxPulseAudio)) != NULL); 230 kId, AudioDeviceModule::kLinuxPulseAudio)) != nullptr);
227 #endif 231 #endif
228 232
229 #if defined(WEBRTC_MAC) 233 #if defined(WEBRTC_MAC)
230 // Fails tests 234 // Fails tests
231 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 235 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
232 kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL); 236 kId, AudioDeviceModule::kWindowsWaveAudio)) == nullptr);
233 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 237 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
234 kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL); 238 kId, AudioDeviceModule::kWindowsCoreAudio)) == nullptr);
235 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 239 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
236 kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL); 240 kId, AudioDeviceModule::kLinuxAlsaAudio)) == nullptr);
237 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 241 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
238 kId, AudioDeviceModule::kLinuxPulseAudio)) == NULL); 242 kId, AudioDeviceModule::kLinuxPulseAudio)) == nullptr);
239 // Create default implementation instance 243 // Create default implementation instance
240 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create( 244 EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
241 kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL); 245 kId, AudioDeviceModule::kPlatformDefaultAudio)) !=
246 nullptr);
242 #endif 247 #endif
243 248
244 if (audio_device_ == NULL) { 249 if (audio_device_ == nullptr) {
245 FAIL() << "Failed creating audio device object!"; 250 FAIL() << "Failed creating audio device object!";
246 } 251 }
247 252
248 process_thread_->RegisterModule(audio_device_); 253 process_thread_->RegisterModule(audio_device_);
249 254
250 AudioDeviceModule::AudioLayer audio_layer = 255 AudioDeviceModule::AudioLayer audio_layer =
251 AudioDeviceModule::kPlatformDefaultAudio; 256 AudioDeviceModule::kPlatformDefaultAudio;
252 EXPECT_EQ(0, audio_device_->ActiveAudioLayer(&audio_layer)); 257 EXPECT_EQ(0, audio_device_->ActiveAudioLayer(&audio_layer));
253 if (audio_layer == AudioDeviceModule::kLinuxAlsaAudio) { 258 if (audio_layer == AudioDeviceModule::kLinuxAlsaAudio) {
254 linux_alsa_ = true; 259 linux_alsa_ = true;
255 } 260 }
256 } 261 }
257 262
258 static void TearDownTestCase() { 263 static void TearDownTestCase() {
259 if (process_thread_) { 264 if (process_thread_) {
260 process_thread_->DeRegisterModule(audio_device_); 265 process_thread_->DeRegisterModule(audio_device_);
261 process_thread_->Stop(); 266 process_thread_->Stop();
262 process_thread_.reset(); 267 process_thread_.reset();
263 } 268 }
264 if (event_observer_) { 269 if (event_observer_) {
265 delete event_observer_; 270 delete event_observer_;
266 event_observer_ = NULL; 271 event_observer_ = nullptr;
267 } 272 }
268 if (audio_transport_) { 273 if (audio_transport_) {
269 delete audio_transport_; 274 delete audio_transport_;
270 audio_transport_ = NULL; 275 audio_transport_ = nullptr;
271 } 276 }
272 if (audio_device_) 277 if (audio_device_)
273 EXPECT_EQ(0, audio_device_.release()->Release()); 278 EXPECT_EQ(0, audio_device_.release()->Release());
274 PRINT_TEST_RESULTS; 279 PRINT_TEST_RESULTS;
275 } 280 }
276 281
277 void SetUp() override { 282 void SetUp() override {
278 if (linux_alsa_) { 283 if (linux_alsa_) {
279 FAIL() << "API Test is not available on ALSA on Linux!"; 284 FAIL() << "API Test is not available on ALSA on Linux!";
280 } 285 }
(...skipping 30 matching lines...) Expand all
311 static std::unique_ptr<ProcessThread> process_thread_; 316 static std::unique_ptr<ProcessThread> process_thread_;
312 static rtc::scoped_refptr<AudioDeviceModule> audio_device_; 317 static rtc::scoped_refptr<AudioDeviceModule> audio_device_;
313 static AudioTransportAPI* audio_transport_; 318 static AudioTransportAPI* audio_transport_;
314 static AudioEventObserverAPI* event_observer_; 319 static AudioEventObserverAPI* event_observer_;
315 }; 320 };
316 321
317 // Must be initialized like this to handle static SetUpTestCase() above. 322 // Must be initialized like this to handle static SetUpTestCase() above.
318 bool AudioDeviceAPITest::linux_alsa_ = false; 323 bool AudioDeviceAPITest::linux_alsa_ = false;
319 std::unique_ptr<ProcessThread> AudioDeviceAPITest::process_thread_; 324 std::unique_ptr<ProcessThread> AudioDeviceAPITest::process_thread_;
320 rtc::scoped_refptr<AudioDeviceModule> AudioDeviceAPITest::audio_device_; 325 rtc::scoped_refptr<AudioDeviceModule> AudioDeviceAPITest::audio_device_;
321 AudioTransportAPI* AudioDeviceAPITest::audio_transport_ = NULL; 326 AudioTransportAPI* AudioDeviceAPITest::audio_transport_ = nullptr;
322 AudioEventObserverAPI* AudioDeviceAPITest::event_observer_ = NULL; 327 AudioEventObserverAPI* AudioDeviceAPITest::event_observer_ = nullptr;
323 328
324 TEST_F(AudioDeviceAPITest, RegisterEventObserver) { 329 TEST_F(AudioDeviceAPITest, RegisterEventObserver) {
325 event_observer_ = new AudioEventObserverAPI(audio_device_); 330 event_observer_ = new AudioEventObserverAPI(audio_device_);
326 EXPECT_EQ(0, audio_device_->RegisterEventObserver(NULL)); 331 EXPECT_EQ(0, audio_device_->RegisterEventObserver(nullptr));
327 EXPECT_EQ(0, audio_device_->RegisterEventObserver(event_observer_)); 332 EXPECT_EQ(0, audio_device_->RegisterEventObserver(event_observer_));
328 EXPECT_EQ(0, audio_device_->RegisterEventObserver(NULL)); 333 EXPECT_EQ(0, audio_device_->RegisterEventObserver(nullptr));
329 } 334 }
330 335
331 TEST_F(AudioDeviceAPITest, RegisterAudioCallback) { 336 TEST_F(AudioDeviceAPITest, RegisterAudioCallback) {
332 audio_transport_ = new AudioTransportAPI(audio_device_); 337 audio_transport_ = new AudioTransportAPI(audio_device_);
333 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL)); 338 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
334 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(audio_transport_)); 339 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(audio_transport_));
335 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL)); 340 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
336 } 341 }
337 342
338 TEST_F(AudioDeviceAPITest, Init) { 343 TEST_F(AudioDeviceAPITest, Init) {
339 EXPECT_TRUE(audio_device_->Initialized()); 344 EXPECT_TRUE(audio_device_->Initialized());
340 EXPECT_EQ(0, audio_device_->Init()); 345 EXPECT_EQ(0, audio_device_->Init());
341 EXPECT_TRUE(audio_device_->Initialized()); 346 EXPECT_TRUE(audio_device_->Initialized());
342 EXPECT_EQ(0, audio_device_->Terminate()); 347 EXPECT_EQ(0, audio_device_->Terminate());
343 EXPECT_FALSE(audio_device_->Initialized()); 348 EXPECT_FALSE(audio_device_->Initialized());
344 EXPECT_EQ(0, audio_device_->Init()); 349 EXPECT_EQ(0, audio_device_->Init());
345 EXPECT_TRUE(audio_device_->Initialized()); 350 EXPECT_TRUE(audio_device_->Initialized());
(...skipping 26 matching lines...) Expand all
372 // TODO(henrika): uncomment when you have decided what to do with issue 3675. 377 // TODO(henrika): uncomment when you have decided what to do with issue 3675.
373 #if 0 378 #if 0
374 TEST_F(AudioDeviceAPITest, PlayoutDeviceName) { 379 TEST_F(AudioDeviceAPITest, PlayoutDeviceName) {
375 char name[kAdmMaxDeviceNameSize]; 380 char name[kAdmMaxDeviceNameSize];
376 char guid[kAdmMaxGuidSize]; 381 char guid[kAdmMaxGuidSize];
377 int16_t no_devices = audio_device_->PlayoutDevices(); 382 int16_t no_devices = audio_device_->PlayoutDevices();
378 383
379 // fail tests 384 // fail tests
380 EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(-2, name, guid)); 385 EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(-2, name, guid));
381 EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(no_devices, name, guid)); 386 EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(no_devices, name, guid));
382 EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(0, NULL, guid)); 387 EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(0, nullptr, guid));
383 388
384 // bulk tests 389 // bulk tests
385 EXPECT_EQ(0, audio_device_->PlayoutDeviceName(0, name, NULL)); 390 EXPECT_EQ(0, audio_device_->PlayoutDeviceName(0, name, nullptr));
386 #ifdef _WIN32 391 #ifdef _WIN32
387 // shall be mapped to 0. 392 // shall be mapped to 0.
388 EXPECT_EQ(0, audio_device_->PlayoutDeviceName(-1, name, NULL)); 393 EXPECT_EQ(0, audio_device_->PlayoutDeviceName(-1, name, nullptr));
389 #else 394 #else
390 EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(-1, name, NULL)); 395 EXPECT_EQ(-1, audio_device_->PlayoutDeviceName(-1, name, nullptr));
391 #endif 396 #endif
392 for (int i = 0; i < no_devices; i++) { 397 for (int i = 0; i < no_devices; i++) {
393 EXPECT_EQ(0, audio_device_->PlayoutDeviceName(i, name, guid)); 398 EXPECT_EQ(0, audio_device_->PlayoutDeviceName(i, name, guid));
394 EXPECT_EQ(0, audio_device_->PlayoutDeviceName(i, name, NULL)); 399 EXPECT_EQ(0, audio_device_->PlayoutDeviceName(i, name, nullptr));
395 } 400 }
396 } 401 }
397 402
398 TEST_F(AudioDeviceAPITest, RecordingDeviceName) { 403 TEST_F(AudioDeviceAPITest, RecordingDeviceName) {
399 char name[kAdmMaxDeviceNameSize]; 404 char name[kAdmMaxDeviceNameSize];
400 char guid[kAdmMaxGuidSize]; 405 char guid[kAdmMaxGuidSize];
401 int16_t no_devices = audio_device_->RecordingDevices(); 406 int16_t no_devices = audio_device_->RecordingDevices();
402 407
403 // fail tests 408 // fail tests
404 EXPECT_EQ(-1, audio_device_->RecordingDeviceName(-2, name, guid)); 409 EXPECT_EQ(-1, audio_device_->RecordingDeviceName(-2, name, guid));
405 EXPECT_EQ(-1, audio_device_->RecordingDeviceName(no_devices, name, guid)); 410 EXPECT_EQ(-1, audio_device_->RecordingDeviceName(no_devices, name, guid));
406 EXPECT_EQ(-1, audio_device_->RecordingDeviceName(0, NULL, guid)); 411 EXPECT_EQ(-1, audio_device_->RecordingDeviceName(0, nullptr, guid));
407 412
408 // bulk tests 413 // bulk tests
409 EXPECT_EQ(0, audio_device_->RecordingDeviceName(0, name, NULL)); 414 EXPECT_EQ(0, audio_device_->RecordingDeviceName(0, name, nullptr));
410 #ifdef _WIN32 415 #ifdef _WIN32
411 // shall me mapped to 0 416 // shall me mapped to 0
412 EXPECT_EQ(0, audio_device_->RecordingDeviceName(-1, name, NULL)); 417 EXPECT_EQ(0, audio_device_->RecordingDeviceName(-1, name, nullptr));
413 #else 418 #else
414 EXPECT_EQ(-1, audio_device_->RecordingDeviceName(-1, name, NULL)); 419 EXPECT_EQ(-1, audio_device_->RecordingDeviceName(-1, name, nullptr));
415 #endif 420 #endif
416 for (int i = 0; i < no_devices; i++) { 421 for (int i = 0; i < no_devices; i++) {
417 EXPECT_EQ(0, audio_device_->RecordingDeviceName(i, name, guid)); 422 EXPECT_EQ(0, audio_device_->RecordingDeviceName(i, name, guid));
418 EXPECT_EQ(0, audio_device_->RecordingDeviceName(i, name, NULL)); 423 EXPECT_EQ(0, audio_device_->RecordingDeviceName(i, name, nullptr));
419 } 424 }
420 } 425 }
421 426
422 TEST_F(AudioDeviceAPITest, SetPlayoutDevice) { 427 TEST_F(AudioDeviceAPITest, SetPlayoutDevice) {
423 int16_t no_devices = audio_device_->PlayoutDevices(); 428 int16_t no_devices = audio_device_->PlayoutDevices();
424 429
425 // fail tests 430 // fail tests
426 EXPECT_EQ(-1, audio_device_->SetPlayoutDevice(-1)); 431 EXPECT_EQ(-1, audio_device_->SetPlayoutDevice(-1));
427 EXPECT_EQ(-1, audio_device_->SetPlayoutDevice(no_devices)); 432 EXPECT_EQ(-1, audio_device_->SetPlayoutDevice(no_devices));
428 433
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
609 EXPECT_EQ(0, audio_device_->InitRecording()); 614 EXPECT_EQ(0, audio_device_->InitRecording());
610 EXPECT_TRUE(audio_device_->RecordingIsInitialized()); 615 EXPECT_TRUE(audio_device_->RecordingIsInitialized());
611 } 616 }
612 } 617 }
613 } 618 }
614 EXPECT_EQ(0, audio_device_->StopRecording()); 619 EXPECT_EQ(0, audio_device_->StopRecording());
615 } 620 }
616 621
617 TEST_F(AudioDeviceAPITest, StartAndStopPlayout) { 622 TEST_F(AudioDeviceAPITest, StartAndStopPlayout) {
618 bool available; 623 bool available;
619 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL)); 624 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
620 625
621 CheckInitialPlayoutStates(); 626 CheckInitialPlayoutStates();
622 627
623 EXPECT_EQ(-1, audio_device_->StartPlayout()); 628 EXPECT_EQ(-1, audio_device_->StartPlayout());
624 EXPECT_EQ(0, audio_device_->StopPlayout()); 629 EXPECT_EQ(0, audio_device_->StopPlayout());
625 630
626 #ifdef _WIN32 631 #ifdef _WIN32
627 // kDefaultCommunicationDevice 632 // kDefaultCommunicationDevice
628 EXPECT_TRUE(audio_device_->SetPlayoutDevice( 633 EXPECT_TRUE(audio_device_->SetPlayoutDevice(
629 AudioDeviceModule::kDefaultCommunicationDevice) == 0); 634 AudioDeviceModule::kDefaultCommunicationDevice) == 0);
630 EXPECT_EQ(0, audio_device_->PlayoutIsAvailable(&available)); 635 EXPECT_EQ(0, audio_device_->PlayoutIsAvailable(&available));
631 if (available) 636 if (available)
632 { 637 {
633 EXPECT_FALSE(audio_device_->PlayoutIsInitialized()); 638 EXPECT_FALSE(audio_device_->PlayoutIsInitialized());
634 EXPECT_EQ(0, audio_device_->InitPlayout()); 639 EXPECT_EQ(0, audio_device_->InitPlayout());
635 EXPECT_EQ(0, audio_device_->StartPlayout()); 640 EXPECT_EQ(0, audio_device_->StartPlayout());
636 EXPECT_TRUE(audio_device_->Playing()); 641 EXPECT_TRUE(audio_device_->Playing());
637 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_)); 642 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
638 EXPECT_EQ(0, audio_device_->StopPlayout()); 643 EXPECT_EQ(0, audio_device_->StopPlayout());
639 EXPECT_FALSE(audio_device_->Playing()); 644 EXPECT_FALSE(audio_device_->Playing());
640 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL)); 645 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
641 } 646 }
642 #endif 647 #endif
643 648
644 // repeat test but for kDefaultDevice 649 // repeat test but for kDefaultDevice
645 EXPECT_EQ(0, audio_device_->SetPlayoutDevice(MACRO_DEFAULT_DEVICE)); 650 EXPECT_EQ(0, audio_device_->SetPlayoutDevice(MACRO_DEFAULT_DEVICE));
646 EXPECT_EQ(0, audio_device_->PlayoutIsAvailable(&available)); 651 EXPECT_EQ(0, audio_device_->PlayoutIsAvailable(&available));
647 if (available) { 652 if (available) {
648 EXPECT_FALSE(audio_device_->PlayoutIsInitialized()); 653 EXPECT_FALSE(audio_device_->PlayoutIsInitialized());
649 EXPECT_EQ(0, audio_device_->InitPlayout()); 654 EXPECT_EQ(0, audio_device_->InitPlayout());
650 EXPECT_EQ(0, audio_device_->StartPlayout()); 655 EXPECT_EQ(0, audio_device_->StartPlayout());
651 EXPECT_TRUE(audio_device_->Playing()); 656 EXPECT_TRUE(audio_device_->Playing());
652 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_)); 657 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
653 EXPECT_EQ(0, audio_device_->StopPlayout()); 658 EXPECT_EQ(0, audio_device_->StopPlayout());
654 EXPECT_FALSE(audio_device_->Playing()); 659 EXPECT_FALSE(audio_device_->Playing());
655 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL)); 660 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
656 } 661 }
657 662
658 // repeat test for all devices 663 // repeat test for all devices
659 int16_t no_devices = audio_device_->PlayoutDevices(); 664 int16_t no_devices = audio_device_->PlayoutDevices();
660 for (int i = 0; i < no_devices; i++) { 665 for (int i = 0; i < no_devices; i++) {
661 EXPECT_EQ(0, audio_device_->SetPlayoutDevice(i)); 666 EXPECT_EQ(0, audio_device_->SetPlayoutDevice(i));
662 EXPECT_EQ(0, audio_device_->PlayoutIsAvailable(&available)); 667 EXPECT_EQ(0, audio_device_->PlayoutIsAvailable(&available));
663 if (available) { 668 if (available) {
664 EXPECT_FALSE(audio_device_->PlayoutIsInitialized()); 669 EXPECT_FALSE(audio_device_->PlayoutIsInitialized());
665 EXPECT_EQ(0, audio_device_->InitPlayout()); 670 EXPECT_EQ(0, audio_device_->InitPlayout());
666 EXPECT_EQ(0, audio_device_->StartPlayout()); 671 EXPECT_EQ(0, audio_device_->StartPlayout());
667 EXPECT_TRUE(audio_device_->Playing()); 672 EXPECT_TRUE(audio_device_->Playing());
668 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_)); 673 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
669 EXPECT_EQ(0, audio_device_->StopPlayout()); 674 EXPECT_EQ(0, audio_device_->StopPlayout());
670 EXPECT_FALSE(audio_device_->Playing()); 675 EXPECT_FALSE(audio_device_->Playing());
671 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL)); 676 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
672 } 677 }
673 } 678 }
674 } 679 }
675 680
676 TEST_F(AudioDeviceAPITest, StartAndStopRecording) { 681 TEST_F(AudioDeviceAPITest, StartAndStopRecording) {
677 bool available; 682 bool available;
678 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL)); 683 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
679 684
680 CheckInitialRecordingStates(); 685 CheckInitialRecordingStates();
681 686
682 EXPECT_EQ(-1, audio_device_->StartRecording()); 687 EXPECT_EQ(-1, audio_device_->StartRecording());
683 EXPECT_EQ(0, audio_device_->StopRecording()); 688 EXPECT_EQ(0, audio_device_->StopRecording());
684 689
685 #ifdef _WIN32 690 #ifdef _WIN32
686 // kDefaultCommunicationDevice 691 // kDefaultCommunicationDevice
687 EXPECT_TRUE(audio_device_->SetRecordingDevice( 692 EXPECT_TRUE(audio_device_->SetRecordingDevice(
688 AudioDeviceModule::kDefaultCommunicationDevice) == 0); 693 AudioDeviceModule::kDefaultCommunicationDevice) == 0);
689 EXPECT_EQ(0, audio_device_->RecordingIsAvailable(&available)); 694 EXPECT_EQ(0, audio_device_->RecordingIsAvailable(&available));
690 if (available) 695 if (available)
691 { 696 {
692 EXPECT_FALSE(audio_device_->RecordingIsInitialized()); 697 EXPECT_FALSE(audio_device_->RecordingIsInitialized());
693 EXPECT_EQ(0, audio_device_->InitRecording()); 698 EXPECT_EQ(0, audio_device_->InitRecording());
694 EXPECT_EQ(0, audio_device_->StartRecording()); 699 EXPECT_EQ(0, audio_device_->StartRecording());
695 EXPECT_TRUE(audio_device_->Recording()); 700 EXPECT_TRUE(audio_device_->Recording());
696 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_)); 701 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
697 EXPECT_EQ(0, audio_device_->StopRecording()); 702 EXPECT_EQ(0, audio_device_->StopRecording());
698 EXPECT_FALSE(audio_device_->Recording()); 703 EXPECT_FALSE(audio_device_->Recording());
699 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL)); 704 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
700 } 705 }
701 #endif 706 #endif
702 707
703 // repeat test but for kDefaultDevice 708 // repeat test but for kDefaultDevice
704 EXPECT_EQ(0, audio_device_->SetRecordingDevice(MACRO_DEFAULT_DEVICE)); 709 EXPECT_EQ(0, audio_device_->SetRecordingDevice(MACRO_DEFAULT_DEVICE));
705 EXPECT_EQ(0, audio_device_->RecordingIsAvailable(&available)); 710 EXPECT_EQ(0, audio_device_->RecordingIsAvailable(&available));
706 if (available) { 711 if (available) {
707 EXPECT_FALSE(audio_device_->RecordingIsInitialized()); 712 EXPECT_FALSE(audio_device_->RecordingIsInitialized());
708 EXPECT_EQ(0, audio_device_->InitRecording()); 713 EXPECT_EQ(0, audio_device_->InitRecording());
709 EXPECT_EQ(0, audio_device_->StartRecording()); 714 EXPECT_EQ(0, audio_device_->StartRecording());
710 EXPECT_TRUE(audio_device_->Recording()); 715 EXPECT_TRUE(audio_device_->Recording());
711 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_)); 716 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
712 EXPECT_EQ(0, audio_device_->StopRecording()); 717 EXPECT_EQ(0, audio_device_->StopRecording());
713 EXPECT_FALSE(audio_device_->Recording()); 718 EXPECT_FALSE(audio_device_->Recording());
714 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL)); 719 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
715 } 720 }
716 721
717 // repeat test for all devices 722 // repeat test for all devices
718 int16_t no_devices = audio_device_->RecordingDevices(); 723 int16_t no_devices = audio_device_->RecordingDevices();
719 for (int i = 0; i < no_devices; i++) { 724 for (int i = 0; i < no_devices; i++) {
720 EXPECT_EQ(0, audio_device_->SetRecordingDevice(i)); 725 EXPECT_EQ(0, audio_device_->SetRecordingDevice(i));
721 EXPECT_EQ(0, audio_device_->RecordingIsAvailable(&available)); 726 EXPECT_EQ(0, audio_device_->RecordingIsAvailable(&available));
722 if (available) { 727 if (available) {
723 EXPECT_FALSE(audio_device_->RecordingIsInitialized()); 728 EXPECT_FALSE(audio_device_->RecordingIsInitialized());
724 EXPECT_EQ(0, audio_device_->InitRecording()); 729 EXPECT_EQ(0, audio_device_->InitRecording());
725 EXPECT_EQ(0, audio_device_->StartRecording()); 730 EXPECT_EQ(0, audio_device_->StartRecording());
726 EXPECT_TRUE(audio_device_->Recording()); 731 EXPECT_TRUE(audio_device_->Recording());
727 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_)); 732 EXPECT_EQ(-1, audio_device_->RegisterAudioCallback(audio_transport_));
728 EXPECT_EQ(0, audio_device_->StopRecording()); 733 EXPECT_EQ(0, audio_device_->StopRecording());
729 EXPECT_FALSE(audio_device_->Recording()); 734 EXPECT_FALSE(audio_device_->Recording());
730 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(NULL)); 735 EXPECT_EQ(0, audio_device_->RegisterAudioCallback(nullptr));
731 } 736 }
732 } 737 }
733 } 738 }
734 739
735 #if defined(_WIN32) && !defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) 740 #if defined(_WIN32) && !defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
736 TEST_F(AudioDeviceAPITest, SetAndGetWaveOutVolume) { 741 TEST_F(AudioDeviceAPITest, SetAndGetWaveOutVolume) {
737 uint32_t vol(0); 742 uint32_t vol(0);
738 // NOTE 1: Windows Wave only! 743 // NOTE 1: Windows Wave only!
739 // NOTE 2: It seems like the waveOutSetVolume API returns 744 // NOTE 2: It seems like the waveOutSetVolume API returns
740 // MMSYSERR_NOTSUPPORTED on some Vista machines! 745 // MMSYSERR_NOTSUPPORTED on some Vista machines!
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
780 } 785 }
781 } 786 }
782 787
783 EXPECT_EQ(0, audio_device_->StopPlayout()); 788 EXPECT_EQ(0, audio_device_->StopPlayout());
784 EXPECT_FALSE(audio_device_->Playing()); 789 EXPECT_FALSE(audio_device_->Playing());
785 } 790 }
786 #endif // defined(_WIN32) && !defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) 791 #endif // defined(_WIN32) && !defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
787 792
788 TEST_F(AudioDeviceAPITest, InitSpeaker) { 793 TEST_F(AudioDeviceAPITest, InitSpeaker) {
789 // NOTE: By calling Terminate (in TearDown) followed by Init (in SetUp) we 794 // NOTE: By calling Terminate (in TearDown) followed by Init (in SetUp) we
790 // ensure that any existing output mixer handle is set to NULL. 795 // ensure that any existing output mixer handle is set to null.
791 // The mixer handle is closed and reopened again for each call to 796 // The mixer handle is closed and reopened again for each call to
792 // SetPlayoutDevice. 797 // SetPlayoutDevice.
793 CheckInitialPlayoutStates(); 798 CheckInitialPlayoutStates();
794 799
795 // kDefaultCommunicationDevice 800 // kDefaultCommunicationDevice
796 EXPECT_EQ(0, audio_device_->SetPlayoutDevice( 801 EXPECT_EQ(0, audio_device_->SetPlayoutDevice(
797 MACRO_DEFAULT_COMMUNICATION_DEVICE)); 802 MACRO_DEFAULT_COMMUNICATION_DEVICE));
798 EXPECT_EQ(0, audio_device_->InitSpeaker()); 803 EXPECT_EQ(0, audio_device_->InitSpeaker());
799 804
800 // fail tests 805 // fail tests
(...skipping 13 matching lines...) Expand all
814 // repeat test for all devices 819 // repeat test for all devices
815 int16_t no_devices = audio_device_->PlayoutDevices(); 820 int16_t no_devices = audio_device_->PlayoutDevices();
816 for (int i = 0; i < no_devices; i++) { 821 for (int i = 0; i < no_devices; i++) {
817 EXPECT_EQ(0, audio_device_->SetPlayoutDevice(i)); 822 EXPECT_EQ(0, audio_device_->SetPlayoutDevice(i));
818 EXPECT_EQ(0, audio_device_->InitSpeaker()); 823 EXPECT_EQ(0, audio_device_->InitSpeaker());
819 } 824 }
820 } 825 }
821 826
822 TEST_F(AudioDeviceAPITest, InitMicrophone) { 827 TEST_F(AudioDeviceAPITest, InitMicrophone) {
823 // NOTE: By calling Terminate (in TearDown) followed by Init (in SetUp) we 828 // NOTE: By calling Terminate (in TearDown) followed by Init (in SetUp) we
824 // ensure that any existing output mixer handle is set to NULL. 829 // ensure that any existing output mixer handle is set to null.
825 // The mixer handle is closed and reopened again for each call to 830 // The mixer handle is closed and reopened again for each call to
826 // SetRecordingDevice. 831 // SetRecordingDevice.
827 CheckInitialRecordingStates(); 832 CheckInitialRecordingStates();
828 833
829 // kDefaultCommunicationDevice 834 // kDefaultCommunicationDevice
830 EXPECT_EQ(0, 835 EXPECT_EQ(0,
831 audio_device_->SetRecordingDevice(MACRO_DEFAULT_COMMUNICATION_DEVICE)); 836 audio_device_->SetRecordingDevice(MACRO_DEFAULT_COMMUNICATION_DEVICE));
832 EXPECT_EQ(0, audio_device_->InitMicrophone()); 837 EXPECT_EQ(0, audio_device_->InitMicrophone());
833 838
834 // fail tests 839 // fail tests
(...skipping 770 matching lines...) Expand 10 before | Expand all | Expand 10 after
1605 } 1610 }
1606 1611
1607 // TODO(kjellander): Fix flakiness causing failures on Windows. 1612 // TODO(kjellander): Fix flakiness causing failures on Windows.
1608 // TODO(phoglund): Fix flakiness causing failures on Linux. 1613 // TODO(phoglund): Fix flakiness causing failures on Linux.
1609 #if !defined(_WIN32) && !defined(WEBRTC_LINUX) 1614 #if !defined(_WIN32) && !defined(WEBRTC_LINUX)
1610 TEST_F(AudioDeviceAPITest, StartAndStopRawOutputFileRecording) { 1615 TEST_F(AudioDeviceAPITest, StartAndStopRawOutputFileRecording) {
1611 // NOTE: this API is better tested in a functional test 1616 // NOTE: this API is better tested in a functional test
1612 CheckInitialPlayoutStates(); 1617 CheckInitialPlayoutStates();
1613 1618
1614 // fail tests 1619 // fail tests
1615 EXPECT_EQ(-1, audio_device_->StartRawOutputFileRecording(NULL)); 1620 EXPECT_EQ(-1, audio_device_->StartRawOutputFileRecording(nullptr));
1616 1621
1617 // bulk tests 1622 // bulk tests
1618 EXPECT_EQ(0, audio_device_->StartRawOutputFileRecording( 1623 EXPECT_EQ(0, audio_device_->StartRawOutputFileRecording(
1619 GetFilename("raw_output_not_playing.pcm"))); 1624 GetFilename("raw_output_not_playing.pcm")));
1620 EXPECT_EQ(0, audio_device_->StopRawOutputFileRecording()); 1625 EXPECT_EQ(0, audio_device_->StopRawOutputFileRecording());
1621 EXPECT_EQ(0, audio_device_->SetPlayoutDevice( 1626 EXPECT_EQ(0, audio_device_->SetPlayoutDevice(
1622 MACRO_DEFAULT_COMMUNICATION_DEVICE)); 1627 MACRO_DEFAULT_COMMUNICATION_DEVICE));
1623 1628
1624 // TODO(kjellander): Fix so these tests pass on Mac. 1629 // TODO(kjellander): Fix so these tests pass on Mac.
1625 #if !defined(WEBRTC_MAC) 1630 #if !defined(WEBRTC_MAC)
(...skipping 15 matching lines...) Expand all
1641 // - size of raw_output_not_playing.pcm shall be 0 1646 // - size of raw_output_not_playing.pcm shall be 0
1642 // - size of raw_output_playing.pcm shall be > 0 1647 // - size of raw_output_playing.pcm shall be > 0
1643 } 1648 }
1644 1649
1645 TEST_F(AudioDeviceAPITest, StartAndStopRawInputFileRecording) { 1650 TEST_F(AudioDeviceAPITest, StartAndStopRawInputFileRecording) {
1646 // NOTE: this API is better tested in a functional test 1651 // NOTE: this API is better tested in a functional test
1647 CheckInitialRecordingStates(); 1652 CheckInitialRecordingStates();
1648 EXPECT_FALSE(audio_device_->Playing()); 1653 EXPECT_FALSE(audio_device_->Playing());
1649 1654
1650 // fail tests 1655 // fail tests
1651 EXPECT_EQ(-1, audio_device_->StartRawInputFileRecording(NULL)); 1656 EXPECT_EQ(-1, audio_device_->StartRawInputFileRecording(nullptr));
1652 1657
1653 // bulk tests 1658 // bulk tests
1654 EXPECT_EQ(0, audio_device_->StartRawInputFileRecording( 1659 EXPECT_EQ(0, audio_device_->StartRawInputFileRecording(
1655 GetFilename("raw_input_not_recording.pcm"))); 1660 GetFilename("raw_input_not_recording.pcm")));
1656 EXPECT_EQ(0, audio_device_->StopRawInputFileRecording()); 1661 EXPECT_EQ(0, audio_device_->StopRawInputFileRecording());
1657 EXPECT_EQ(0, audio_device_->SetRecordingDevice(MACRO_DEFAULT_DEVICE)); 1662 EXPECT_EQ(0, audio_device_->SetRecordingDevice(MACRO_DEFAULT_DEVICE));
1658 1663
1659 // TODO(kjellander): Fix so these tests pass on Mac. 1664 // TODO(kjellander): Fix so these tests pass on Mac.
1660 #if !defined(WEBRTC_MAC) 1665 #if !defined(WEBRTC_MAC)
1661 EXPECT_EQ(0, audio_device_->InitRecording()); 1666 EXPECT_EQ(0, audio_device_->InitRecording());
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
1705 EXPECT_EQ(48000, sampleRate); 1710 EXPECT_EQ(48000, sampleRate);
1706 #elif defined(ANDROID) 1711 #elif defined(ANDROID)
1707 TEST_LOG("Playout sample rate is %u\n\n", sampleRate); 1712 TEST_LOG("Playout sample rate is %u\n\n", sampleRate);
1708 EXPECT_TRUE((sampleRate == 44000) || (sampleRate == 16000)); 1713 EXPECT_TRUE((sampleRate == 44000) || (sampleRate == 16000));
1709 #elif defined(WEBRTC_IOS) 1714 #elif defined(WEBRTC_IOS)
1710 TEST_LOG("Playout sample rate is %u\n\n", sampleRate); 1715 TEST_LOG("Playout sample rate is %u\n\n", sampleRate);
1711 EXPECT_TRUE((sampleRate == 44000) || (sampleRate == 16000) || 1716 EXPECT_TRUE((sampleRate == 44000) || (sampleRate == 16000) ||
1712 (sampleRate == 8000)); 1717 (sampleRate == 8000));
1713 #endif 1718 #endif
1714 } 1719 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698