Revert of Support for video file instead of camera and output video out to file

webrtc/examples/androidtests/src/org/appspot/apprtc/test/PeerConnectionClientTest.java

 /*
  *  Copyright 2014 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.appspot.apprtc.test;
 
 import org.appspot.apprtc.AppRTCClient.SignalingParameters;
 import org.appspot.apprtc.PeerConnectionClient;
 import org.appspot.apprtc.PeerConnectionClient.PeerConnectionEvents;
 import org.appspot.apprtc.PeerConnectionClient.PeerConnectionParameters;
 
 import android.os.Build;
 import android.test.FlakyTest;
 import android.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.util.Log;
 
-import org.webrtc.Camera1Enumerator;
 import org.webrtc.Camera2Enumerator;
-import org.webrtc.CameraEnumerator;
 import org.webrtc.EglBase;
 import org.webrtc.IceCandidate;
 import org.webrtc.MediaCodecVideoEncoder;
 import org.webrtc.PeerConnection;
 import org.webrtc.PeerConnectionFactory;
 import org.webrtc.SessionDescription;
 import org.webrtc.StatsReport;
-import org.webrtc.VideoCapturer;
 import org.webrtc.VideoRenderer;
 
 import java.util.LinkedList;
 import java.util.List;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 
 public class PeerConnectionClientTest
@@ skipping 186 matching lines @@
     synchronized (closeEvent) {
       if (!isClosed) {
         closeEvent.wait(timeoutMs);
       }
       return isClosed;
     }
   }
 
   PeerConnectionClient createPeerConnectionClient(MockRenderer localRenderer,
       MockRenderer remoteRenderer, PeerConnectionParameters peerConnectionParameters,
-      VideoCapturer videoCapturer, EglBase.Context eglContext) {
+      EglBase.Context eglContext) {
     List<PeerConnection.IceServer> iceServers = new LinkedList<PeerConnection.IceServer>();
     SignalingParameters signalingParameters =
         new SignalingParameters(iceServers, true, // iceServers, initiator.
             null, null, null, // clientId, wssUrl, wssPostUrl.
             null, null); // offerSdp, iceCandidates.
 
     PeerConnectionClient client = PeerConnectionClient.getInstance();
     PeerConnectionFactory.Options options = new PeerConnectionFactory.Options();
     options.networkIgnoreMask = 0;
     options.disableNetworkMonitor = true;
     client.setPeerConnectionFactoryOptions(options);
     client.createPeerConnectionFactory(
         getInstrumentation().getTargetContext(), peerConnectionParameters, this);
-    client.createPeerConnection(
-        eglContext, localRenderer, remoteRenderer, videoCapturer, signalingParameters);
+    client.createPeerConnection(eglContext, localRenderer, remoteRenderer, signalingParameters);
     client.createOffer();
     return client;
   }
 
   private PeerConnectionParameters createParametersForAudioCall() {
     PeerConnectionParameters peerConnectionParameters =
         new PeerConnectionParameters(false, /* videoCallEnabled */
             true, /* loopback */
             false, /* tracing */
             // Video codec parameters.
+            true, /* useCamera2 */
             0, /* videoWidth */
             0, /* videoHeight */
             0, /* videoFps */
             0, /* videoStartBitrate */
             "", /* videoCodec */
             true, /* videoCodecHwAcceleration */
+            false, /* captureToToTexture */
             // Audio codec parameters.
             0, /* audioStartBitrate */
             "OPUS", /* audioCodec */
             false, /* noAudioProcessing */
             false, /* aecDump */
             false /* useOpenSLES */, false /* disableBuiltInAEC */, false /* disableBuiltInAGC */,
             false /* disableBuiltInNS */, false /* enableLevelControl */);
-
     return peerConnectionParameters;
   }
 
-  private VideoCapturer createCameraCapturer(boolean captureToTexture) {
+  private PeerConnectionParameters createParametersForVideoCall(
+      String videoCodec, boolean captureToTexture) {
     final boolean useCamera2 =
         captureToTexture && Camera2Enumerator.isSupported(getInstrumentation().getTargetContext());
 
-    CameraEnumerator enumerator;
-    if (useCamera2) {
-      enumerator = new Camera2Enumerator(getInstrumentation().getTargetContext());
-    } else {
-      enumerator = new Camera1Enumerator(captureToTexture);
-    }
-    String deviceName = enumerator.getDeviceNames()[0];
-    return enumerator.createCapturer(deviceName, null);
-  }
-
-  private PeerConnectionParameters createParametersForVideoCall(String videoCodec) {
     PeerConnectionParameters peerConnectionParameters =
         new PeerConnectionParameters(true, /* videoCallEnabled */
             true, /* loopback */
             false, /* tracing */
             // Video codec parameters.
+            useCamera2, /* useCamera2 */
             0, /* videoWidth */
             0, /* videoHeight */
             0, /* videoFps */
             0, /* videoStartBitrate */
             videoCodec, /* videoCodec */
             true, /* videoCodecHwAcceleration */
+            captureToTexture, /* captureToToTexture */
             // Audio codec parameters.
             0, /* audioStartBitrate */
             "OPUS", /* audioCodec */
             false, /* noAudioProcessing */
             false, /* aecDump */
             false /* useOpenSLES */, false /* disableBuiltInAEC */, false /* disableBuiltInAGC */,
             false /* disableBuiltInNS */, false /* enableLevelControl */);
-
     return peerConnectionParameters;
   }
 
   @Override
   public void setUp() {
     signalingExecutor = Executors.newSingleThreadExecutor();
     if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
       eglBase = EglBase.create();
     }
   }
 
   @Override
   public void tearDown() {
     signalingExecutor.shutdown();
     if (eglBase != null) {
       eglBase.release();
     }
   }
 
   @SmallTest
   public void testSetLocalOfferMakesVideoFlowLocally() throws InterruptedException {
     Log.d(TAG, "testSetLocalOfferMakesVideoFlowLocally");
     MockRenderer localRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME);
     pcClient = createPeerConnectionClient(localRenderer, new MockRenderer(0, null),
-        createParametersForVideoCall(VIDEO_CODEC_VP8),
-        createCameraCapturer(false /* captureToTexture */), null);
+        createParametersForVideoCall(VIDEO_CODEC_VP8, false), null);
 
     // Wait for local SDP and ice candidates set events.
     assertTrue("Local SDP was not set.", waitForLocalSDP(WAIT_TIMEOUT));
     assertTrue("ICE candidates were not generated.", waitForIceCandidates(WAIT_TIMEOUT));
 
     // Check that local video frames were rendered.
     assertTrue(
         "Local video frames were not rendered.", localRenderer.waitForFramesRendered(WAIT_TIMEOUT));
 
     pcClient.close();
     assertTrue(
         "PeerConnection close event was not received.", waitForPeerConnectionClosed(WAIT_TIMEOUT));
     Log.d(TAG, "testSetLocalOfferMakesVideoFlowLocally Done.");
   }
 
-  private void doLoopbackTest(PeerConnectionParameters parameters, VideoCapturer videoCapturer,
-      boolean decodeToTexture) throws InterruptedException {
+  private void doLoopbackTest(PeerConnectionParameters parameters, boolean decodeToTexure)
+      throws InterruptedException {
     loopback = true;
     MockRenderer localRenderer = null;
     MockRenderer remoteRenderer = null;
     if (parameters.videoCallEnabled) {
       Log.d(TAG, "testLoopback for video " + parameters.videoCodec);
       localRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME);
       remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME);
     } else {
       Log.d(TAG, "testLoopback for audio.");
     }
-    pcClient = createPeerConnectionClient(localRenderer, remoteRenderer, parameters, videoCapturer,
-        decodeToTexture ? eglBase.getEglBaseContext() : null);
+    pcClient = createPeerConnectionClient(localRenderer, remoteRenderer, parameters,
+        decodeToTexure ? eglBase.getEglBaseContext() : null);
 
     // Wait for local SDP, rename it to answer and set as remote SDP.
     assertTrue("Local SDP was not set.", waitForLocalSDP(WAIT_TIMEOUT));
     SessionDescription remoteSdp = new SessionDescription(
         SessionDescription.Type.fromCanonicalForm("answer"), localSdp.description);
     pcClient.setRemoteDescription(remoteSdp);
 
     // Wait for ICE connection.
     assertTrue("ICE connection failure.", waitForIceConnected(ICE_CONNECTION_WAIT_TIMEOUT));
 
     if (parameters.videoCallEnabled) {
       // Check that local and remote video frames were rendered.
       assertTrue("Local video frames were not rendered.",
           localRenderer.waitForFramesRendered(WAIT_TIMEOUT));
       assertTrue("Remote video frames were not rendered.",
           remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT));
     } else {
       // For audio just sleep for 1 sec.
       // TODO(glaznev): check how we can detect that remote audio was rendered.
       Thread.sleep(AUDIO_RUN_TIMEOUT);
     }
 
     pcClient.close();
     assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT));
     Log.d(TAG, "testLoopback done.");
   }
 
   @SmallTest
   public void testLoopbackAudio() throws InterruptedException {
-    doLoopbackTest(createParametersForAudioCall(), null, false /* decodeToTexture */);
+    doLoopbackTest(createParametersForAudioCall(), false);
   }
 
   @SmallTest
   public void testLoopbackVp8() throws InterruptedException {
-    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_VP8),
-        createCameraCapturer(false /* captureToTexture */), false /* decodeToTexture */);
+    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_VP8, false), false);
   }
 
   @SmallTest
   public void testLoopbackVp9() throws InterruptedException {
-    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_VP9),
-        createCameraCapturer(false /* captureToTexture */), false /* decodeToTexture */);
+    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_VP9, false), false);
   }
 
   @SmallTest
   public void testLoopbackH264() throws InterruptedException {
-    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_H264),
-        createCameraCapturer(false /* captureToTexture */), false /* decodeToTexture */);
+    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_H264, false), false);
   }
 
   @SmallTest
   public void testLoopbackVp8DecodeToTexture() throws InterruptedException {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
       Log.i(TAG, "Decode to textures is not supported, requires SDK version 19.");
       return;
     }
-    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_VP8),
-        createCameraCapturer(false /* captureToTexture */), true /* decodeToTexture */);
+    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_VP8, false), true);
   }
 
   @SmallTest
   public void testLoopbackVp9DecodeToTexture() throws InterruptedException {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
       Log.i(TAG, "Decode to textures is not supported, requires SDK version 19.");
       return;
     }
-    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_VP9),
-        createCameraCapturer(false /* captureToTexture */), true /* decodeToTexture */);
+    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_VP9, false), true);
   }
 
   @SmallTest
   public void testLoopbackH264DecodeToTexture() throws InterruptedException {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
       Log.i(TAG, "Decode to textures is not supported, requires SDK version 19.");
       return;
     }
-    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_H264),
-        createCameraCapturer(false /* captureToTexture */), true /* decodeToTexture */);
+    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_H264, false), true);
   }
 
   @SmallTest
   public void testLoopbackVp8CaptureToTexture() throws InterruptedException {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
       Log.i(TAG, "Encode to textures is not supported. Requires SDK version 19");
       return;
     }
     // TODO(perkj): If we can always capture to textures, there is no need to check if the
     // hardware encoder supports to encode from a texture.
     if (!MediaCodecVideoEncoder.isVp8HwSupportedUsingTextures()) {
       Log.i(TAG, "VP8 encode to textures is not supported.");
       return;
     }
-    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_VP8),
-        createCameraCapturer(true /* captureToTexture */), true /* decodeToTexture */);
+    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_VP8, true), true);
   }
 
   // Test that a call can be setup even if the EGL context used during initialization is
   // released before the Video codecs are created. The HW encoder and decoder is setup to use
   // textures.
   @SmallTest
   public void testLoopbackEglContextReleasedAfterCreatingPc() throws InterruptedException {
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
       Log.i(TAG, "Decode to textures is not supported. Requires SDK version 19");
       return;
     }
 
     loopback = true;
-    PeerConnectionParameters parameters = createParametersForVideoCall(VIDEO_CODEC_VP8);
+    PeerConnectionParameters parameters = createParametersForVideoCall(VIDEO_CODEC_VP8, true);
     MockRenderer localRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME);
     MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME);
-    pcClient = createPeerConnectionClient(localRenderer, remoteRenderer, parameters,
-        createCameraCapturer(true /* captureToTexture */), eglBase.getEglBaseContext());
+    pcClient = createPeerConnectionClient(
+        localRenderer, remoteRenderer, parameters, eglBase.getEglBaseContext());
 
     // Wait for local SDP, rename it to answer and set as remote SDP.
     assertTrue("Local SDP was not set.", waitForLocalSDP(WAIT_TIMEOUT));
 
     // Release the EGL context used for creating the PeerConnectionClient.
     // Since createPeerConnectionClient is asynchronous, we must wait for the local
     // SessionDescription.
     eglBase.release();
     eglBase = null;
 
@@ skipping 19 matching lines @@
     if (Build.VERSION.SDK_INT < Build.VERSION_CODES.KITKAT) {
       Log.i(TAG, "Encode to textures is not supported. Requires KITKAT");
       return;
     }
     // TODO(perkj): If we can always capture to textures, there is no need to check if the
     // hardware encoder supports to encode from a texture.
     if (!MediaCodecVideoEncoder.isH264HwSupportedUsingTextures()) {
       Log.i(TAG, "H264 encode to textures is not supported.");
       return;
     }
-    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_H264),
-        createCameraCapturer(true /* captureToTexture */), true /* decodeToTexture */);
+    doLoopbackTest(createParametersForVideoCall(VIDEO_CODEC_H264, true), true);
   }
 
   // Checks if default front camera can be switched to back camera and then
   // again to front camera.
   @SmallTest
   public void testCameraSwitch() throws InterruptedException {
     Log.d(TAG, "testCameraSwitch");
     loopback = true;
 
     MockRenderer localRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME);
     MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME);
 
-    pcClient = createPeerConnectionClient(localRenderer, remoteRenderer,
-        createParametersForVideoCall(VIDEO_CODEC_VP8),
-        createCameraCapturer(false /* captureToTexture */), null);
+    pcClient = createPeerConnectionClient(
+        localRenderer, remoteRenderer, createParametersForVideoCall(VIDEO_CODEC_VP8, false), null);
 
     // Wait for local SDP, rename it to answer and set as remote SDP.
     assertTrue("Local SDP was not set.", waitForLocalSDP(WAIT_TIMEOUT));
     SessionDescription remoteSdp = new SessionDescription(
         SessionDescription.Type.fromCanonicalForm("answer"), localSdp.description);
     pcClient.setRemoteDescription(remoteSdp);
 
     // Wait for ICE connection.
     assertTrue("ICE connection failure.", waitForIceConnected(ICE_CONNECTION_WAIT_TIMEOUT));
 
@@ skipping 26 matching lines @@
   // Disabled because of https://bugs.chromium.org/p/webrtc/issues/detail?id=6478
   @FlakyTest
   //@SmallTest
   public void testVideoSourceRestart() throws InterruptedException {
     Log.d(TAG, "testVideoSourceRestart");
     loopback = true;
 
     MockRenderer localRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME);
     MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME);
 
-    pcClient = createPeerConnectionClient(localRenderer, remoteRenderer,
-        createParametersForVideoCall(VIDEO_CODEC_VP8),
-        createCameraCapturer(false /* captureToTexture */), null);
+    pcClient = createPeerConnectionClient(
+        localRenderer, remoteRenderer, createParametersForVideoCall(VIDEO_CODEC_VP8, false), null);
 
     // Wait for local SDP, rename it to answer and set as remote SDP.
     assertTrue("Local SDP was not set.", waitForLocalSDP(WAIT_TIMEOUT));
     SessionDescription remoteSdp = new SessionDescription(
         SessionDescription.Type.fromCanonicalForm("answer"), localSdp.description);
     pcClient.setRemoteDescription(remoteSdp);
 
     // Wait for ICE connection.
     assertTrue("ICE connection failure.", waitForIceConnected(ICE_CONNECTION_WAIT_TIMEOUT));
 
@@ skipping 27 matching lines @@
   // Disabled because of https://bugs.chromium.org/p/webrtc/issues/detail?id=6478
   @FlakyTest
   //@SmallTest
   public void testCaptureFormatChange() throws InterruptedException {
     Log.d(TAG, "testCaptureFormatChange");
     loopback = true;
 
     MockRenderer localRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, LOCAL_RENDERER_NAME);
     MockRenderer remoteRenderer = new MockRenderer(EXPECTED_VIDEO_FRAMES, REMOTE_RENDERER_NAME);
 
-    pcClient = createPeerConnectionClient(localRenderer, remoteRenderer,
-        createParametersForVideoCall(VIDEO_CODEC_VP8),
-        createCameraCapturer(false /* captureToTexture */), null);
+    pcClient = createPeerConnectionClient(
+        localRenderer, remoteRenderer, createParametersForVideoCall(VIDEO_CODEC_VP8, false), null);
 
     // Wait for local SDP, rename it to answer and set as remote SDP.
     assertTrue("Local SDP was not set.", waitForLocalSDP(WAIT_TIMEOUT));
     SessionDescription remoteSdp = new SessionDescription(
         SessionDescription.Type.fromCanonicalForm("answer"), localSdp.description);
     pcClient.setRemoteDescription(remoteSdp);
 
     // Wait for ICE connection.
     assertTrue("ICE connection failure.", waitForIceConnected(ICE_CONNECTION_WAIT_TIMEOUT));
 
@@ skipping 19 matching lines @@
           localRenderer.waitForFramesRendered(WAIT_TIMEOUT));
       assertTrue("Remote video frames were not rendered after capture format change.",
           remoteRenderer.waitForFramesRendered(WAIT_TIMEOUT));
     }
 
     pcClient.close();
     assertTrue(waitForPeerConnectionClosed(WAIT_TIMEOUT));
     Log.d(TAG, "testCaptureFormatChange done.");
   }
 }