Use EGL14 if supported on Android

talk/app/webrtc/androidtests/src/org/webrtc/MediaCodecVideoEncoderTest.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 20 matching lines @@
 import android.opengl.GLES20;
 import android.os.Build;
 import android.test.ActivityTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
 import org.webrtc.MediaCodecVideoEncoder.OutputBufferInfo;
 
 import java.nio.ByteBuffer;
 
-import javax.microedition.khronos.egl.EGL10;
-
 @TargetApi(Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1)
 public final class MediaCodecVideoEncoderTest extends ActivityTestCase {
   final static String TAG = "MediaCodecVideoEncoderTest";
 
   @SmallTest
   public static void testInitializeUsingByteBuffer() {
     if (!MediaCodecVideoEncoder.isVp8HwSupported()) {
       Log.i(TAG,
             "Hardware does not support VP8 encoding, skipping testInitReleaseUsingByteBuffer");
       return;
     }
     MediaCodecVideoEncoder encoder = new MediaCodecVideoEncoder();
     assertTrue(encoder.initEncode(
         MediaCodecVideoEncoder.VideoCodecType.VIDEO_CODEC_VP8, 640, 480, 300, 30, null));
     encoder.release();
   }
 
   @SmallTest
   public static void testInitilizeUsingTextures() {
     if (!MediaCodecVideoEncoder.isVp8HwSupportedUsingTextures()) {
       Log.i(TAG, "hardware does not support VP8 encoding, skipping testEncoderUsingTextures");
       return;
     }
+    EglBase eglBase = EglBase.create();
     MediaCodecVideoEncoder encoder = new MediaCodecVideoEncoder();
     assertTrue(encoder.initEncode(
         MediaCodecVideoEncoder.VideoCodecType.VIDEO_CODEC_VP8, 640, 480, 300, 30,
-        EGL10.EGL_NO_CONTEXT));
+        eglBase.getEglBaseContext()));
     encoder.release();
+    eglBase.release();
   }
 
   @SmallTest
   public static void testInitializeUsingByteBufferReInitilizeUsingTextures() {
     if (!MediaCodecVideoEncoder.isVp8HwSupportedUsingTextures()) {
       Log.i(TAG, "hardware does not support VP8 encoding, skipping testEncoderUsingTextures");
       return;
     }
     MediaCodecVideoEncoder encoder = new MediaCodecVideoEncoder();
     assertTrue(encoder.initEncode(
         MediaCodecVideoEncoder.VideoCodecType.VIDEO_CODEC_VP8, 640, 480, 300, 30,
         null));
     encoder.release();
+    EglBase eglBase = EglBase.create();
     assertTrue(encoder.initEncode(
         MediaCodecVideoEncoder.VideoCodecType.VIDEO_CODEC_VP8, 640, 480, 300, 30,
-        EGL10.EGL_NO_CONTEXT));
+        eglBase.getEglBaseContext()));
     encoder.release();
+    eglBase.release();
   }
 
   @SmallTest
   public static void testEncoderUsingByteBuffer() throws InterruptedException {
     if (!MediaCodecVideoEncoder.isVp8HwSupported()) {
       Log.i(TAG, "Hardware does not support VP8 encoding, skipping testEncoderUsingByteBuffer");
       return;
     }
 
     final int width = 640;
@@ skipping 36 matching lines @@
   public static void testEncoderUsingTextures() throws InterruptedException {
     if (!MediaCodecVideoEncoder.isVp8HwSupportedUsingTextures()) {
       Log.i(TAG, "Hardware does not support VP8 encoding, skipping testEncoderUsingTextures");
       return;
     }
 
     final int width = 640;
     final int height = 480;
     final long presentationTs = 2;
 
-    final EglBase eglOesBase = new EglBase(EGL10.EGL_NO_CONTEXT, EglBase.ConfigType.PIXEL_BUFFER);
+    final EglBase eglOesBase = EglBase.create(null, EglBase.ConfigType.PIXEL_BUFFER);
     eglOesBase.createDummyPbufferSurface();
     eglOesBase.makeCurrent();
     int oesTextureId = GlUtil.generateTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
 
     // TODO(perkj): This test is week since we don't fill the texture with valid data with correct
     // width and height and verify the encoded data. Fill the OES texture and figure out a way to
     // verify that the output make sense.
 
     MediaCodecVideoEncoder encoder = new MediaCodecVideoEncoder();
 
     assertTrue(encoder.initEncode(
         MediaCodecVideoEncoder.VideoCodecType.VIDEO_CODEC_VP8, width, height, 300, 30,
-        eglOesBase.getContext()));
+        eglOesBase.getEglBaseContext()));
     assertTrue(encoder.encodeTexture(true, oesTextureId, RendererCommon.identityMatrix(),
         presentationTs));
     GlUtil.checkNoGLES2Error("encodeTexture");
 
     // It should be Ok to delete the texture after calling encodeTexture.
     GLES20.glDeleteTextures(1, new int[] {oesTextureId}, 0);
 
     OutputBufferInfo info = encoder.dequeueOutputBuffer();
     while (info == null) {
       info = encoder.dequeueOutputBuffer();
       Thread.sleep(20);
     }
     assertTrue(info.index != -1);
     assertTrue(info.buffer.capacity() > 0);
     encoder.releaseOutputBuffer(info.index);
 
     encoder.release();
     eglOesBase.release();
   }
 }