| Index: webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
|
| diff --git a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
|
| index d30e94c58fbbb9ed3424a2959ce52cd0253fd003..8f50fc21078e7798545c8a782aeee9b53afe0c60 100644
|
| --- a/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
|
| +++ b/webrtc/sdk/android/src/jni/androidmediadecoder_jni.cc
|
| @@ -199,7 +199,6 @@ MediaCodecVideoDecoder::MediaCodecVideoDecoder(
|
| *j_media_codec_video_decoder_class_,
|
| "<init>",
|
| "()V"))) {
|
| - ScopedLocalRefFrame local_ref_frame(jni);
|
| codec_thread_->SetName("MediaCodecVideoDecoder", NULL);
|
| RTC_CHECK(codec_thread_->Start()) << "Failed to start MediaCodecVideoDecoder";
|
|
|
| @@ -1014,8 +1013,9 @@ webrtc::VideoDecoder* MediaCodecVideoDecoderFactory::CreateVideoDecoder(
|
| for (VideoCodecType codec_type : supported_codec_types_) {
|
| if (codec_type == type) {
|
| ALOGD << "Create HW video decoder for type " << (int)type;
|
| - return new MediaCodecVideoDecoder(AttachCurrentThreadIfNeeded(), type,
|
| - egl_context_);
|
| + JNIEnv* jni = AttachCurrentThreadIfNeeded();
|
| + ScopedLocalRefFrame local_ref_frame(jni);
|
| + return new MediaCodecVideoDecoder(jni, type, egl_context_);
|
| }
|
| }
|
| ALOGW << "Can not find HW video decoder for type " << (int)type;
|
|
|