talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.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/src/org/webrtc/MediaCodecVideoDecoder.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/src/org/webrtc/MediaCodecVideoDecoder.java

diff --git a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java

index a23d69ca0d84abe1658020be077014f00ce899d2..42af9c7fd00e8c618cfbc48fb27e49cd481f9b22 100644

--- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java

+++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java

@@ -33,7 +33,6 @@ import android.media.MediaCodecInfo;

import android.media.MediaCodecInfo.CodecCapabilities;

import android.media.MediaCodecList;

import android.media.MediaFormat;

-import android.opengl.EGLContext;

import android.opengl.GLES11Ext;

import android.opengl.GLES20;

import android.os.Build;

@@ -45,6 +44,8 @@ import java.nio.ByteBuffer;

import java.util.Arrays;

import java.util.List;

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

// Java-side of peerconnection_jni.cc:MediaCodecVideoDecoder.

// This class is an implementation detail of the Java PeerConnection API.

// MediaCodec is thread-hostile so this class must be operated on a single