Revert of Remove the old AndroidVideoCapturer stack code.

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

 /*
  *  Copyright 2013 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 93 matching lines @@
     PeerConnection.RTCConfiguration rtcConfig =
         new PeerConnection.RTCConfiguration(iceServers);
     return createPeerConnection(rtcConfig, constraints, observer);
   }
 
   public MediaStream createLocalMediaStream(String label) {
     return new MediaStream(
         nativeCreateLocalMediaStream(nativeFactory, label));
   }
 
+  // The VideoSource takes ownership of |capturer|, so capturer.dispose() should not be called
+  // manually after this. Video capturer is automatically started so there is no need to call
+  // startCapture after this method.
+  public VideoSource createVideoSource(
+      VideoCapturer capturer, MediaConstraints constraints) {
+    final EglBase.Context eglContext =
+        localEglbase == null ? null : localEglbase.getEglBaseContext();
+    return new VideoSource(nativeCreateVideoSource(nativeFactory,
+        eglContext, capturer, constraints));
+  }
+
   public VideoSource createVideoSource(VideoCapturer capturer) {
     final EglBase.Context eglContext =
         localEglbase == null ? null : localEglbase.getEglBaseContext();
-    long nativeAndroidVideoTrackSource = nativeCreateVideoSource(nativeFactory, eglContext);
+    long nativeAndroidVideoTrackSource = nativeCreateVideoSource2(nativeFactory, eglContext);
     VideoCapturer.CapturerObserver capturerObserver
         = new VideoCapturer.AndroidVideoTrackSourceObserver(nativeAndroidVideoTrackSource);
     nativeInitializeVideoCapturer(nativeFactory, capturer, nativeAndroidVideoTrackSource,
          capturerObserver);
     return new VideoSource(nativeAndroidVideoTrackSource);
   }
 
   public VideoTrack createVideoTrack(String id, VideoSource source) {
     return new VideoTrack(nativeCreateVideoTrack(
         nativeFactory, id, source.nativeSource));
@@ skipping 102 matching lines @@
       PeerConnection.Observer observer);
 
   private static native long nativeCreatePeerConnection(
       long nativeFactory, PeerConnection.RTCConfiguration rtcConfig,
       MediaConstraints constraints, long nativeObserver);
 
   private static native long nativeCreateLocalMediaStream(
       long nativeFactory, String label);
 
   private static native long nativeCreateVideoSource(
+      long nativeFactory, EglBase.Context eglContext, VideoCapturer videoCapturer,
+      MediaConstraints constraints);
+
+  private static native long nativeCreateVideoSource2(
       long nativeFactory, EglBase.Context eglContext);
 
   private static native void nativeInitializeVideoCapturer(
     long native_factory, VideoCapturer j_video_capturer, long native_source,
     VideoCapturer.CapturerObserver j_frame_observer);
 
   private static native long nativeCreateVideoTrack(
       long nativeFactory, String id, long nativeVideoSource);
 
   private static native long nativeCreateAudioSource(
@@ skipping 10 matching lines @@
   @Deprecated
   public native void nativeSetOptions(long nativeFactory, Options options);
 
   private static native void nativeSetVideoHwAccelerationOptions(
       long nativeFactory, Object localEGLContext, Object remoteEGLContext);
 
   private static native void nativeThreadsCallbacks(long nativeFactory);
 
   private static native void nativeFreeFactory(long nativeFactory);
 }