| Index: talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
|
| diff --git a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java b/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
|
| deleted file mode 100644
|
| index 1b97201a0aa65e1a8a2231bbbc30ebfaf80ca4f2..0000000000000000000000000000000000000000
|
| --- a/talk/app/webrtc/androidtests/src/org/webrtc/VideoCapturerAndroidTest.java
|
| +++ /dev/null
|
| @@ -1,340 +0,0 @@
|
| -/*
|
| - * 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,
|
| - * this list of conditions and the following disclaimer in the documentation
|
| - * and/or other materials provided with the distribution.
|
| - * 3. The name of the author may not be used to endorse or promote products
|
| - * derived from this software without specific prior written permission.
|
| - *
|
| - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
|
| - * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
|
| - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
|
| - * EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
| - * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
|
| - * 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.test.ActivityTestCase;
|
| -import android.test.suitebuilder.annotation.MediumTest;
|
| -import android.test.suitebuilder.annotation.SmallTest;
|
| -import android.util.Size;
|
| -
|
| -import org.webrtc.CameraEnumerationAndroid.CaptureFormat;
|
| -
|
| -import java.util.HashSet;
|
| -import java.util.Set;
|
| -
|
| -@SuppressWarnings("deprecation")
|
| -public class VideoCapturerAndroidTest extends ActivityTestCase {
|
| - static final String TAG = "VideoCapturerAndroidTest";
|
| -
|
| - @Override
|
| - protected void setUp() {
|
| - assertTrue(PeerConnectionFactory.initializeAndroidGlobals(
|
| - getInstrumentation().getContext(), true, true, true));
|
| - }
|
| -
|
| - @SmallTest
|
| - // Test that enumerating formats using android.hardware.camera2 will give the same formats as
|
| - // android.hardware.camera in the range 320x240 to 1280x720. Often the camera2 API may contain
|
| - // some high resolutions that are not supported in camera1, but it may also be the other way
|
| - // around in some cases. Supported framerates may also differ, so don't compare those.
|
| - public void testCamera2Enumerator() {
|
| - if (!Camera2Enumerator.isSupported()) {
|
| - return;
|
| - }
|
| - final CameraEnumerationAndroid.Enumerator camera1Enumerator = new CameraEnumerator();
|
| - final CameraEnumerationAndroid.Enumerator camera2Enumerator =
|
| - new Camera2Enumerator(getInstrumentation().getContext());
|
| -
|
| - for (int i = 0; i < CameraEnumerationAndroid.getDeviceCount(); ++i) {
|
| - final Set<Size> resolutions1 = new HashSet<Size>();
|
| - for (CaptureFormat format : camera1Enumerator.getSupportedFormats(i)) {
|
| - resolutions1.add(new Size(format.width, format.height));
|
| - }
|
| - final Set<Size> resolutions2 = new HashSet<Size>();
|
| - for (CaptureFormat format : camera2Enumerator.getSupportedFormats(i)) {
|
| - resolutions2.add(new Size(format.width, format.height));
|
| - }
|
| - for (Size size : resolutions1) {
|
| - if (size.getWidth() >= 320 && size.getHeight() >= 240
|
| - && size.getWidth() <= 1280 && size.getHeight() <= 720) {
|
| - assertTrue(resolutions2.contains(size));
|
| - }
|
| - }
|
| - }
|
| - }
|
| -
|
| - @SmallTest
|
| - public void testCreateAndRelease() {
|
| - VideoCapturerAndroidTestFixtures.release(VideoCapturerAndroid.create("", null));
|
| - }
|
| -
|
| - @SmallTest
|
| - public void testCreateAndReleaseUsingTextures() {
|
| - EglBase eglBase = EglBase.create();
|
| - VideoCapturerAndroidTestFixtures.release(
|
| - VideoCapturerAndroid.create("", null, eglBase.getEglBaseContext()));
|
| - eglBase.release();
|
| - }
|
| -
|
| - @SmallTest
|
| - public void testCreateNonExistingCamera() {
|
| - VideoCapturerAndroid capturer = VideoCapturerAndroid.create(
|
| - "non-existing camera", null);
|
| - assertNull(capturer);
|
| - }
|
| -
|
| - @SmallTest
|
| - // 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.
|
| - public void testStartVideoCapturer() throws InterruptedException {
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create("", null);
|
| - VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer);
|
| - }
|
| -
|
| - @SmallTest
|
| - public void testStartVideoCapturerUsingTextures() throws InterruptedException {
|
| - EglBase eglBase = EglBase.create();
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create("", null, eglBase.getEglBaseContext());
|
| - VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer);
|
| - eglBase.release();
|
| - }
|
| -
|
| - @SmallTest
|
| - // This test that the camera can be started and that the frames are forwarded
|
| - // to a Java video renderer using the front facing video capturer.
|
| - // It tests both the Java and the C++ layer.
|
| - public void testStartFrontFacingVideoCapturer() throws InterruptedException {
|
| - String deviceName = CameraEnumerationAndroid.getNameOfFrontFacingDevice();
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create(deviceName, null);
|
| - VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer);
|
| - }
|
| -
|
| - @SmallTest
|
| - // This test that the camera can be started and that the frames are forwarded
|
| - // to a Java video renderer using the back facing video capturer.
|
| - // It tests both the Java and the C++ layer.
|
| - public void testStartBackFacingVideoCapturer() throws InterruptedException {
|
| - if (!VideoCapturerAndroidTestFixtures.HaveTwoCameras()) {
|
| - return;
|
| - }
|
| -
|
| - String deviceName = CameraEnumerationAndroid.getNameOfBackFacingDevice();
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create(deviceName, null);
|
| - VideoCapturerAndroidTestFixtures.startCapturerAndRender(capturer);
|
| - }
|
| -
|
| - @SmallTest
|
| - // This test that the default camera can be started and that the camera can
|
| - // later be switched to another camera.
|
| - // It tests both the Java and the C++ layer.
|
| - public void testSwitchVideoCapturer() throws InterruptedException {
|
| - VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", null);
|
| - VideoCapturerAndroidTestFixtures.switchCamera(capturer);
|
| - }
|
| -
|
| - @SmallTest
|
| - public void testSwitchVideoCapturerUsingTextures() throws InterruptedException {
|
| - EglBase eglBase = EglBase.create();
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create("", null, eglBase.getEglBaseContext());
|
| - VideoCapturerAndroidTestFixtures.switchCamera(capturer);
|
| - eglBase.release();
|
| - }
|
| -
|
| - @MediumTest
|
| - public void testCameraEvents() throws InterruptedException {
|
| - VideoCapturerAndroidTestFixtures.CameraEvents cameraEvents =
|
| - VideoCapturerAndroidTestFixtures.createCameraEvents();
|
| - VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", cameraEvents);
|
| - VideoCapturerAndroidTestFixtures.cameraEventsInvoked(
|
| - capturer, cameraEvents, getInstrumentation().getContext());
|
| - }
|
| -
|
| - @MediumTest
|
| - // Test what happens when attempting to call e.g. switchCamera() after camera has been stopped.
|
| - public void testCameraCallsAfterStop() throws InterruptedException {
|
| - final String deviceName = CameraEnumerationAndroid.getDeviceName(0);
|
| - final VideoCapturerAndroid capturer = VideoCapturerAndroid.create(deviceName, null);
|
| -
|
| - VideoCapturerAndroidTestFixtures.cameraCallsAfterStop(capturer,
|
| - getInstrumentation().getContext());
|
| - }
|
| -
|
| - @MediumTest
|
| - public void testCameraCallsAfterStopUsingTextures() throws InterruptedException {
|
| - EglBase eglBase = EglBase.create();
|
| - final String deviceName = CameraEnumerationAndroid.getDeviceName(0);
|
| - final VideoCapturerAndroid capturer = VideoCapturerAndroid.create(deviceName, null,
|
| - eglBase.getEglBaseContext());
|
| -
|
| - VideoCapturerAndroidTestFixtures.cameraCallsAfterStop(capturer,
|
| - getInstrumentation().getContext());
|
| - eglBase.release();
|
| - }
|
| -
|
| - @SmallTest
|
| - // This test that the VideoSource that the VideoCapturer is connected to can
|
| - // be stopped and restarted. It tests both the Java and the C++ layer.
|
| - public void testStopRestartVideoSource() throws InterruptedException {
|
| - VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", null);
|
| - VideoCapturerAndroidTestFixtures.stopRestartVideoSource(capturer);
|
| - }
|
| -
|
| - @SmallTest
|
| - public void testStopRestartVideoSourceUsingTextures() throws InterruptedException {
|
| - EglBase eglBase = EglBase.create();
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create("", null, eglBase.getEglBaseContext());
|
| - VideoCapturerAndroidTestFixtures.stopRestartVideoSource(capturer);
|
| - eglBase.release();
|
| - }
|
| -
|
| - @SmallTest
|
| - // This test that the camera can be started at different resolutions.
|
| - // It does not test or use the C++ layer.
|
| - public void testStartStopWithDifferentResolutions() throws InterruptedException {
|
| - String deviceName = CameraEnumerationAndroid.getDeviceName(0);
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create(deviceName, null);
|
| - VideoCapturerAndroidTestFixtures.startStopWithDifferentResolutions(capturer,
|
| - getInstrumentation().getContext());
|
| - }
|
| -
|
| - @SmallTest
|
| - public void testStartStopWithDifferentResolutionsUsingTextures() throws InterruptedException {
|
| - EglBase eglBase = EglBase.create();
|
| - String deviceName = CameraEnumerationAndroid.getDeviceName(0);
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create(deviceName, null, eglBase.getEglBaseContext());
|
| - VideoCapturerAndroidTestFixtures.startStopWithDifferentResolutions(capturer,
|
| - getInstrumentation().getContext());
|
| - eglBase.release();
|
| - }
|
| -
|
| - @SmallTest
|
| - // This test that an error is reported if the camera is already opened
|
| - // when VideoCapturerAndroid is started.
|
| - public void testStartWhileCameraAlreadyOpened() throws InterruptedException {
|
| - String deviceName = CameraEnumerationAndroid.getDeviceName(0);
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create(deviceName, null);
|
| - VideoCapturerAndroidTestFixtures.startWhileCameraIsAlreadyOpen(
|
| - capturer, getInstrumentation().getContext());
|
| - }
|
| -
|
| - @SmallTest
|
| - // This test that VideoCapturerAndroid can be started, even if the camera is already opened
|
| - // if the camera is closed while VideoCapturerAndroid is re-trying to start.
|
| - public void testStartWhileCameraIsAlreadyOpenAndCloseCamera() throws InterruptedException {
|
| - String deviceName = CameraEnumerationAndroid.getDeviceName(0);
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create(deviceName, null);
|
| - VideoCapturerAndroidTestFixtures.startWhileCameraIsAlreadyOpenAndCloseCamera(
|
| - capturer, getInstrumentation().getContext());
|
| - }
|
| -
|
| - @SmallTest
|
| - // This test that VideoCapturerAndroid.stop can be called while VideoCapturerAndroid is
|
| - // re-trying to start.
|
| - public void startWhileCameraIsAlreadyOpenAndStop() throws InterruptedException {
|
| - String deviceName = CameraEnumerationAndroid.getDeviceName(0);
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create(deviceName, null);
|
| - VideoCapturerAndroidTestFixtures.startWhileCameraIsAlreadyOpenAndStop(
|
| - capturer, getInstrumentation().getContext());
|
| - }
|
| -
|
| -
|
| -
|
| - @SmallTest
|
| - // This test what happens if buffers are returned after the capturer have
|
| - // been stopped and restarted. It does not test or use the C++ layer.
|
| - public void testReturnBufferLate() throws InterruptedException {
|
| - String deviceName = CameraEnumerationAndroid.getDeviceName(0);
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create(deviceName, null);
|
| - VideoCapturerAndroidTestFixtures.returnBufferLate(capturer,
|
| - getInstrumentation().getContext());
|
| - }
|
| -
|
| - @SmallTest
|
| - public void testReturnBufferLateUsingTextures() throws InterruptedException {
|
| - EglBase eglBase = EglBase.create();
|
| - String deviceName = CameraEnumerationAndroid.getDeviceName(0);
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create(deviceName, null, eglBase.getEglBaseContext());
|
| - VideoCapturerAndroidTestFixtures.returnBufferLate(capturer,
|
| - getInstrumentation().getContext());
|
| - eglBase.release();
|
| - }
|
| -
|
| - @MediumTest
|
| - // This test that we can capture frames, keep the frames in a local renderer, stop capturing,
|
| - // and then return the frames. The difference between the test testReturnBufferLate() is that we
|
| - // also test the JNI and C++ AndroidVideoCapturer parts.
|
| - public void testReturnBufferLateEndToEnd() throws InterruptedException {
|
| - final VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", null);
|
| - VideoCapturerAndroidTestFixtures.returnBufferLateEndToEnd(capturer);
|
| - }
|
| -
|
| - @MediumTest
|
| - public void testReturnBufferLateEndToEndUsingTextures() throws InterruptedException {
|
| - EglBase eglBase = EglBase.create();
|
| - final VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create("", null, eglBase.getEglBaseContext());
|
| - VideoCapturerAndroidTestFixtures.returnBufferLateEndToEnd(capturer);
|
| - eglBase.release();
|
| - }
|
| -
|
| - @MediumTest
|
| - // This test that CameraEventsHandler.onError is triggered if video buffers are not returned to
|
| - // the capturer.
|
| - public void testCameraFreezedEventOnBufferStarvationUsingTextures() throws InterruptedException {
|
| - EglBase eglBase = EglBase.create();
|
| - VideoCapturerAndroidTestFixtures.CameraEvents cameraEvents =
|
| - VideoCapturerAndroidTestFixtures.createCameraEvents();
|
| - VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", cameraEvents,
|
| - eglBase.getEglBaseContext());
|
| - VideoCapturerAndroidTestFixtures.cameraFreezedEventOnBufferStarvationUsingTextures(capturer,
|
| - cameraEvents, getInstrumentation().getContext());
|
| - eglBase.release();
|
| - }
|
| -
|
| - @MediumTest
|
| - // This test that frames forwarded to a renderer is scaled if onOutputFormatRequest is
|
| - // called. This test both Java and C++ parts of of the stack.
|
| - public void testScaleCameraOutput() throws InterruptedException {
|
| - VideoCapturerAndroid capturer = VideoCapturerAndroid.create("", null);
|
| - VideoCapturerAndroidTestFixtures.scaleCameraOutput(capturer);
|
| - }
|
| -
|
| - @MediumTest
|
| - // This test that frames forwarded to a renderer is scaled if onOutputFormatRequest is
|
| - // called. This test both Java and C++ parts of of the stack.
|
| - public void testScaleCameraOutputUsingTextures() throws InterruptedException {
|
| - EglBase eglBase = EglBase.create();
|
| - VideoCapturerAndroid capturer =
|
| - VideoCapturerAndroid.create("", null, eglBase.getEglBaseContext());
|
| - VideoCapturerAndroidTestFixtures.scaleCameraOutput(capturer);
|
| - eglBase.release();
|
| - }
|
| -}
|
|
|