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

WebRTCViEDemo: Use global reference when passing variables across different threads

Browse Source 
There are JNI local reference changes in ICS when Android SDK
target level API >= 14.
http://android-developers.blogspot.com/2011/11/jni-local-reference-changes-in-ics.html

BUG=NONE
TEST=WebRTCViEDemo works well using MediaCodec Decoder/Renderer
R=fischman@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1744004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4283 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
yujie.mao@webrtc.org
2013-07-01 14:55:37 +00:00
parent 90cc3b95b7
commit d4803ced60
3 changed files with 25 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
webrtc/video_engine/test/android/jni/android_media_codec_decoder.cc
View File

@ -21,12 +21,30 @@ AndroidMediaCodecDecoder::AndroidMediaCodecDecoder(
JavaVM* vm, jobject surface, jclass decoderClass) JavaVM* vm, jobject surface, jclass decoderClass)
: decode_complete_callback_(NULL), : decode_complete_callback_(NULL),
vm_(vm), vm_(vm),
surface_(surface), surface_(NULL),
mediaCodecDecoder_(NULL), mediaCodecDecoder_(NULL),
decoderClass_(decoderClass), decoderClass_(NULL),
env_(NULL), env_(NULL),
setEncodedImageID_(NULL), setEncodedImageID_(NULL),
vm_attached_(false) { vm_attached_(false) {
Initialize(vm, surface, decoderClass);
}
AndroidMediaCodecDecoder::~AndroidMediaCodecDecoder() {
env_->DeleteGlobalRef(decoderClass_);
env_->DeleteGlobalRef(surface_);
}
void AndroidMediaCodecDecoder::Initialize(
JavaVM* vm, jobject surface, jclass decoderClass) {
int ret = vm->GetEnv(reinterpret_cast<void**>(&env_), JNI_VERSION_1_4);
if ((ret < 0) || !env_) {
__android_log_print(ANDROID_LOG_ERROR, LOG_TAG,
"Could not get JNI env (%d, %p)", ret, env_);
assert(false);
}
surface_ = env_->NewGlobalRef(surface);
decoderClass_ = reinterpret_cast<jclass>(env_->NewGlobalRef(decoderClass));
} }
int32_t AndroidMediaCodecDecoder::InitDecode( int32_t AndroidMediaCodecDecoder::InitDecode(

4
webrtc/video_engine/test/android/jni/android_media_codec_decoder.h
View File

@ -18,7 +18,7 @@ namespace webrtc {
class AndroidMediaCodecDecoder : public VideoDecoder { class AndroidMediaCodecDecoder : public VideoDecoder {
public: public:
AndroidMediaCodecDecoder(JavaVM* vm, jobject surface, jclass decoderClass); AndroidMediaCodecDecoder(JavaVM* vm, jobject surface, jclass decoderClass);
virtual ~AndroidMediaCodecDecoder() { } virtual ~AndroidMediaCodecDecoder();
// Initialize the decoder with the information from the VideoCodec. // Initialize the decoder with the information from the VideoCodec.
// //
@ -92,6 +92,8 @@ class AndroidMediaCodecDecoder : public VideoDecoder {
virtual VideoDecoder* Copy() { return NULL; } virtual VideoDecoder* Copy() { return NULL; }
private: private:
void Initialize(JavaVM* vm, jobject surface, jclass decoderClass);
DecodedImageCallback* decode_complete_callback_; DecodedImageCallback* decode_complete_callback_;
JavaVM* vm_; JavaVM* vm_;
jobject surface_; jobject surface_;

4
webrtc/video_engine/test/android/jni/vie_android_java_api.cc
View File

@ -34,6 +34,7 @@
#include "webrtc/common_types.h" #include "webrtc/common_types.h"
#include "webrtc/video_engine/test/android/jni/android_media_codec_decoder.h" #include "webrtc/video_engine/test/android/jni/android_media_codec_decoder.h"
#include "webrtc/modules/video_coding/main/interface/video_coding_defines.h"
#include "webrtc/system_wrappers/interface/scoped_ptr.h" #include "webrtc/system_wrappers/interface/scoped_ptr.h"
#include "webrtc/test/channel_transport/include/channel_transport.h" #include "webrtc/test/channel_transport/include/channel_transport.h"
@ -1012,7 +1013,6 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetExter
ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "SetExternalMediaCodecDecoder"); ANDROID_LOG_DEBUG, WEBRTC_LOG_TAG, "SetExternalMediaCodecDecoder");
jclass cls = env->FindClass("org/webrtc/videoengine/ViEMediaCodecDecoder"); jclass cls = env->FindClass("org/webrtc/videoengine/ViEMediaCodecDecoder");
env->NewGlobalRef(cls);
AndroidMediaCodecDecoder* mediaCodecDecoder = AndroidMediaCodecDecoder* mediaCodecDecoder =
new AndroidMediaCodecDecoder(webrtcGlobalVM, glSurface, cls); new AndroidMediaCodecDecoder(webrtcGlobalVM, glSurface, cls);
@ -1020,7 +1020,7 @@ JNIEXPORT jint JNICALL Java_org_webrtc_videoengineapp_ViEAndroidJavaAPI_SetExter
// TODO(dwkang): Check the ownership of decoder object and release it // TODO(dwkang): Check the ownership of decoder object and release it
// if needed. // if needed.
return vieData.externalCodec->RegisterExternalReceiveCodec( return vieData.externalCodec->RegisterExternalReceiveCodec(
channel, 120, mediaCodecDecoder, true); channel, VCM_VP8_PAYLOAD_TYPE, mediaCodecDecoder, true);
} }
/* /*