Index: talk/app/webrtc/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java |
diff --git a/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java b/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java |
index 2aa1719709ab40d15e7b8b2c03d0a937951cc7fe..882fde1875bd1133e9e20aca0910e7304c848364 100644 |
--- a/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java |
+++ b/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java |
@@ -26,18 +26,19 @@ |
*/ |
package org.webrtc; |
-import android.test.ActivityTestCase; |
-import android.test.suitebuilder.annotation.MediumTest; |
-import android.test.suitebuilder.annotation.SmallTest; |
import android.graphics.SurfaceTexture; |
-import android.opengl.EGL14; |
import android.opengl.GLES20; |
import android.os.Handler; |
import android.os.HandlerThread; |
import android.os.SystemClock; |
+import android.test.ActivityTestCase; |
+import android.test.suitebuilder.annotation.MediumTest; |
+import android.test.suitebuilder.annotation.SmallTest; |
import java.nio.ByteBuffer; |
+import javax.microedition.khronos.egl.EGL10; |
+ |
public final class SurfaceTextureHelperTest extends ActivityTestCase { |
/** |
* Mock texture listener with blocking wait functionality. |
@@ -108,7 +109,7 @@ public final class SurfaceTextureHelperTest extends ActivityTestCase { |
final int width = 16; |
final int height = 16; |
// Create EGL base with a pixel buffer as display output. |
- final EglBase eglBase = new EglBase(EGL14.EGL_NO_CONTEXT, EglBase.ConfigType.PIXEL_BUFFER); |
+ final EglBase eglBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PIXEL_BUFFER); |
eglBase.createPbufferSurface(width, height); |
final GlRectDrawer drawer = new GlRectDrawer(); |
@@ -175,7 +176,7 @@ public final class SurfaceTextureHelperTest extends ActivityTestCase { |
final int width = 16; |
final int height = 16; |
// Create EGL base with a pixel buffer as display output. |
- final EglBase eglBase = new EglBase(EGL14.EGL_NO_CONTEXT, EglBase.ConfigType.PIXEL_BUFFER); |
+ final EglBase eglBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PIXEL_BUFFER); |
eglBase.createPbufferSurface(width, height); |
// Create SurfaceTextureHelper and listener. |
@@ -239,11 +240,11 @@ public final class SurfaceTextureHelperTest extends ActivityTestCase { |
public static void testDisconnect() throws InterruptedException { |
// Create SurfaceTextureHelper and listener. |
final SurfaceTextureHelper surfaceTextureHelper = |
- SurfaceTextureHelper.create(EGL14.EGL_NO_CONTEXT); |
+ SurfaceTextureHelper.create(EGL10.EGL_NO_CONTEXT); |
final MockTextureListener listener = new MockTextureListener(); |
surfaceTextureHelper.setListener(listener); |
// Create EglBase with the SurfaceTexture as target EGLSurface. |
- final EglBase eglBase = new EglBase(EGL14.EGL_NO_CONTEXT, EglBase.ConfigType.PLAIN); |
+ final EglBase eglBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PLAIN); |
eglBase.createSurface(surfaceTextureHelper.getSurfaceTexture()); |
eglBase.makeCurrent(); |
// Assert no frame has been received yet. |
@@ -275,7 +276,7 @@ public final class SurfaceTextureHelperTest extends ActivityTestCase { |
@SmallTest |
public static void testDisconnectImmediately() { |
final SurfaceTextureHelper surfaceTextureHelper = |
- SurfaceTextureHelper.create(EGL14.EGL_NO_CONTEXT); |
+ SurfaceTextureHelper.create(EGL10.EGL_NO_CONTEXT); |
surfaceTextureHelper.disconnect(); |
} |
@@ -291,14 +292,14 @@ public final class SurfaceTextureHelperTest extends ActivityTestCase { |
// Create SurfaceTextureHelper and listener. |
final SurfaceTextureHelper surfaceTextureHelper = |
- SurfaceTextureHelper.create(EGL14.EGL_NO_CONTEXT, handler); |
+ SurfaceTextureHelper.create(EGL10.EGL_NO_CONTEXT, handler); |
// Create a mock listener and expect frames to be delivered on |thread|. |
final MockTextureListener listener = new MockTextureListener(thread); |
surfaceTextureHelper.setListener(listener); |
// Create resources for stubbing an OES texture producer. |eglOesBase| has the |
// SurfaceTexture in |surfaceTextureHelper| as the target EGLSurface. |
- final EglBase eglOesBase = new EglBase(EGL14.EGL_NO_CONTEXT, EglBase.ConfigType.PLAIN); |
+ final EglBase eglOesBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PLAIN); |
eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture()); |
eglOesBase.makeCurrent(); |
// Draw a frame onto the SurfaceTexture. |