admin/webrtc_m130
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move ADM specific Android files into modules/audio_device/android/

Browse Source 
- Move helpers_android.* and jvm_android.* from modules/utility/.

BUG=none
TBR=perkj@webrtc.org

Review-Url: https://codereview.webrtc.org/2533573002
Cr-Commit-Position: refs/heads/master@{#15253}
This commit is contained in:
solenberg 2016-11-25 11:34:17 -08:00 committed by Commit bot
parent e69a1a9342
commit e8d8a2bb97
17 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/modules/audio_device/BUILD.gn
View File

@ -110,6 +110,10 @@ rtc_static_library("audio_device") {
"android/audio_track_jni.h",
"android/build_info.cc",
"android/build_info.h",
"android/helpers_android.cc",
"android/helpers_android.h",
"android/jvm_android.cc",
"android/jvm_android.h",
"android/opensles_common.cc",
"android/opensles_common.h",
"android/opensles_player.cc",

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

@ -17,7 +17,7 @@
#include "webrtc/base/arraysize.h"
#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
#include "webrtc/modules/utility/include/helpers_android.h"
#include "webrtc/modules/audio_device/android/helpers_android.h"
#define TAG "AudioManager"
#define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, TAG, __VA_ARGS__)

8
webrtc/modules/audio_device/android/audio_manager.h
View File

@ -18,12 +18,12 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
#include "webrtc/modules/audio_device/android/helpers_android.h"
#include "webrtc/modules/audio_device/android/jvm_android.h"
#include "webrtc/modules/audio_device/android/opensles_common.h"
#include "webrtc/modules/audio_device/audio_device_config.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/modules/utility/include/helpers_android.h"
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
namespace webrtc {

6
webrtc/modules/audio_device/android/audio_record_jni.h
View File

@ -17,10 +17,10 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_manager.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
#include "webrtc/modules/audio_device/android/helpers_android.h"
#include "webrtc/modules/audio_device/android/jvm_android.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/modules/utility/include/helpers_android.h"
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
namespace webrtc {

6
webrtc/modules/audio_device/android/audio_track_jni.h
View File

@ -18,10 +18,10 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
#include "webrtc/modules/audio_device/android/audio_manager.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
#include "webrtc/modules/audio_device/android/helpers_android.h"
#include "webrtc/modules/audio_device/android/jvm_android.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/modules/utility/include/helpers_android.h"
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
namespace webrtc {

2
webrtc/modules/audio_device/android/build_info.cc
View File

@ -10,7 +10,7 @@
#include "webrtc/modules/audio_device/android/build_info.h"
#include "webrtc/modules/utility/include/helpers_android.h"
#include "webrtc/modules/audio_device/android/helpers_android.h"
namespace webrtc {

2
webrtc/modules/audio_device/android/build_info.h
View File

@ -15,7 +15,7 @@
#include <memory>
#include <string>
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/modules/audio_device/android/jvm_android.h"
namespace webrtc {

2
webrtc/modules/audio_device/android/ensure_initialized.cc
View File

@ -23,7 +23,7 @@ RTC_POP_IGNORING_WUNDEF()
#include "webrtc/base/checks.h"
#include "webrtc/modules/audio_device/android/audio_record_jni.h"
#include "webrtc/modules/audio_device/android/audio_track_jni.h"
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/modules/audio_device/android/jvm_android.h"
namespace webrtc {
namespace audiodevicemodule {

7
webrtc/modules/utility/source/helpers_android.cc → webrtc/modules/audio_device/android/helpers_android.cc
View File

@ -8,8 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#include "webrtc/base/checks.h"
#include "webrtc/modules/utility/include/helpers_android.h"
#include "webrtc/modules/audio_device/android/helpers_android.h"
#include <android/log.h>
#include <assert.h>
@ -45,7 +44,7 @@ jlong PointerTojlong(void* ptr) {
return ret;
}
jmethodID GetMethodID (
jmethodID GetMethodID(
JNIEnv* jni, jclass c, const char* name, const char* signature) {
jmethodID m = jni->GetMethodID(c, name, signature);
CHECK_EXCEPTION(jni) << "Error during GetMethodID: " << name << ", "
@ -54,7 +53,7 @@ jmethodID GetMethodID (
return m;
}
jmethodID GetStaticMethodID (
jmethodID GetStaticMethodID(
JNIEnv* jni, jclass c, const char* name, const char* signature) {
jmethodID m = jni->GetStaticMethodID(c, name, signature);
CHECK_EXCEPTION(jni) << "Error during GetStaticMethodID: " << name << ", "

8
webrtc/modules/utility/include/helpers_android.h → webrtc/modules/audio_device/android/helpers_android.h
View File

@ -8,12 +8,14 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
#define WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
#include <jni.h>
#include <string>
#include "webrtc/base/checks.h"
// Abort the process if |jni| has a Java exception pending.
// TODO(henrika): merge with CHECK_JNI_EXCEPTION() in jni_helpers.h.
#define CHECK_EXCEPTION(jni) \
@ -84,4 +86,4 @@ class ScopedGlobalRef {
} // namespace webrtc
#endif // WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_
#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_

2
webrtc/modules/utility/source/jvm_android.cc → webrtc/modules/audio_device/android/jvm_android.cc
View File

@ -12,7 +12,7 @@
#include <memory>
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/modules/audio_device/android/jvm_android.h"
#include "webrtc/base/checks.h"

8
webrtc/modules/utility/include/jvm_android.h → webrtc/modules/audio_device/android/jvm_android.h
View File

@ -8,8 +8,8 @@
* be found in the AUTHORS file in the root of the source tree.
*/
#ifndef WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
#define WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
#ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_JVM_ANDROID_H_
#define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_JVM_ANDROID_H_
#include <jni.h>
@ -17,7 +17,7 @@
#include <string>
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/utility/include/helpers_android.h"
#include "webrtc/modules/audio_device/android/helpers_android.h"
namespace webrtc {
@ -184,4 +184,4 @@ class JVM {
} // namespace webrtc
#endif // WEBRTC_MODULES_UTILITY_INCLUDE_JVM_ANDROID_H_
#endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_JVM_ANDROID_H_

4
webrtc/modules/audio_device/android/opensles_player.h
View File

@ -18,10 +18,10 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
#include "webrtc/modules/audio_device/android/audio_manager.h"
#include "webrtc/modules/audio_device/android/helpers_android.h"
#include "webrtc/modules/audio_device/android/opensles_common.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/modules/utility/include/helpers_android.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
namespace webrtc {

4
webrtc/modules/audio_device/android/opensles_recorder.h
View File

@ -20,10 +20,10 @@
#include "webrtc/base/thread_checker.h"
#include "webrtc/modules/audio_device/android/audio_common.h"
#include "webrtc/modules/audio_device/android/audio_manager.h"
#include "webrtc/modules/audio_device/android/helpers_android.h"
#include "webrtc/modules/audio_device/android/opensles_common.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
#include "webrtc/modules/audio_device/audio_device_generic.h"
#include "webrtc/modules/utility/include/helpers_android.h"
#include "webrtc/modules/audio_device/include/audio_device_defines.h"
namespace webrtc {

4
webrtc/modules/utility/BUILD.gn
View File

@ -13,16 +13,12 @@ rtc_static_library("utility") {
"include/audio_frame_operations.h",
"include/file_player.h",
"include/file_recorder.h",
"include/helpers_android.h",
"include/jvm_android.h",
"include/process_thread.h",
"source/audio_frame_operations.cc",
"source/coder.cc",
"source/coder.h",
"source/file_player.cc",
"source/file_recorder.cc",
"source/helpers_android.cc",
"source/jvm_android.cc",
"source/process_thread_impl.cc",
"source/process_thread_impl.h",
]

1
webrtc/voice_engine/BUILD.gn
View File

@ -195,7 +195,6 @@ if (rtc_include_tests) {
"//webrtc/modules/audio_processing",
"//webrtc/modules/media_file",
"//webrtc/modules/rtp_rtcp",
"//webrtc/modules/utility",
"//webrtc/system_wrappers",
"//webrtc/test:test_support_main",
]

5
webrtc/voice_engine/voice_engine_impl.cc
View File

@ -9,10 +9,7 @@
*/
#if defined(WEBRTC_ANDROID)
#include "webrtc/modules/audio_device/android/audio_device_template.h"
#include "webrtc/modules/audio_device/android/audio_record_jni.h"
#include "webrtc/modules/audio_device/android/audio_track_jni.h"
#include "webrtc/modules/utility/include/jvm_android.h"
#include "webrtc/modules/audio_device/android/jvm_android.h"
#endif
#include "webrtc/base/checks.h"