zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Prefix AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO with WEBRTC_.

Browse Source 
Since it is a WebRTC-only macro, let's prefix it with WEBRTC_.

Bug: None
Change-Id: I309666858ea898dc7cd1a68c21be190f98c87b11
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/129935
Reviewed-by: Henrik Andreassson <henrika@webrtc.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#27327}
This commit is contained in:
Mirko Bonadei
2019-03-27 21:11:17 +01:00
committed by Commit Bot
parent b3ae979ecd
commit 185e802971
8 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
modules/audio_device/BUILD.gn
View File

@ -247,7 +247,7 @@ rtc_source_set("audio_device_impl") {
defines += [ "AUDIO_DEVICE_PLAYS_SINUS_TONE" ]
}
if (rtc_enable_android_aaudio) {
defines += [ "AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO" ]
defines += [ "WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO" ]
}
if (rtc_include_internal_audio_device) {
sources += [

4
modules/audio_device/android/audio_device_unittest.cc
View File

@ -701,7 +701,7 @@ TEST_F(AudioDeviceTest, CorrectAudioLayerIsUsedForOpenSLInBothDirections) {
}
// TODO(bugs.webrtc.org/8914)
#if !defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if !defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#define MAYBE_CorrectAudioLayerIsUsedForAAudioInBothDirections \
DISABLED_CorrectAudioLayerIsUsedForAAudioInBothDirections
#else
@ -718,7 +718,7 @@ TEST_F(AudioDeviceTest,
}
// TODO(bugs.webrtc.org/8914)
#if !defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if !defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#define MAYBE_CorrectAudioLayerIsUsedForCombinedJavaAAudioCombo \
DISABLED_CorrectAudioLayerIsUsedForCombinedJavaAAudioCombo
#else

2
modules/audio_device/android/audio_manager.cc
View File

@ -215,7 +215,7 @@ bool AudioManager::IsProAudioSupported() const {
// TODO(henrika): improve comments...
bool AudioManager::IsAAudioSupported() const {
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
return a_audio_;
#else
return false;

6
modules/audio_device/audio_device_impl.cc
View File

@ -26,7 +26,7 @@
#endif
#elif defined(WEBRTC_ANDROID)
#include <stdlib.h>
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#include "modules/audio_device/android/aaudio_player.h"
#include "modules/audio_device/android/aaudio_recorder.h"
#endif
@ -218,13 +218,13 @@ int32_t AudioDeviceModuleImpl::CreatePlatformSpecificObjects() {
audio_device_.reset(new AudioDeviceTemplate<AudioRecordJni, OpenSLESPlayer>(
audio_layer, audio_manager));
} else if (audio_layer == kAndroidAAudioAudio) {
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
// AAudio based audio for both input and output.
audio_device_.reset(new AudioDeviceTemplate<AAudioRecorder, AAudioPlayer>(
audio_layer, audio_manager));
#endif
} else if (audio_layer == kAndroidJavaInputAndAAudioOutputAudio) {
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
// Java audio for input and AAudio for output audio (i.e. mixed APIs).
audio_device_.reset(new AudioDeviceTemplate<AudioRecordJni, AAudioPlayer>(
audio_layer, audio_manager));

2
sdk/android/BUILD.gn
View File

@ -1162,7 +1162,7 @@ if (is_android) {
if (rtc_enable_android_aaudio) {
rtc_source_set("aaudio_audio_device_module") {
visibility = [ "*" ]
defines = [ "AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO" ]
defines = [ "WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO" ]
sources = [
"src/jni/audio_device/aaudio_player.cc",
"src/jni/audio_device/aaudio_player.h",

4
sdk/android/native_api/audio_device_module/audio_device_android.cc
View File

@ -19,7 +19,7 @@
#include "rtc_base/ref_count.h"
#include "rtc_base/ref_counted_object.h"
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#include "sdk/android/src/jni/audio_device/aaudio_player.h"
#include "sdk/android/src/jni/audio_device/aaudio_recorder.h"
#endif
@ -52,7 +52,7 @@ void GetDefaultAudioParameters(JNIEnv* env,
} // namespace
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
rtc::scoped_refptr<AudioDeviceModule> CreateAAudioAudioDeviceModule(
JNIEnv* env,
jobject application_context) {

2
sdk/android/native_api/audio_device_module/audio_device_android.h
View File

@ -17,7 +17,7 @@
namespace webrtc {
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
rtc::scoped_refptr<AudioDeviceModule> CreateAAudioAudioDeviceModule(
JNIEnv* env,
jobject application_context);

4
sdk/android/native_unittests/audio_device/audio_device_unittest.cc
View File

@ -513,7 +513,7 @@ class AudioDeviceTest : public ::testing::Test {
rtc::scoped_refptr<AudioDeviceModule> CreateAudioDevice(
AudioDeviceModule::AudioLayer audio_layer) {
#if defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
if (audio_layer == AudioDeviceModule::kAndroidAAudioAudio) {
return rtc::scoped_refptr<AudioDeviceModule>(
CreateAAudioAudioDeviceModule(jni_, context_.obj()));
@ -717,7 +717,7 @@ TEST_F(AudioDeviceTest, CorrectAudioLayerIsUsedForOpenSLInBothDirections) {
// TODO(bugs.webrtc.org/8914)
// TODO(phensman): Add test for AAudio/Java combination when this combination
// is supported.
#if !defined(AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#if !defined(WEBRTC_AUDIO_DEVICE_INCLUDE_ANDROID_AAUDIO)
#define MAYBE_CorrectAudioLayerIsUsedForAAudioInBothDirections \
DISABLED_CorrectAudioLayerIsUsedForAAudioInBothDirections
#else