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

Side by Side Diff: webrtc/modules/audio_device/android/audio_manager.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) 2015 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2015 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/android/audio_manager.h" 11 #include "webrtc/modules/audio_device/android/audio_manager.h"
12 12
13 #include <utility> 13 #include <utility>
14 14
15 #include <android/log.h> 15 #include <android/log.h>
16 16
17 #include "webrtc/base/arraysize.h"
18 #include "webrtc/base/checks.h"
17 #include "webrtc/modules/audio_device/android/audio_common.h" 19 #include "webrtc/modules/audio_device/android/audio_common.h"
18 #include "webrtc/modules/utility/include/helpers_android.h" 20 #include "webrtc/modules/utility/include/helpers_android.h"
19 #include "webrtc/rtc_base/arraysize.h"
20 #include "webrtc/rtc_base/checks.h"
21 21
22 #define TAG "AudioManager" 22 #define TAG "AudioManager"
23 #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__) 23 #define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)
24 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__) 24 #define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, TAG, __VA_ARGS__)
25 #define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__) 25 #define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, TAG, __VA_ARGS__)
26 #define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, TAG, __VA_ARGS__) 26 #define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, TAG, __VA_ARGS__)
27 #define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__) 27 #define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, TAG, __VA_ARGS__)
28 28
29 namespace webrtc { 29 namespace webrtc {
30 30
(...skipping 258 matching lines...) Expand 10 before | Expand all | Expand 10 after
289 return playout_parameters_; 289 return playout_parameters_;
290 } 290 }
291 291
292 const AudioParameters& AudioManager::GetRecordAudioParameters() { 292 const AudioParameters& AudioManager::GetRecordAudioParameters() {
293 RTC_CHECK(record_parameters_.is_valid()); 293 RTC_CHECK(record_parameters_.is_valid());
294 RTC_DCHECK(thread_checker_.CalledOnValidThread()); 294 RTC_DCHECK(thread_checker_.CalledOnValidThread());
295 return record_parameters_; 295 return record_parameters_;
296 } 296 }
297 297
298 } // namespace webrtc 298 } // namespace webrtc
OLDNEW
« no previous file with comments | « webrtc/modules/audio_device/android/audio_manager.h ('k') | webrtc/modules/audio_device/android/audio_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698