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

Unified Diff: webrtc/modules/audio_device/test/audio_device_test_api.cc

Issue 1944883002: Move ADM Create() method to public interface. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: webrtc/modules/audio_device/test/audio_device_test_api.cc
diff --git a/webrtc/modules/audio_device/test/audio_device_test_api.cc b/webrtc/modules/audio_device/test/audio_device_test_api.cc
index 78642c329278cecce4379b00b15250184eb37b76..dad42a0c0b33b27f698987a827318e6a343093b6 100644
--- a/webrtc/modules/audio_device/test/audio_device_test_api.cc
+++ b/webrtc/modules/audio_device/test/audio_device_test_api.cc
@@ -153,75 +153,75 @@ class AudioDeviceAPITest: public testing::Test {
const int32_t kId = 444;
#if defined(_WIN32)
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
#if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
TEST_LOG("WEBRTC_WINDOWS_CORE_AUDIO_BUILD is defined!\n\n");
// create default implementation (=Core Audio) instance
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
EXPECT_EQ(0, audio_device_.release()->Release());
// create non-default (=Wave Audio) instance
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kWindowsWaveAudio)) != NULL);
EXPECT_EQ(0, audio_device_.release()->Release());
// explicitly specify usage of Core Audio (same as default)
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kWindowsCoreAudio)) != NULL);
#else
TEST_LOG("WEBRTC_WINDOWS_CORE_AUDIO_BUILD is *not* defined!\n");
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
// create default implementation (=Wave Audio) instance
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
EXPECT_EQ(0, audio_device_.release()->Release());
// explicitly specify usage of Wave Audio (same as default)
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kWindowsWaveAudio)) != NULL);
#endif
#endif
#if defined(ANDROID)
// Fails tests
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kLinuxPulseAudio)) == NULL);
// Create default implementation instance
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
#elif defined(WEBRTC_LINUX)
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
// create default implementation instance
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
EXPECT_EQ(0, audio_device_->Terminate());
EXPECT_EQ(0, audio_device_.release()->Release());
// explicitly specify usage of Pulse Audio (same as default)
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kLinuxPulseAudio)) != NULL);
#endif
#if defined(WEBRTC_MAC)
// Fails tests
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kWindowsWaveAudio)) == NULL);
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kWindowsCoreAudio)) == NULL);
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kLinuxAlsaAudio)) == NULL);
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kLinuxPulseAudio)) == NULL);
// Create default implementation instance
- EXPECT_TRUE((audio_device_ = AudioDeviceModuleImpl::Create(
+ EXPECT_TRUE((audio_device_ = AudioDeviceModule::Create(
kId, AudioDeviceModule::kPlatformDefaultAudio)) != NULL);
#endif
« no previous file with comments | « webrtc/modules/audio_device/ios/audio_device_unittest_ios.cc ('k') | webrtc/modules/audio_device/test/func_test_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698