Use EGL14 if supported on Android

talk/app/webrtc/androidtests/src/org/webrtc/SurfaceTextureHelperTest.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 19 matching lines @@
 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.
    */
   public static final class MockTextureListener
       implements SurfaceTextureHelper.OnTextureFrameAvailableListener {
     public int oesTextureId;
     public float[] transformMatrix;
     private boolean hasNewFrame = false;
     // Thread where frames are expected to be received on.
@@ skipping 50 matching lines @@
   /**
    * Test normal use by receiving three uniform texture frames. Texture frames are returned as early
    * as possible. The texture pixel values are inspected by drawing the texture frame to a pixel
    * buffer and reading it back with glReadPixels().
    */
   @MediumTest
   public static void testThreeConstantColorFrames() throws InterruptedException {
     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 = EglBase.create(null, EglBase.ConfigType.PIXEL_BUFFER);
     eglBase.createPbufferSurface(width, height);
     final GlRectDrawer drawer = new GlRectDrawer();
 
     // Create SurfaceTextureHelper and listener.
     final SurfaceTextureHelper surfaceTextureHelper =
-        SurfaceTextureHelper.create(eglBase.getContext());
+        SurfaceTextureHelper.create(eglBase.getEglBaseContext());
     final MockTextureListener listener = new MockTextureListener();
     surfaceTextureHelper.setListener(listener);
     surfaceTextureHelper.getSurfaceTexture().setDefaultBufferSize(width, height);
 
     // 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 =
+        EglBase.create(eglBase.getEglBaseContext(), EglBase.ConfigType.PLAIN);
     eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
     assertEquals(eglOesBase.surfaceWidth(), width);
     assertEquals(eglOesBase.surfaceHeight(), height);
 
     final int red[] = new int[] {79, 144, 185};
     final int green[] = new int[] {66, 210, 162};
     final int blue[] = new int[] {161, 117, 158};
     // Draw three frames.
     for (int i = 0; i < 3; ++i) {
       // Draw a constant color frame onto the SurfaceTexture.
@@ skipping 33 matching lines @@
   /**
    * Test disconnecting the SurfaceTextureHelper while holding a pending texture frame. The pending
    * texture frame should still be valid, and this is tested by drawing the texture frame to a pixel
    * buffer and reading it back with glReadPixels().
    */
   @MediumTest
   public static void testLateReturnFrame() throws InterruptedException {
     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 = EglBase.create(null, EglBase.ConfigType.PIXEL_BUFFER);
     eglBase.createPbufferSurface(width, height);
 
     // Create SurfaceTextureHelper and listener.
     final SurfaceTextureHelper surfaceTextureHelper =
-        SurfaceTextureHelper.create(eglBase.getContext());
+        SurfaceTextureHelper.create(eglBase.getEglBaseContext());
     final MockTextureListener listener = new MockTextureListener();
     surfaceTextureHelper.setListener(listener);
     surfaceTextureHelper.getSurfaceTexture().setDefaultBufferSize(width, height);
 
     // 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 =
+        EglBase.create(eglBase.getEglBaseContext(), EglBase.ConfigType.PLAIN);
     eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
     assertEquals(eglOesBase.surfaceWidth(), width);
     assertEquals(eglOesBase.surfaceHeight(), height);
 
     final int red = 79;
     final int green = 66;
     final int blue = 161;
     // Draw a constant color frame onto the SurfaceTexture.
     eglOesBase.makeCurrent();
     GLES20.glClearColor(red / 255.0f, green / 255.0f, blue / 255.0f, 1.0f);
@@ skipping 31 matching lines @@
   }
 
   /**
    * Test disconnecting the SurfaceTextureHelper, but keep trying to produce more texture frames. No
    * frames should be delivered to the listener.
    */
   @MediumTest
   public static void testDisconnect() throws InterruptedException {
     // Create SurfaceTextureHelper and listener.
     final SurfaceTextureHelper surfaceTextureHelper =
-        SurfaceTextureHelper.create(EGL10.EGL_NO_CONTEXT);
+        SurfaceTextureHelper.create(null);
     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 = EglBase.create(null, EglBase.ConfigType.PLAIN);
     eglBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
     eglBase.makeCurrent();
     // Assert no frame has been received yet.
     assertFalse(listener.waitForNewFrame(1));
     // Draw and wait for one frame.
     GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
     // swapBuffers() will ultimately trigger onTextureFrameAvailable().
     eglBase.swapBuffers();
     listener.waitForNewFrame();
     surfaceTextureHelper.returnTextureFrame();
@@ skipping 11 matching lines @@
     eglBase.release();
   }
 
   /**
    * Test disconnecting the SurfaceTextureHelper immediately after is has been setup to use a
    * shared context. No frames should be delivered to the listener.
    */
   @SmallTest
   public static void testDisconnectImmediately() {
     final SurfaceTextureHelper surfaceTextureHelper =
-        SurfaceTextureHelper.create(EGL10.EGL_NO_CONTEXT);
+        SurfaceTextureHelper.create(null);
     surfaceTextureHelper.disconnect();
   }
 
   /**
    * Test use SurfaceTextureHelper on a separate thread. A uniform texture frame is created and
    * received on a thread separate from the test thread.
    */
   @MediumTest
   public static void testFrameOnSeparateThread() throws InterruptedException {
     final HandlerThread thread = new HandlerThread("SurfaceTextureHelperTestThread");
     thread.start();
     final Handler handler = new Handler(thread.getLooper());
 
     // Create SurfaceTextureHelper and listener.
     final SurfaceTextureHelper surfaceTextureHelper =
-        SurfaceTextureHelper.create(EGL10.EGL_NO_CONTEXT, handler);
+        SurfaceTextureHelper.create(null, 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(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PLAIN);
+    final EglBase eglOesBase = EglBase.create(null, EglBase.ConfigType.PLAIN);
     eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
     eglOesBase.makeCurrent();
     // Draw a frame onto the SurfaceTexture.
     GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
     // swapBuffers() will ultimately trigger onTextureFrameAvailable().
     eglOesBase.swapBuffers();
     eglOesBase.release();
 
     // Wait for an OES texture to arrive.
     listener.waitForNewFrame();
 
     // Return the frame from this thread.
     surfaceTextureHelper.returnTextureFrame();
     surfaceTextureHelper.disconnect(handler);
   }
 
   /**
    * Test use SurfaceTextureHelper on a separate thread. A uniform texture frame is created and
    * received on a thread separate from the test thread and returned after disconnect.
    */
   @MediumTest
   public static void testLateReturnFrameOnSeparateThread() throws InterruptedException {
     final HandlerThread thread = new HandlerThread("SurfaceTextureHelperTestThread");
     thread.start();
     final Handler handler = new Handler(thread.getLooper());
 
     // Create SurfaceTextureHelper and listener.
     final SurfaceTextureHelper surfaceTextureHelper =
-        SurfaceTextureHelper.create(EGL10.EGL_NO_CONTEXT, handler);
+        SurfaceTextureHelper.create(null, 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(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PLAIN);
+    final EglBase eglOesBase = EglBase.create(null, EglBase.ConfigType.PLAIN);
     eglOesBase.createSurface(surfaceTextureHelper.getSurfaceTexture());
     eglOesBase.makeCurrent();
     // Draw a frame onto the SurfaceTexture.
     GLES20.glClear(GLES20.GL_COLOR_BUFFER_BIT);
     // swapBuffers() will ultimately trigger onTextureFrameAvailable().
     eglOesBase.swapBuffers();
     eglOesBase.release();
 
     // Wait for an OES texture to arrive.
     listener.waitForNewFrame();
 
     surfaceTextureHelper.disconnect(handler);
 
     surfaceTextureHelper.returnTextureFrame();
   }
 }