Convert Android camera tests to use the new createVideoSource API.

webrtc/api/android/java/src/org/webrtc/Camera2Capturer.java

 /*
  *  Copyright 2016 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 249 matching lines @@
         throw new RuntimeException("Unknown camera state: " + cameraState);
     }
     closeAndRelease();
   }
 
   private void closeAndRelease() {
     checkIsOnCameraThread();
 
     Logging.d(TAG, "Close and release.");
     setCameraState(CameraState.STOPPING);
+    capturerObserver.onCapturerStopped();
 
     // Remove all pending Runnables posted from |this|.
     cameraThreadHandler.removeCallbacksAndMessages(this /* token */);
     if (cameraStatistics != null) {
       cameraStatistics.release();
       cameraStatistics = null;
     }
     if (surfaceTextureHelper != null) {
       surfaceTextureHelper.stopListening();
     }
@@ skipping 288 matching lines @@
         Logging.e(TAG, "Camera state was not STOPPING in onClosed. Most likely camera didn't stop "
             + "within timelimit and this method was invoked twice.");
         return;
       }
 
       cameraThreadHandler.removeCallbacksAndMessages(STOP_TIMEOUT_RUNNABLE_TOKEN);
       setCameraState(CameraState.IDLE);
       if (eventsHandler != null) {
         eventsHandler.onCameraClosed();
       }
-      capturerObserver.onCapturerStopped();
     }
   }
 
   final class CaptureSessionCallback extends CameraCaptureSession.StateCallback {
     @Override
     public void onConfigureFailed(CameraCaptureSession session) {
       checkIsOnCameraThread();
       captureSession = session;
       reportError("Failed to configure capture session.");
     }
@@ skipping 266 matching lines @@
         break;
     }
     return orientation;
   }
 
   @Override
   public void onTextureFrameAvailable(
       int oesTextureId, float[] transformMatrix, long timestampNs) {
     checkIsOnCameraThread();
 
+    if (cameraState != CameraState.RUNNING) {
+      Logging.d(TAG, "Texture frame received while camera was not running.");
+      return;
+    }
+
     if (eventsHandler != null && !firstFrameReported) {
       eventsHandler.onFirstFrameAvailable();
       firstFrameReported = true;
     }
 
     int rotation;
     if (isFrontCamera) {
       // Undo the mirror that the OS "helps" us with.
       // http://developer.android.com/reference/android/hardware/Camera.html#setDisplayOrientation(int)
       rotation = cameraOrientation + getDeviceOrientation();
       transformMatrix =
           RendererCommon.multiplyMatrices(transformMatrix, RendererCommon.horizontalFlipMatrix());
     } else {
       rotation = cameraOrientation - getDeviceOrientation();
     }
     // Make sure |rotation| is between 0 and 360.
     rotation = (360 + rotation % 360) % 360;
 
     // Undo camera orientation - we report it as rotation instead.
     transformMatrix = RendererCommon.rotateTextureMatrix(transformMatrix, -cameraOrientation);
 
     cameraStatistics.addFrame();
     capturerObserver.onTextureFrameCaptured(captureFormat.width, captureFormat.height, oesTextureId,
         transformMatrix, rotation, timestampNs);
   }
 }