Make VideoCapturerAndroid work on SDK level 16

talk/app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.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.content.Context;
+import android.graphics.SurfaceTexture;
 import android.hardware.Camera;
 import android.hardware.Camera.PreviewCallback;
 import android.opengl.EGL14;
 import android.opengl.EGLContext;
+import android.opengl.GLES11Ext;
+import android.opengl.GLES20;
 import android.os.Handler;
 import android.os.HandlerThread;
 import android.os.SystemClock;
-import android.text.StaticLayout;
 import android.view.Surface;
 import android.view.WindowManager;
 
 import org.json.JSONException;
 import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
 import org.webrtc.Logging;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ skipping 37 matching lines @@
   private int requestedWidth;
   private int requestedHeight;
   private int requestedFramerate;
   // The capture format will be the closest supported format to the requested format.
   private CaptureFormat captureFormat;
   private final Object pendingCameraSwitchLock = new Object();
   private volatile boolean pendingCameraSwitch;
   private CapturerObserver frameObserver = null;
   private final CameraErrorHandler errorHandler;
   private final boolean isCapturingToTexture;
+  // |cameraGlTexture| is used with setPreviewTexture if the capturer is capturing to
+  // ByteBuffers.
+  private int cameraGlTexture;
+  // |cameraSurfaceTexture| is used with setPreviewTexture if the capturer is capturing to
+  // ByteBuffers. Must be a member, see issue webrtc:5021.
+  private SurfaceTexture cameraSurfaceTexture;
+  //|surfaceHelper| is used if the capturer is capturing to a texture. Capturing to textures require
+  // API level 17.
   private final SurfaceTextureHelper surfaceHelper;
   // The camera API can output one old frame after the camera has been switched or the resolution
   // has been changed. This flag is used for dropping the first frame after camera restart.
   private boolean dropNextFrame = false;
 
   // Camera error callback.
   private final Camera.ErrorCallback cameraErrorCallback =
       new Camera.ErrorCallback() {
     @Override
     public void onError(int error, Camera camera) {
@@ skipping 92 matching lines @@
     // Invoked on failure, e.g. camera is stopped or only one camera available.
     void onCameraSwitchError(String errorDescription);
   }
 
   public static VideoCapturerAndroid create(String name,
       CameraErrorHandler errorHandler) {
     return VideoCapturerAndroid.create(name, errorHandler, null);
   }
 
   public static VideoCapturerAndroid create(String name,
-      CameraErrorHandler errorHandler, EGLContext sharedContext) {
+      CameraErrorHandler errorHandler, Object sharedEglContext) {
     final int cameraId = lookupDeviceName(name);
     if (cameraId == -1) {
       return null;
     }
 
     final VideoCapturerAndroid capturer = new VideoCapturerAndroid(cameraId, errorHandler,
-        sharedContext);
+        sharedEglContext);
     capturer.setNativeCapturer(nativeCreateVideoCapturer(capturer));
     return capturer;
   }
 
   // Switch camera to the next valid camera id. This can only be called while
   // the camera is running.
   public void switchCamera(final CameraSwitchHandler handler) {
     if (Camera.getNumberOfCameras() < 2) {
       if (handler != null) {
         handler.onCameraSwitchError("No camera to switch to.");
@@ skipping 73 matching lines @@
   private String getSupportedFormatsAsJson() throws JSONException {
     return CameraEnumerationAndroid.getSupportedFormatsAsJson(getCurrentCameraId());
   }
 
   // Called from native VideoCapturer_nativeCreateVideoCapturer.
   private VideoCapturerAndroid(int cameraId) {
     this(cameraId, null, null);
   }
 
   private VideoCapturerAndroid(int cameraId, CameraErrorHandler errorHandler,
-      EGLContext sharedContext) {
+      Object sharedContext) {
     Logging.d(TAG, "VideoCapturerAndroid");
     this.id = cameraId;
     this.errorHandler = errorHandler;
     cameraThread = new HandlerThread(TAG);
     cameraThread.start();
     cameraThreadHandler = new Handler(cameraThread.getLooper());
     videoBuffers = new FramePool(cameraThread);
-    surfaceHelper = SurfaceTextureHelper.create(
-        sharedContext == null ? EGL14.EGL_NO_CONTEXT : sharedContext, cameraThreadHandler);
     if (sharedContext != null) {
+      surfaceHelper = SurfaceTextureHelper.create((EGLContext)sharedContext, cameraThreadHandler);
       surfaceHelper.setListener(this);
+      isCapturingToTexture = true;
+    } else {
+      surfaceHelper = null;
+      isCapturingToTexture = false;
     }
-    isCapturingToTexture = sharedContext != null;
   }
 
   private void checkIsOnCameraThread() {
     if (Thread.currentThread() != cameraThread) {
       throw new IllegalStateException("Wrong thread");
     }
   }
 
   // Returns the camera index for camera with name |deviceName|, or -1 if no such camera can be
   // found. If |deviceName| is empty, the first available device is used.
@@ skipping 13 matching lines @@
     return -1;
   }
 
   // Called by native code to quit the camera thread. This needs to be done manually, otherwise the
   // thread and handler will not be garbage collected.
   private void release() {
     Logging.d(TAG, "release");
     if (isReleased()) {
       throw new IllegalStateException("Already released");
     }
-    cameraThreadHandler.post(new Runnable() {
+    ThreadUtils.invokeUninterruptibly(cameraThreadHandler, new Runnable() {
       @Override
       public void run() {
         if (camera != null) {
           throw new IllegalStateException("Release called while camera is running");
         }
         if (cameraStatistics.pendingFramesCount() != 0) {
           throw new IllegalStateException("Release called with pending frames left");
         }
       }
     });
-    surfaceHelper.disconnect();
-
-    cameraThread.quitSafely();
+    if (isCapturingToTexture) {
+      surfaceHelper.disconnect();
+    }
+    cameraThread.quit();
     ThreadUtils.joinUninterruptibly(cameraThread);
     cameraThread = null;
   }
 
   // Used for testing purposes to check if release() has been called.
   public boolean isReleased() {
     return (cameraThread == null);
   }
 
   // Called by native code.
@@ skipping 30 matching lines @@
     this.applicationContext = applicationContext;
     this.frameObserver = frameObserver;
     try {
       synchronized (cameraIdLock) {
         Logging.d(TAG, "Opening camera " + id);
         camera = Camera.open(id);
         info = new Camera.CameraInfo();
         Camera.getCameraInfo(id, info);
       }
       try {
-        camera.setPreviewTexture(surfaceHelper.getSurfaceTexture());
+        if (isCapturingToTexture) {
+          camera.setPreviewTexture(surfaceHelper.getSurfaceTexture());
+        } else {
+          cameraGlTexture = GlUtil.generateTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
+          cameraSurfaceTexture = new SurfaceTexture(cameraGlTexture);
+          camera.setPreviewTexture(cameraSurfaceTexture);
+        }
       } catch (IOException e) {
         Logging.e(TAG, "setPreviewTexture failed", error);
         throw new RuntimeException(e);
       }
 
       Logging.d(TAG, "Camera orientation: " + info.orientation +
           " .Device orientation: " + getDeviceOrientation());
       camera.setErrorCallback(cameraErrorCallback);
       startPreviewOnCameraThread(width, height, framerate);
       frameObserver.onCapturerStarted(true);
@@ skipping 119 matching lines @@
       Logging.d(TAG, "stopReturnBuffersToCamera called."
         + (cameraStatistics.pendingFramesCount() == 0?
                " All buffers have been returned."
                : " Pending buffers: " + cameraStatistics.pendingFramesTimeStamps() + "."));
     }
     captureFormat = null;
 
     Logging.d(TAG, "Release camera.");
     camera.release();
     camera = null;
+
+    if (cameraGlTexture != 0) {
+      GLES20.glDeleteTextures(1, new int[] {cameraGlTexture}, 0);
+      cameraGlTexture = 0;
+    }
+    if (cameraSurfaceTexture != null) {
+      cameraSurfaceTexture.release();
+    }
   }
 
   private void switchCameraOnCameraThread() {
     checkIsOnCameraThread();
     Logging.d(TAG, "switchCameraOnCameraThread");
     stopCaptureOnCameraThread();
     synchronized (cameraIdLock) {
       id = (id + 1) % Camera.getNumberOfCameras();
     }
     dropNextFrame = true;
@@ skipping 284 matching lines @@
     private native void nativeOnByteBufferFrameCaptured(long nativeCapturer,
         byte[] data, int length, int width, int height, int rotation, long timeStamp);
     private native void nativeOnTextureFrameCaptured(long nativeCapturer, int width, int height,
         int oesTextureId, float[] transformMatrix, long timestamp);
     private native void nativeOnOutputFormatRequest(long nativeCapturer,
         int width, int height, int framerate);
   }
 
   private static native long nativeCreateVideoCapturer(VideoCapturerAndroid videoCapturer);
 }