commit 05b552f76ab6117359d46b87e52d9957f171f76c
author Sami Kalliomäki <sakal@webrtc.org> Thu Jul 05 17:06:51 2018 +0200
committer Commit Bot <commit-bot@chromium.org> Fri Jul 06 10:35:46 2018 +0000
tree 0827770efca8229e0367a7f5bf635f3de28cc736
parent 80e7a7fd1a0e1ea82c79b864e7b31253f3d5bc41

Deprecate PeerConnectionFactory#createVideoSource(VideoCapturer).

This is done in preparation of moving VideoCapturer out of
video_api_java. Clients should update to using
createVideoSource(boolean).

CapturerObserver is moved to a separate file because it needs to stay
in video_api_java to allow VideoSource to depend on it.

Bug: webrtc:9496
Change-Id: I3c93f6bc4df553919dcbe05b00ef4c68f2c9ab60
Reviewed-on: https://webrtc-review.googlesource.com/87305
Reviewed-by: Magnus Jedvert <magjed@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#23868}

sdk/android/api/org/webrtc/VideoCapturer.java

diff --git a/sdk/android/api/org/webrtc/VideoCapturer.java b/sdk/android/api/org/webrtc/VideoCapturer.java
index 99a0729..8292fbd 100644
--- a/sdk/android/api/org/webrtc/VideoCapturer.java
+++ b/sdk/android/api/org/webrtc/VideoCapturer.java
@@ -16,6 +16,7 @@
 // Base interface for all VideoCapturers to implement.
 public interface VideoCapturer {
   // Interface used for providing callbacks to an observer.
+  @Deprecated
   public interface CapturerObserver {
     // Notify if the camera have been started successfully or not.
     // Called on a Java thread owned by VideoCapturer.
@@ -26,6 +27,13 @@
     void onFrameCaptured(VideoFrame frame);
   }
 
+  /** Deprecated, implementations should be update to implement the version below. */
+  @Deprecated
+  default void initialize(SurfaceTextureHelper surfaceTextureHelper, Context applicationContext,
+      CapturerObserver capturerObserver) {
+    throw new UnsupportedOperationException("Not implemented.");
+  }
+
   /**
    * This function is used to initialize the camera thread, the android application context, and the
    * capture observer. It will be called only once and before any startCapture() request. The
@@ -37,8 +45,12 @@
    * called. This also means that the caller can reuse the SurfaceTextureHelper to initialize a new
    * VideoCapturer once the previous VideoCapturer has been disposed.
    */
-  void initialize(SurfaceTextureHelper surfaceTextureHelper, Context applicationContext,
-      CapturerObserver capturerObserver);
+  // Our version of clang format doesn't understand default and messes up.
+  // clang-format off
+  default void initialize(SurfaceTextureHelper surfaceTextureHelper, Context applicationContext,
+      org.webrtc.CapturerObserver capturerObserver) {
+    initialize(surfaceTextureHelper, applicationContext, (CapturerObserver) capturerObserver);
+  }
 
   /**
    * Start capturing frames in a format that is as close as possible to {@code width x height} and