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

Side by Side Diff: webrtc/modules/audio_device/audio_device_impl.cc

Issue 2985443002: Replace WEBRTC_TRACE logging in modules/audio_device/.. mac/ win/ (Closed)
Patch Set: Manual fixes. Created 3 years, 5 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
« no previous file with comments | « no previous file | webrtc/modules/audio_device/mac/audio_device_mac.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 183 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 194
195 // Create the *Windows* implementation of the Audio Device 195 // Create the *Windows* implementation of the Audio Device
196 // 196 //
197 #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) 197 #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
198 if ((audioLayer == kWindowsCoreAudio) || 198 if ((audioLayer == kWindowsCoreAudio) ||
199 (audioLayer == kPlatformDefaultAudio)) { 199 (audioLayer == kPlatformDefaultAudio)) {
200 LOG(INFO) << "attempting to use the Windows Core Audio APIs..."; 200 LOG(INFO) << "attempting to use the Windows Core Audio APIs...";
201 201
202 if (AudioDeviceWindowsCore::CoreAudioIsSupported()) { 202 if (AudioDeviceWindowsCore::CoreAudioIsSupported()) {
203 // create *Windows Core Audio* implementation 203 // create *Windows Core Audio* implementation
204 ptrAudioDevice = new AudioDeviceWindowsCore(Id()); 204 ptrAudioDevice = new AudioDeviceWindowsCore();
205 LOG(INFO) << "Windows Core Audio APIs will be utilized"; 205 LOG(INFO) << "Windows Core Audio APIs will be utilized";
206 } 206 }
207 } 207 }
208 #endif // defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) 208 #endif // defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
209 209
210 #if defined(WEBRTC_ANDROID) 210 #if defined(WEBRTC_ANDROID)
211 // Create an Android audio manager. 211 // Create an Android audio manager.
212 _audioManagerAndroid.reset(new AudioManager()); 212 _audioManagerAndroid.reset(new AudioManager());
213 // Select best possible combination of audio layers. 213 // Select best possible combination of audio layers.
214 if (audioLayer == kPlatformDefaultAudio) { 214 if (audioLayer == kPlatformDefaultAudio) {
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 ptrAudioDevice = new AudioDeviceIOS(); 295 ptrAudioDevice = new AudioDeviceIOS();
296 LOG(INFO) << "iPhone Audio APIs will be utilized"; 296 LOG(INFO) << "iPhone Audio APIs will be utilized";
297 } 297 }
298 // END #if defined(WEBRTC_IOS) 298 // END #if defined(WEBRTC_IOS)
299 299
300 // Create the *Mac* implementation of the Audio Device 300 // Create the *Mac* implementation of the Audio Device
301 // 301 //
302 #elif defined(WEBRTC_MAC) 302 #elif defined(WEBRTC_MAC)
303 if (audioLayer == kPlatformDefaultAudio) { 303 if (audioLayer == kPlatformDefaultAudio) {
304 // Create *Mac Audio* implementation 304 // Create *Mac Audio* implementation
305 ptrAudioDevice = new AudioDeviceMac(Id()); 305 ptrAudioDevice = new AudioDeviceMac();
306 LOG(INFO) << "Mac OS X Audio APIs will be utilized"; 306 LOG(INFO) << "Mac OS X Audio APIs will be utilized";
307 } 307 }
308 #endif // WEBRTC_MAC 308 #endif // WEBRTC_MAC
309 309
310 // Create the *Dummy* implementation of the Audio Device 310 // Create the *Dummy* implementation of the Audio Device
311 // Available for all platforms 311 // Available for all platforms
312 // 312 //
313 if (audioLayer == kDummyAudio) { 313 if (audioLayer == kDummyAudio) {
314 // Create *Dummy Audio* implementation 314 // Create *Dummy Audio* implementation
315 assert(!ptrAudioDevice); 315 assert(!ptrAudioDevice);
(...skipping 1522 matching lines...) Expand 10 before | Expand all | Expand 10 after
1838 // PlatformAudioLayer 1838 // PlatformAudioLayer
1839 // ---------------------------------------------------------------------------- 1839 // ----------------------------------------------------------------------------
1840 1840
1841 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer() 1841 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer()
1842 const { 1842 const {
1843 LOG(INFO) << __FUNCTION__; 1843 LOG(INFO) << __FUNCTION__;
1844 return _platformAudioLayer; 1844 return _platformAudioLayer;
1845 } 1845 }
1846 1846
1847 } // namespace webrtc 1847 } // namespace webrtc
OLDNEW
« no previous file with comments | « no previous file | webrtc/modules/audio_device/mac/audio_device_mac.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698