Remove camera.setPreviewTexture in doStopCaptureOnCameraThread.

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 61 matching lines @@
 public class VideoCapturerAndroid extends VideoCapturer implements PreviewCallback {
   private final static String TAG = "VideoCapturerAndroid";
   private final static int CAMERA_OBSERVER_PERIOD_MS = 5000;
 
   private Camera camera;  // Only non-null while capturing.
   private CameraThread cameraThread;
   private Handler cameraThreadHandler;
   private Context applicationContext;
   private int id;
   private Camera.CameraInfo info;
-  private SurfaceTexture cameraSurfaceTexture;
   private int cameraGlTexture = 0;
   private final FramePool videoBuffers = new FramePool();
   // Remember the requested format in case we want to switch cameras.
   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 int cameraFramesCount;
   private int captureBuffersCount;
@@ skipping 176 matching lines @@
     @Override public void run() {
       Looper.prepare();
       exchange(handlerExchanger, new Handler());
       Looper.loop();
     }
   }
 
   // Called by native code.  Returns true if capturer is started.
   //
   // Note that this actually opens the camera, and Camera callbacks run on the
-  // thread that calls open(), so this is done on the CameraThread.  Since the
-  // API needs a synchronous success return value we wait for the result.
+  // thread that calls open(), so this is done on the CameraThread.
   synchronized void startCapture(
       final int width, final int height, final int framerate,
       final Context applicationContext, final CapturerObserver frameObserver) {
     Logging.d(TAG, "startCapture requested: " + width + "x" + height
         + "@" + framerate);
     if (applicationContext == null) {
       throw new RuntimeException("applicationContext not set.");
     }
     if (frameObserver == null) {
       throw new RuntimeException("frameObserver not set.");
@@ skipping 25 matching lines @@
       camera = Camera.open(id);
       info = new Camera.CameraInfo();
       Camera.getCameraInfo(id, info);
       // No local renderer (we only care about onPreviewFrame() buffers, not a
       // directly-displayed UI element).  Camera won't capture without
       // setPreview{Texture,Display}, so we create a SurfaceTexture and hand
       // it over to Camera, but never listen for frame-ready callbacks,
       // and never call updateTexImage on it.
       try {
         cameraGlTexture = GlUtil.generateTexture(GLES11Ext.GL_TEXTURE_EXTERNAL_OES);
-        cameraSurfaceTexture = new SurfaceTexture(cameraGlTexture);
+        SurfaceTexture cameraSurfaceTexture = new SurfaceTexture(cameraGlTexture);
         cameraSurfaceTexture.setOnFrameAvailableListener(null);
 
         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());
@@ skipping 104 matching lines @@
     doStopCaptureOnCameraThread();
     Looper.myLooper().quit();
     return;
   }
 
   private void doStopCaptureOnCameraThread() {
     Logging.d(TAG, "stopCaptureOnCameraThread");
     if (camera == null) {
       return;
     }
-    try {
-      cameraThreadHandler.removeCallbacks(cameraObserver);
-      Logging.d(TAG, "Stop preview.");
-      camera.stopPreview();
-      camera.setPreviewCallbackWithBuffer(null);
-      videoBuffers.stopReturnBuffersToCamera();
-      captureFormat = null;
 
-      camera.setPreviewTexture(null);
-      cameraSurfaceTexture = null;
-      if (cameraGlTexture != 0) {
-        GLES20.glDeleteTextures(1, new int[] {cameraGlTexture}, 0);
-        cameraGlTexture = 0;
-      }
-      Logging.d(TAG, "Release camera.");
-      camera.release();
-      camera = null;
-    } catch (IOException e) {
-      Logging.e(TAG, "Failed to stop camera", e);
+    cameraThreadHandler.removeCallbacks(cameraObserver);
+    Logging.d(TAG, "Stop preview.");
+    camera.stopPreview();
+    camera.setPreviewCallbackWithBuffer(null);
+    videoBuffers.stopReturnBuffersToCamera();
+    captureFormat = null;
+
+    if (cameraGlTexture != 0) {
+      GLES20.glDeleteTextures(1, new int[] {cameraGlTexture}, 0);
+      cameraGlTexture = 0;
     }
+    Logging.d(TAG, "Release camera.");
+    camera.release();
+    camera = null;
   }
 
   private void switchCameraOnCameraThread(Runnable switchDoneEvent) {
     Logging.d(TAG, "switchCameraOnCameraThread");
 
     doStopCaptureOnCameraThread();
     startCaptureOnCameraThread(requestedWidth, requestedHeight, requestedFramerate, frameObserver,
         applicationContext);
     pendingCameraSwitch = false;
     Logging.d(TAG, "switchCameraOnCameraThread done");
@@ skipping 253 matching lines @@
     }
 
     private native void nativeCapturerStarted(long nativeCapturer,
         boolean success);
     private native void nativeOnFrameCaptured(long nativeCapturer,
         byte[] data, int length, int width, int height, int rotation, long timeStamp);
     private native void nativeOnOutputFormatRequest(long nativeCapturer,
         int width, int height, int fps);
   }
 }