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

Document methods that are only supported on a specific Android version.

Browse Source 
R=phensman@webrtc.org

Bug: webrtc:9819
Change-Id: Ifd3da9e1b70d0cfc479777c3a8031f632296be38
Reviewed-on: https://webrtc-review.googlesource.com/c/103680
Reviewed-by: Paulina Hensman <phensman@webrtc.org>
Commit-Queue: Sami Kalliomäki <sakal@webrtc.org>
Cr-Commit-Position: refs/heads/master@{#24987}
This commit is contained in:
Sami Kalliomäki
2018-10-04 10:58:24 +02:00
committed by Commit Bot
parent dd8b0d896f
commit 8db246a6bb
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sdk/android/api/org/webrtc/EglBase.java
View File

@ -11,8 +11,8 @@
package org.webrtc; package org.webrtc;
import android.graphics.SurfaceTexture; import android.graphics.SurfaceTexture;
import javax.annotation.Nullable;
import android.view.Surface; import android.view.Surface;
import javax.annotation.Nullable;
import javax.microedition.khronos.egl.EGL10; import javax.microedition.khronos.egl.EGL10;
/** /**
@ -21,7 +21,15 @@ import javax.microedition.khronos.egl.EGL10;
*/ */
public interface EglBase { public interface EglBase {
// EGL wrapper for an actual EGLContext. // EGL wrapper for an actual EGLContext.
public interface Context { long getNativeEglContext(); } public interface Context {
/**
* Returns an EGL context that can be used by native code. Returns 0 if the method is
* unsupported.
*
* @note This is currently only supported for EGL 1.4 and not for EGL 1.0.
*/
long getNativeEglContext();
}
// According to the documentation, EGL can be used from multiple threads at the same time if each // According to the documentation, EGL can be used from multiple threads at the same time if each
// thread has its own EGLContext, but in practice it deadlocks on some devices when doing this. // thread has its own EGLContext, but in practice it deadlocks on some devices when doing this.

2
sdk/android/api/org/webrtc/ScreenCapturerAndroid.java
View File

@ -31,6 +31,8 @@ import javax.annotation.Nullable;
* place on the HandlerThread of the given {@code SurfaceTextureHelper}. When done with each frame, * place on the HandlerThread of the given {@code SurfaceTextureHelper}. When done with each frame,
* the native code returns the buffer to the {@code SurfaceTextureHelper} to be used for new * the native code returns the buffer to the {@code SurfaceTextureHelper} to be used for new
* frames. At any time, at most one frame is being processed. * frames. At any time, at most one frame is being processed.
*
* @note This class is only supported on Android Lollipop and above.
*/ */
@TargetApi(21) @TargetApi(21)
public class ScreenCapturerAndroid implements VideoCapturer, VideoSink { public class ScreenCapturerAndroid implements VideoCapturer, VideoSink {