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

Move VideoCapturer to video_api and cleanup.

Browse Source 
This should only be landed after clients have been given time to
upgrade to the new interface.

Bug: webrtc:9496, webrtc:9181
Change-Id: Ideb37637d9f0b9a3a9748811879c263c64f81d11
Reviewed-on: https://webrtc-review.googlesource.com/87308
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24080}
This commit is contained in:
Sami Kalliomäki
2018-07-24 10:53:28 +02:00
committed by Commit Bot
parent 213618e37e
commit 903bd4145f
7 changed files with 25 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,25 +15,6 @@ 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.
void onCapturerStarted(boolean success);
void onCapturerStopped();
// Delivers a captured frame. Called on a Java thread owned by 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
@ -45,12 +26,8 @@ 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.
*/
// 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);
}
void initialize(SurfaceTextureHelper surfaceTextureHelper, Context applicationContext,
CapturerObserver capturerObserver);
/**
* Start capturing frames in a format that is as close as possible to {@code width x height} and