This reverts commit aede67a199ae0552074bfec4bb03cc9a6a5fba0f. Reason for revert: Causes error: JNI ERROR (app bug): local reference table overflow (max=512)' Original change's description: > Android: Generate JNI code for stats > > This CL also unifies the functions for converting from C++ to Java, and > generates the boiler plate for converting C++ vectors to Java arrays. > > Bug: webrtc:8278 > Change-Id: I262e9162beae8a64ba0e8b6a27e1081207b03961 > Reviewed-on: https://webrtc-review.googlesource.com/26020 > Commit-Queue: Magnus Jedvert <magjed@webrtc.org> > Reviewed-by: Sami Kalliomäki <sakal@webrtc.org> > Cr-Commit-Position: refs/heads/master@{#20918} TBR=magjed@webrtc.org,sakal@webrtc.org Change-Id: Ieb26ed8577bd489a4dd4f7542d16a7d0e11f409f No-Presubmit: true No-Tree-Checks: true No-Try: true Bug: webrtc:8278 Reviewed-on: https://webrtc-review.googlesource.com/26900 Reviewed-by: Magnus Jedvert <magjed@webrtc.org> Commit-Queue: Magnus Jedvert <magjed@webrtc.org> Cr-Commit-Position: refs/heads/master@{#20926}
152 lines
6.2 KiB
C++
152 lines
6.2 KiB
C++
/*
|
|
* Copyright 2015 The WebRTC project authors. All Rights Reserved.
|
|
*
|
|
* Use of this source code is governed by a BSD-style license
|
|
* that can be found in the LICENSE file in the root of the source
|
|
* tree. An additional intellectual property rights grant can be found
|
|
* in the file PATENTS. All contributing project authors may
|
|
* be found in the AUTHORS file in the root of the source tree.
|
|
*/
|
|
#include "sdk/android/src/jni/classreferenceholder.h"
|
|
|
|
#include "sdk/android/src/jni/class_loader.h"
|
|
#include "sdk/android/src/jni/jni_helpers.h"
|
|
|
|
namespace webrtc {
|
|
namespace jni {
|
|
|
|
// ClassReferenceHolder holds global reference to Java classes in app/webrtc.
|
|
class ClassReferenceHolder {
|
|
public:
|
|
explicit ClassReferenceHolder(JNIEnv* jni);
|
|
~ClassReferenceHolder();
|
|
|
|
void FreeReferences(JNIEnv* jni);
|
|
jclass GetClass(const std::string& name);
|
|
|
|
private:
|
|
void LoadClass(JNIEnv* jni, const std::string& name);
|
|
|
|
std::map<std::string, jclass> classes_;
|
|
};
|
|
|
|
// Allocated in LoadGlobalClassReferenceHolder(),
|
|
// freed in FreeGlobalClassReferenceHolder().
|
|
static ClassReferenceHolder* g_class_reference_holder = nullptr;
|
|
|
|
void LoadGlobalClassReferenceHolder() {
|
|
JNIEnv* env = GetEnv();
|
|
RTC_CHECK(g_class_reference_holder == nullptr);
|
|
g_class_reference_holder = new ClassReferenceHolder(env);
|
|
// TODO(magjed): This is a weird place to call the other class loader from,
|
|
// but the only place that will keep backwards compatibility.
|
|
InitClassLoader(env);
|
|
}
|
|
|
|
void FreeGlobalClassReferenceHolder() {
|
|
g_class_reference_holder->FreeReferences(AttachCurrentThreadIfNeeded());
|
|
delete g_class_reference_holder;
|
|
g_class_reference_holder = nullptr;
|
|
}
|
|
|
|
ClassReferenceHolder::ClassReferenceHolder(JNIEnv* jni) {
|
|
LoadClass(jni, "android/graphics/SurfaceTexture");
|
|
LoadClass(jni, "java/lang/Boolean");
|
|
LoadClass(jni, "java/lang/Double");
|
|
LoadClass(jni, "java/lang/Long");
|
|
LoadClass(jni, "java/lang/String");
|
|
LoadClass(jni, "java/math/BigInteger");
|
|
LoadClass(jni, "java/nio/ByteBuffer");
|
|
LoadClass(jni, "java/util/ArrayList");
|
|
LoadClass(jni, "java/util/LinkedHashMap");
|
|
LoadClass(jni, "org/webrtc/Camera1Enumerator");
|
|
LoadClass(jni, "org/webrtc/Camera2Enumerator");
|
|
LoadClass(jni, "org/webrtc/CameraEnumerationAndroid");
|
|
LoadClass(jni, "org/webrtc/EglBase");
|
|
LoadClass(jni, "org/webrtc/EglBase$Context");
|
|
LoadClass(jni, "org/webrtc/EglBase14$Context");
|
|
LoadClass(jni, "org/webrtc/EncodedImage");
|
|
LoadClass(jni, "org/webrtc/EncodedImage$FrameType");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecodedOutputBuffer");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$DecodedTextureBuffer");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoDecoder$VideoCodecType");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$OutputBufferInfo");
|
|
LoadClass(jni, "org/webrtc/MediaCodecVideoEncoder$VideoCodecType");
|
|
LoadClass(jni, "org/webrtc/MediaSource$State");
|
|
LoadClass(jni, "org/webrtc/NetworkMonitor");
|
|
LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$ConnectionType");
|
|
LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$IPAddress");
|
|
LoadClass(jni, "org/webrtc/NetworkMonitorAutoDetect$NetworkInformation");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$BundlePolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$CandidateNetworkPolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$ContinualGatheringPolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$IceConnectionState");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$IceGatheringState");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$IceTransportsType");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$KeyType");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$RtcpMuxPolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$SignalingState");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$TcpCandidatePolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnection$TlsCertPolicy");
|
|
LoadClass(jni, "org/webrtc/PeerConnectionFactory");
|
|
LoadClass(jni, "org/webrtc/RTCStats");
|
|
LoadClass(jni, "org/webrtc/RTCStatsReport");
|
|
LoadClass(jni, "org/webrtc/RtpReceiver");
|
|
LoadClass(jni, "org/webrtc/RtpSender");
|
|
LoadClass(jni, "org/webrtc/SessionDescription");
|
|
LoadClass(jni, "org/webrtc/SessionDescription$Type");
|
|
LoadClass(jni, "org/webrtc/StatsReport");
|
|
LoadClass(jni, "org/webrtc/StatsReport$Value");
|
|
LoadClass(jni, "org/webrtc/SurfaceTextureHelper");
|
|
LoadClass(jni, "org/webrtc/VideoCapturer");
|
|
LoadClass(jni, "org/webrtc/VideoCodecInfo");
|
|
LoadClass(jni, "org/webrtc/VideoCodecStatus");
|
|
LoadClass(jni, "org/webrtc/VideoFrame");
|
|
LoadClass(jni, "org/webrtc/VideoFrame$Buffer");
|
|
LoadClass(jni, "org/webrtc/VideoFrame$I420Buffer");
|
|
LoadClass(jni, "org/webrtc/VideoFrame$TextureBuffer");
|
|
LoadClass(jni, "org/webrtc/VideoRenderer$I420Frame");
|
|
LoadClass(jni, "org/webrtc/VideoSink");
|
|
LoadClass(jni, "org/webrtc/WrappedNativeI420Buffer");
|
|
}
|
|
|
|
ClassReferenceHolder::~ClassReferenceHolder() {
|
|
RTC_CHECK(classes_.empty()) << "Must call FreeReferences() before dtor!";
|
|
}
|
|
|
|
void ClassReferenceHolder::FreeReferences(JNIEnv* jni) {
|
|
for (std::map<std::string, jclass>::const_iterator it = classes_.begin();
|
|
it != classes_.end(); ++it) {
|
|
jni->DeleteGlobalRef(it->second);
|
|
}
|
|
classes_.clear();
|
|
}
|
|
|
|
jclass ClassReferenceHolder::GetClass(const std::string& name) {
|
|
std::map<std::string, jclass>::iterator it = classes_.find(name);
|
|
RTC_CHECK(it != classes_.end()) << "Unexpected GetClass() call for: " << name;
|
|
return it->second;
|
|
}
|
|
|
|
void ClassReferenceHolder::LoadClass(JNIEnv* jni, const std::string& name) {
|
|
jclass localRef = jni->FindClass(name.c_str());
|
|
CHECK_EXCEPTION(jni) << "error during FindClass: " << name;
|
|
RTC_CHECK(localRef) << name;
|
|
jclass globalRef = reinterpret_cast<jclass>(jni->NewGlobalRef(localRef));
|
|
CHECK_EXCEPTION(jni) << "error during NewGlobalRef: " << name;
|
|
RTC_CHECK(globalRef) << name;
|
|
bool inserted = classes_.insert(std::make_pair(name, globalRef)).second;
|
|
RTC_CHECK(inserted) << "Duplicate class name: " << name;
|
|
}
|
|
|
|
// Returns a global reference guaranteed to be valid for the lifetime of the
|
|
// process.
|
|
jclass FindClass(JNIEnv* jni, const char* name) {
|
|
return g_class_reference_holder->GetClass(name);
|
|
}
|
|
|
|
} // namespace jni
|
|
} // namespace webrtc
|