| 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 5a3b9b66e7280cdc2846254cab8409373602f93e..9ff0dc9e5d4aff8bc6f811fef1e2131df5495050 100644
|
| --- a/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java
|
| +++ b/talk/app/webrtc/androidtests/src/org/webrtc/SurfaceTextureHelperTest.java
|
| @@ -109,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(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PIXEL_BUFFER);
|
| + final EglBase eglBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.CONFIG_PIXEL_BUFFER);
|
| eglBase.createPbufferSurface(width, height);
|
| final GlRectDrawer drawer = new GlRectDrawer();
|
|
|
| @@ -122,7 +122,7 @@ public final class SurfaceTextureHelperTest extends ActivityTestCase {
|
|
|
| // Create resources for stubbing an OES texture producer. |eglOesBase| has the SurfaceTexture in
|
| // |surfaceTextureHelper| as the target EGLSurface.
|
| - final EglBase eglOesBase = new EglBase(eglBase.getContext(), EglBase.ConfigType.PLAIN);
|
| + final EglBase eglOesBase = new EglBase(eglBase.getContext(), EglBase.CONFIG_PLAIN);
|
| eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
|
| assertEquals(eglOesBase.surfaceWidth(), width);
|
| assertEquals(eglOesBase.surfaceHeight(), height);
|
| @@ -176,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(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PIXEL_BUFFER);
|
| + final EglBase eglBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.CONFIG_PIXEL_BUFFER);
|
| eglBase.createPbufferSurface(width, height);
|
|
|
| // Create SurfaceTextureHelper and listener.
|
| @@ -188,7 +188,7 @@ public final class SurfaceTextureHelperTest extends ActivityTestCase {
|
|
|
| // Create resources for stubbing an OES texture producer. |eglOesBase| has the SurfaceTexture in
|
| // |surfaceTextureHelper| as the target EGLSurface.
|
| - final EglBase eglOesBase = new EglBase(eglBase.getContext(), EglBase.ConfigType.PLAIN);
|
| + final EglBase eglOesBase = new EglBase(eglBase.getContext(), EglBase.CONFIG_PLAIN);
|
| eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
|
| assertEquals(eglOesBase.surfaceWidth(), width);
|
| assertEquals(eglOesBase.surfaceHeight(), height);
|
| @@ -244,7 +244,7 @@ public final class SurfaceTextureHelperTest extends ActivityTestCase {
|
| final MockTextureListener listener = new MockTextureListener();
|
| surfaceTextureHelper.setListener(listener);
|
| // Create EglBase with the SurfaceTexture as target EGLSurface.
|
| - final EglBase eglBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PLAIN);
|
| + final EglBase eglBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.CONFIG_PLAIN);
|
| eglBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
|
| eglBase.makeCurrent();
|
| // Assert no frame has been received yet.
|
| @@ -299,7 +299,7 @@ public final class SurfaceTextureHelperTest extends ActivityTestCase {
|
|
|
| // Create resources for stubbing an OES texture producer. |eglOesBase| has the
|
| // SurfaceTexture in |surfaceTextureHelper| as the target EGLSurface.
|
| - final EglBase eglOesBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PLAIN);
|
| + final EglBase eglOesBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.CONFIG_PLAIN);
|
| eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
|
| eglOesBase.makeCurrent();
|
| // Draw a frame onto the SurfaceTexture.
|
| @@ -335,7 +335,7 @@ public final class SurfaceTextureHelperTest extends ActivityTestCase {
|
|
|
| // Create resources for stubbing an OES texture producer. |eglOesBase| has the
|
| // SurfaceTexture in |surfaceTextureHelper| as the target EGLSurface.
|
| - final EglBase eglOesBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PLAIN);
|
| + final EglBase eglOesBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.CONFIG_PLAIN);
|
| eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
|
| eglOesBase.makeCurrent();
|
| // Draw a frame onto the SurfaceTexture.
|
|
|