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/audio_device_impl.cc

Issue 2964773002: Revert "Update includes for webrtc/{base => rtc_base} rename (1/3)" (Closed)
Patch Set: 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
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
11 #include "webrtc/modules/audio_device/audio_device_impl.h" 11 #include "webrtc/base/checks.h"
12 #include "webrtc/base/logging.h"
13 #include "webrtc/base/checks.h"
14 #include "webrtc/base/refcount.h"
15 #include "webrtc/base/timeutils.h"
12 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h" 16 #include "webrtc/common_audio/signal_processing/include/signal_processing_librar y.h"
13 #include "webrtc/modules/audio_device/audio_device_config.h" 17 #include "webrtc/modules/audio_device/audio_device_config.h"
14 #include "webrtc/modules/audio_device/audio_device_generic.h" 18 #include "webrtc/modules/audio_device/audio_device_generic.h"
15 #include "webrtc/rtc_base/checks.h" 19 #include "webrtc/modules/audio_device/audio_device_impl.h"
16 #include "webrtc/rtc_base/logging.h"
17 #include "webrtc/rtc_base/refcount.h"
18 #include "webrtc/rtc_base/timeutils.h"
19 #include "webrtc/system_wrappers/include/metrics.h" 20 #include "webrtc/system_wrappers/include/metrics.h"
20 21
21 #include <assert.h> 22 #include <assert.h>
22 #include <string.h> 23 #include <string.h>
23 24
24 #if defined(_WIN32) 25 #if defined(_WIN32)
25 #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD) 26 #if defined(WEBRTC_WINDOWS_CORE_AUDIO_BUILD)
26 #include "audio_device_core_win.h" 27 #include "audio_device_core_win.h"
27 #endif 28 #endif
28 #elif defined(WEBRTC_ANDROID) 29 #elif defined(WEBRTC_ANDROID)
(...skipping 1809 matching lines...) Expand 10 before | Expand all | Expand 10 after
1838 // PlatformAudioLayer 1839 // PlatformAudioLayer
1839 // ---------------------------------------------------------------------------- 1840 // ----------------------------------------------------------------------------
1840 1841
1841 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer() 1842 AudioDeviceModule::AudioLayer AudioDeviceModuleImpl::PlatformAudioLayer()
1842 const { 1843 const {
1843 LOG(INFO) << __FUNCTION__; 1844 LOG(INFO) << __FUNCTION__;
1844 return _platformAudioLayer; 1845 return _platformAudioLayer;
1845 } 1846 }
1846 1847
1847 } // namespace webrtc 1848 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/audio_device_impl.h ('k') | webrtc/modules/audio_device/audio_device_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698