Android GlUtil: Add helper functions generateTexture/deleteTexture

talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java

Index: talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
diff --git a/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java b/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
index ffda916cbdaa1fd09c903919e1cbe3f9b69c808d..fadeea113a8b10fb222f346a93b8807cf096bb58 100644
--- a/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
+++ b/talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java
@@ -81,7 +81,7 @@ public class VideoCapturerAndroid extends VideoCapturer implements PreviewCallba
   private int id;
   private Camera.CameraInfo info;
   private SurfaceTexture cameraSurfaceTexture;
-  private int[] cameraGlTextures = null;
+  private int cameraGlTexture = -1;

[hbos, 2015/09/02 08:57:54]

I believe 0 is the value to use for "no texture". Make sure -1 cannot in theory
be used as the ID or switch to 0 (thought it would probably never be used in
practice).

[magjed_webrtc, 2015/09/02 10:15:39]

True, I think 0 is the only value that is guaranteed to not be returned from
glGenTextures(). I couldn't find anything about -1 in the spec. It's a GLUint so
it's 0xFFFFFFFF. I guess it will never be returned in practice.

[hbos, 2015/09/02 11:10:38]

Acknowledged.

   private final FramePool videoBuffers = new FramePool();
   // Remember the requested format in case we want to switch cameras.
   private int requestedWidth;
@@ -323,23 +323,8 @@ public class VideoCapturerAndroid extends VideoCapturer implements PreviewCallba
       // it over to Camera, but never listen for frame-ready callbacks,
       // and never call updateTexImage on it.
       try {
-        cameraSurfaceTexture = null;
-
-        cameraGlTextures = new int[1];
-        // Generate one texture pointer and bind it as an external texture.
-        GLES20.glGenTextures(1, cameraGlTextures, 0);
-        GLES20.glBindTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
-            cameraGlTextures[0]);
-        GLES20.glTexParameterf(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
-            GLES20.GL_TEXTURE_MIN_FILTER, GLES20.GL_LINEAR);
-        GLES20.glTexParameterf(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
-            GLES20.GL_TEXTURE_MAG_FILTER, GLES20.GL_LINEAR);
-        GLES20.glTexParameteri(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
-            GLES20.GL_TEXTURE_WRAP_S, GLES20.GL_CLAMP_TO_EDGE);
-        GLES20.glTexParameteri(GLES11Ext.GL_TEXTURE_EXTERNAL_OES,
-            GLES20.GL_TEXTURE_WRAP_T, GLES20.GL_CLAMP_TO_EDGE);
-
-        cameraSurfaceTexture = new SurfaceTexture(cameraGlTextures[0]);
+        cameraGlTexture = GlUtil.generateTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
+        cameraSurfaceTexture = new SurfaceTexture(cameraGlTexture);
         cameraSurfaceTexture.setOnFrameAvailableListener(null);
 
         camera.setPreviewTexture(cameraSurfaceTexture);
@@ -473,11 +458,8 @@ public class VideoCapturerAndroid extends VideoCapturer implements PreviewCallba
 
       camera.setPreviewTexture(null);
       cameraSurfaceTexture = null;
-      if (cameraGlTextures != null) {
-        GLES20.glDeleteTextures(1, cameraGlTextures, 0);
-        cameraGlTextures = null;
-      }
-
+      GlUtil.deleteTexture(cameraGlTexture);
+      cameraGlTexture = -1;

[hbos, 2015/09/02 08:57:54]

0

       Log.d(TAG, "Release camera.");
       camera.release();
       camera = null;