talk/app/webrtc/java/jni/androidmediadecoder_jni.cc - Issue 1461083002: Use EGL14 if supported on Android

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

Issue 1461083002: Use EGL14 if supported on Android (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Changed VideoRendererGui to return an EglBase.Context. Created 5 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:

Index: talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

diff --git a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

index 4554e7b59cacbe590b12757faf1fae59e2a32599..fa111968f67f2cdf19ca0b3c2f1a319bd340e1ee 100644

--- a/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

+++ b/talk/app/webrtc/java/jni/androidmediadecoder_jni.cc

@@ -858,7 +858,7 @@ void MediaCodecVideoDecoderFactory::SetEGLContext(

render_egl_context_ = NULL;

} else {

jclass j_egl_context_class =

- FindClass(jni, "javax/microedition/khronos/egl/EGLContext");

+ FindClass(jni, "org/webrtc/EglBase$Context");

if (!jni->IsInstanceOf(render_egl_context_, j_egl_context_class)) {

ALOGE << "Wrong EGL Context.";

jni->DeleteGlobalRef(render_egl_context_);