talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java - Issue 1396013004: Android: Replace EGL14 with EGL10

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/android/org/webrtc/SurfaceViewRenderer.java

Issue 1396013004: Android: Replace EGL14 with EGL10 (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master

Patch Set: Add comments for hardcoded EGL constants Created 5 years, 2 months 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/android/org/webrtc/SurfaceViewRenderer.java

diff --git a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java

index 265f34dcba6004e4e606d392cf4ddee40a119124..99f33d7d07986b93c943278f72552a459e6cb46c 100644

--- a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java

+++ b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java

@@ -30,7 +30,6 @@ package org.webrtc;

import android.content.Context;

import android.graphics.Point;

import android.graphics.SurfaceTexture;

-import android.opengl.EGLContext;

import android.opengl.GLES20;

import android.opengl.Matrix;

import android.os.Handler;

@@ -41,6 +40,8 @@ import android.view.SurfaceView;

import org.webrtc.Logging;

+import javax.microedition.khronos.egl.EGLContext;

/**

* Implements org.webrtc.VideoRenderer.Callbacks by displaying the video stream on a SurfaceView.

* renderFrame() is asynchronous to avoid blocking the calling thread.