Session based capturing for Camera2Capturer.

webrtc/api/androidtests/src/org/webrtc/Camera1CapturerUsingByteBufferTest.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.
  */
 
 package org.webrtc;
 
 import android.content.Context;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 public class Camera1CapturerUsingByteBufferTest extends InstrumentationTestCase {
   static final String TAG = "Camera1CapturerUsingByteBufferTest";
 
   private class TestObjectFactory
       extends CameraVideoCapturerTestFixtures.TestObjectFactory {
     @Override
-    public CameraVideoCapturer createCapturer(
-        String name,
-        CameraVideoCapturer.CameraEventsHandler eventsHandler) {
-      return new VideoCapturerAndroid(name, eventsHandler, isCapturingToTexture());
-    }
-
-    @Override
     public boolean isCapturingToTexture() {
       return false;
     }
 
     @Override
     public CameraEnumerator getCameraEnumerator() {
-      return new Camera1Enumerator();
+      return new Camera1Enumerator(false);
     }
 
     @Override
     public Context getAppContext() {
       return getInstrumentation().getTargetContext();
     }
 
     @SuppressWarnings("deprecation")
     @Override
     public Object rawOpenCamera(String cameraName) {
@@ skipping 13 matching lines @@
   protected void setUp() {
     fixtures = new CameraVideoCapturerTestFixtures(new TestObjectFactory());
   }
 
   @Override
   protected void tearDown() {
     fixtures.dispose();
   }
 
   @SmallTest
-  public void testCreateAndDispose() {
+  public void testCreateAndDispose() throws InterruptedException {
     fixtures.createCapturerAndDispose();
   }
 
   @SmallTest
-  public void testCreateNonExistingCamera() {
+  public void testCreateNonExistingCamera() throws InterruptedException {
     fixtures.createNonExistingCamera();
   }
 
   // This test that the camera can be started and that the frames are forwarded
   // to a Java video renderer using a "default" capturer.
   // It tests both the Java and the C++ layer.
   @MediumTest
   public void testCreateCapturerAndRender() throws InterruptedException {
     fixtures.createCapturerAndRender();
   }
@@ skipping 83 matching lines @@
     fixtures.startWhileCameraIsAlreadyOpenAndCloseCamera();
   }
 
   // This test that CameraVideoCapturer.stop can be called while CameraVideoCapturer is
   // re-trying to start.
   @MediumTest
   public void testStartWhileCameraIsAlreadyOpenAndStop() throws InterruptedException {
     fixtures.startWhileCameraIsAlreadyOpenAndStop();
   }
 }