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

Side by Side Diff: webrtc/modules/audio_device/android/helpers_android.h

Issue 2533573002: Move ADM specific Android files into modules/audio_device/android/ (Closed)
Patch Set: re-add dep Created 4 years 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) 2013 The WebRTC project authors. All Rights Reserved. 2 * Copyright (c) 2013 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 #ifndef WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ 11 #ifndef WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
henrika_webrtc 2016/11/25 12:12:11 Lots of Android here...
the sun 2016/11/25 19:29:53 Yes, it looks like the internals of ADM for Androi
12 #define WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ 12 #define WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
13 13
14 #include <jni.h> 14 #include <jni.h>
15 #include <string> 15 #include <string>
16 16
17 #include "webrtc/base/checks.h"
18
17 // Abort the process if |jni| has a Java exception pending. 19 // Abort the process if |jni| has a Java exception pending.
18 // TODO(henrika): merge with CHECK_JNI_EXCEPTION() in jni_helpers.h. 20 // TODO(henrika): merge with CHECK_JNI_EXCEPTION() in jni_helpers.h.
19 #define CHECK_EXCEPTION(jni) \ 21 #define CHECK_EXCEPTION(jni) \
20 RTC_CHECK(!jni->ExceptionCheck()) \ 22 RTC_CHECK(!jni->ExceptionCheck()) \
21 << (jni->ExceptionDescribe(), jni->ExceptionClear(), "") 23 << (jni->ExceptionDescribe(), jni->ExceptionClear(), "")
22 24
23 namespace webrtc { 25 namespace webrtc {
24 26
25 // Return a |JNIEnv*| usable on this thread or NULL if this thread is detached. 27 // Return a |JNIEnv*| usable on this thread or NULL if this thread is detached.
26 JNIEnv* GetEnv(JavaVM* jvm); 28 JNIEnv* GetEnv(JavaVM* jvm);
(...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after
77 T operator*() const { 79 T operator*() const {
78 return obj_; 80 return obj_;
79 } 81 }
80 private: 82 private:
81 JNIEnv* jni_; 83 JNIEnv* jni_;
82 T obj_; 84 T obj_;
83 }; 85 };
84 86
85 } // namespace webrtc 87 } // namespace webrtc
86 88
87 #endif // WEBRTC_MODULES_UTILITY_INCLUDE_HELPERS_ANDROID_H_ 89 #endif // WEBRTC_MODULES_AUDIO_DEVICE_ANDROID_HELPERS_ANDROID_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698