Use EGL14 if supported on Android

talk/app/webrtc/androidtests/src/org/webrtc/GlRectDrawerTest.java

 /*
  * libjingle
  * Copyright 2015 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 10 matching lines @@
  * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
  * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
  * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
  * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 package org.webrtc;
 
 import android.graphics.SurfaceTexture;
 import android.opengl.GLES20;
-import android.opengl.Matrix;
 import android.test.ActivityTestCase;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import java.nio.ByteBuffer;
 import java.util.Random;
 
-import javax.microedition.khronos.egl.EGL10;
-import javax.microedition.khronos.egl.EGLContext;
-
 public final class GlRectDrawerTest extends ActivityTestCase {
   // Resolution of the test image.
   private static final int WIDTH = 16;
   private static final int HEIGHT = 16;
   // Seed for random pixel creation.
   private static final int SEED = 42;
   // When comparing pixels, allow some slack for float arithmetic and integer rounding.
-  private static final float MAX_DIFF = 1.0f;
+  private static final float MAX_DIFF = 1.5f;
 
   private static float normalizedByte(byte b) {
     return (b & 0xFF) / 255.0f;
   }
 
   private static float saturatedConvert(float c) {
     return 255.0f * Math.max(0, Math.min(c, 1));
   }
 
   // Assert RGB ByteBuffers are pixel perfect identical.
@@ skipping 33 matching lines @@
       }
       // Drop alpha.
       rgbaBuffer.get();
     }
     return rgbBuffer;
   }
 
   @SmallTest
   public void testRgbRendering() {
     // 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 = EglBase.create(null, EglBase.ConfigType.PIXEL_BUFFER);
     eglBase.createPbufferSurface(WIDTH, HEIGHT);
     eglBase.makeCurrent();
 
     // Create RGB byte buffer plane with random content.
     final ByteBuffer rgbPlane = ByteBuffer.allocateDirect(WIDTH * HEIGHT * 3);
     final Random random = new Random(SEED);
     random.nextBytes(rgbPlane.array());
 
     // Upload the RGB byte buffer data as a texture.
     final int rgbTexture = GlUtil.generateTexture(GLES20.GL_TEXTURE_2D);
@@ skipping 16 matching lines @@
     assertEquals(WIDTH, HEIGHT, stripAlphaChannel(rgbaData), rgbPlane);
 
     drawer.release();
     GLES20.glDeleteTextures(1, new int[] {rgbTexture}, 0);
     eglBase.release();
   }
 
   @SmallTest
   public void testYuvRendering() {
     // Create EGL base with a pixel buffer as display output.
-    EglBase eglBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PIXEL_BUFFER);
+    EglBase eglBase = EglBase.create(null, EglBase.ConfigType.PIXEL_BUFFER);
     eglBase.createPbufferSurface(WIDTH, HEIGHT);
     eglBase.makeCurrent();
 
     // Create YUV byte buffer planes with random content.
     final ByteBuffer[] yuvPlanes = new ByteBuffer[3];
     final Random random = new Random(SEED);
     for (int i = 0; i < 3; ++i) {
       yuvPlanes[i] = ByteBuffer.allocateDirect(WIDTH * HEIGHT);
       random.nextBytes(yuvPlanes[i].array());
     }
@@ skipping 73 matching lines @@
   public void testOesRendering() throws InterruptedException {
     /**
      * Stub class to convert RGB ByteBuffers to OES textures by drawing onto a SurfaceTexture.
      */
     class StubOesTextureProducer {
       private final EglBase eglBase;
       private final GlRectDrawer drawer;
       private final int rgbTexture;
 
       public StubOesTextureProducer(
-          EGLContext sharedContext, SurfaceTexture surfaceTexture, int width, int height) {
-        eglBase = new EglBase(sharedContext, EglBase.ConfigType.PLAIN);
+          EglBase.Context sharedContext, SurfaceTexture surfaceTexture, int width,
+          int height) {
+        eglBase = EglBase.create(sharedContext, EglBase.ConfigType.PLAIN);
         surfaceTexture.setDefaultBufferSize(width, height);
         eglBase.createSurface(surfaceTexture);
         assertEquals(eglBase.surfaceWidth(), width);
         assertEquals(eglBase.surfaceHeight(), height);
 
         drawer = new GlRectDrawer();
 
         eglBase.makeCurrent();
         rgbTexture = GlUtil.generateTexture(GLES20.GL_TEXTURE_2D);
       }
@@ skipping 13 matching lines @@
 
       public void release() {
         eglBase.makeCurrent();
         drawer.release();
         GLES20.glDeleteTextures(1, new int[] {rgbTexture}, 0);
         eglBase.release();
       }
     }
 
     // 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 = EglBase.create(null, EglBase.ConfigType.PIXEL_BUFFER);
     eglBase.createPbufferSurface(WIDTH, HEIGHT);
 
     // Create resources for generating OES textures.
     final SurfaceTextureHelper surfaceTextureHelper =
-        SurfaceTextureHelper.create(eglBase.getContext());
+        SurfaceTextureHelper.create(eglBase.getEglBaseContext());
     final StubOesTextureProducer oesProducer = new StubOesTextureProducer(
-        eglBase.getContext(), surfaceTextureHelper.getSurfaceTexture(), WIDTH, HEIGHT);
+        eglBase.getEglBaseContext(), surfaceTextureHelper.getSurfaceTexture(), WIDTH, HEIGHT);
     final SurfaceTextureHelperTest.MockTextureListener listener =
         new SurfaceTextureHelperTest.MockTextureListener();
     surfaceTextureHelper.setListener(listener);
 
     // Create RGB byte buffer plane with random content.
     final ByteBuffer rgbPlane = ByteBuffer.allocateDirect(WIDTH * HEIGHT * 3);
     final Random random = new Random(SEED);
     random.nextBytes(rgbPlane.array());
 
     // Draw the frame and block until an OES texture is delivered.
@@ skipping 14 matching lines @@
     // Assert rendered image is pixel perfect to source RGB.
     assertEquals(WIDTH, HEIGHT, stripAlphaChannel(rgbaData), rgbPlane);
 
     drawer.release();
     surfaceTextureHelper.returnTextureFrame();
     oesProducer.release();
     surfaceTextureHelper.disconnect();
     eglBase.release();
   }
 }