| Index: talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
|
| diff --git a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
|
| index 47886effd7c36965c31daf7d971a7b3063467f8e..f4398f2494182aa81e738b7aca3d210a7c2b847b 100644
|
| --- a/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
|
| +++ b/talk/app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java
|
| @@ -45,8 +45,6 @@ import java.util.Arrays;
|
| import java.util.List;
|
| import java.util.concurrent.CountDownLatch;
|
|
|
| -import javax.microedition.khronos.egl.EGLContext;
|
| -
|
| // Java-side of peerconnection_jni.cc:MediaCodecVideoEncoder.
|
| // This class is an implementation detail of the Java PeerConnection API.
|
| @TargetApi(19)
|
| @@ -77,7 +75,7 @@ public class MediaCodecVideoEncoder {
|
| private Thread mediaCodecThread;
|
| private MediaCodec mediaCodec;
|
| private ByteBuffer[] outputBuffers;
|
| - private EglBase eglBase;
|
| + private Egl eglBase;
|
| private Surface inputSurface;
|
| private GlRectDrawer drawer;
|
| private static final String VP8_MIME_TYPE = "video/x-vnd.on2.vp8";
|
| @@ -270,7 +268,7 @@ public class MediaCodecVideoEncoder {
|
| }
|
|
|
| boolean initEncode(VideoCodecType type, int width, int height, int kbps, int fps,
|
| - EGLContext sharedContext) {
|
| + Egl.Context sharedContext) {
|
| final boolean useSurface = sharedContext != null;
|
| Logging.d(TAG, "Java initEncode: " + type + " : " + width + " x " + height +
|
| ". @ " + kbps + " kbps. Fps: " + fps + ". Encode from texture : " + useSurface);
|
| @@ -323,7 +321,7 @@ public class MediaCodecVideoEncoder {
|
| format, null, null, MediaCodec.CONFIGURE_FLAG_ENCODE);
|
|
|
| if (useSurface) {
|
| - eglBase = new EglBase(sharedContext, EglBase.ConfigType.RECORDABLE);
|
| + eglBase = Egl.create(sharedContext, Egl.ConfigType.RECORDABLE);
|
| // Create an input surface and keep a reference since we must release the surface when done.
|
| inputSurface = mediaCodec.createInputSurface();
|
| eglBase.createSurface(inputSurface);
|
|
|