zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Deprecate PeerConnectionFactory#createVideoSource(VideoCapturer).

Browse Source 
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}
This commit is contained in:
Sami Kalliomäki
2018-07-05 17:06:51 +02:00
committed by Commit Bot
parent 80e7a7fd1a
commit 05b552f76a
7 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sdk/android/api/org/webrtc/VideoCapturer.java
View File

@ -16,6 +16,7 @@ import java.util.List;
// 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 @@ public interface VideoCapturer {
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 @@ public interface VideoCapturer {
* 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