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

Android: Move EglBase10/EglBase14 from to API to src

Browse Source 
BUG=webrtc:7172

Review-Url: https://codereview.webrtc.org/2831603002
Cr-Commit-Position: refs/heads/master@{#17864}
This commit is contained in:
magjed
2017-04-25 05:32:07 -07:00
committed by Commit bot
parent e0629c045e
commit 82de179f7d
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
webrtc/sdk/android/BUILD.gn
View File

@ -157,8 +157,6 @@ android_library("libjingle_peerconnection_java") {
"api/org/webrtc/DataChannel.java", "api/org/webrtc/DataChannel.java",
"api/org/webrtc/DtmfSender.java", "api/org/webrtc/DtmfSender.java",
"api/org/webrtc/EglBase.java", "api/org/webrtc/EglBase.java",
"api/org/webrtc/EglBase10.java",
"api/org/webrtc/EglBase14.java",
"api/org/webrtc/EglRenderer.java", "api/org/webrtc/EglRenderer.java",
"api/org/webrtc/FileVideoCapturer.java", "api/org/webrtc/FileVideoCapturer.java",
"api/org/webrtc/GlRectDrawer.java", "api/org/webrtc/GlRectDrawer.java",
@ -200,6 +198,8 @@ android_library("libjingle_peerconnection_java") {
"src/java/org/webrtc/Camera2Session.java", "src/java/org/webrtc/Camera2Session.java",
"src/java/org/webrtc/CameraCapturer.java", "src/java/org/webrtc/CameraCapturer.java",
"src/java/org/webrtc/CameraSession.java", "src/java/org/webrtc/CameraSession.java",
"src/java/org/webrtc/EglBase10.java",
"src/java/org/webrtc/EglBase14.java",
"src/java/org/webrtc/Histogram.java", "src/java/org/webrtc/Histogram.java",
"src/java/org/webrtc/YuvConverter.java", "src/java/org/webrtc/YuvConverter.java",
] ]

2
webrtc/sdk/android/api/org/webrtc/EglBase10.java → webrtc/sdk/android/src/java/org/webrtc/EglBase10.java
View File

@ -26,7 +26,7 @@ import javax.microedition.khronos.egl.EGLSurface;
* Holds EGL state and utility methods for handling an egl 1.0 EGLContext, an EGLDisplay, * Holds EGL state and utility methods for handling an egl 1.0 EGLContext, an EGLDisplay,
* and an EGLSurface. * and an EGLSurface.
*/ */
public final class EglBase10 extends EglBase { class EglBase10 extends EglBase {
// This constant is taken from EGL14.EGL_CONTEXT_CLIENT_VERSION. // This constant is taken from EGL14.EGL_CONTEXT_CLIENT_VERSION.
private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098; private static final int EGL_CONTEXT_CLIENT_VERSION = 0x3098;

7
webrtc/sdk/android/api/org/webrtc/EglBase14.java → webrtc/sdk/android/src/java/org/webrtc/EglBase14.java
View File

@ -25,7 +25,7 @@ import android.view.Surface;
* and an EGLSurface. * and an EGLSurface.
*/ */
@TargetApi(18) @TargetApi(18)
public final class EglBase14 extends EglBase { class EglBase14 extends EglBase {
private static final String TAG = "EglBase14"; private static final String TAG = "EglBase14";
private static final int EGLExt_SDK_VERSION = android.os.Build.VERSION_CODES.JELLY_BEAN_MR2; private static final int EGLExt_SDK_VERSION = android.os.Build.VERSION_CODES.JELLY_BEAN_MR2;
private static final int CURRENT_SDK_VERSION = android.os.Build.VERSION.SDK_INT; private static final int CURRENT_SDK_VERSION = android.os.Build.VERSION.SDK_INT;
@ -37,8 +37,9 @@ public final class EglBase14 extends EglBase {
// EGL 1.4 is supported from API 17. But EGLExt that is used for setting presentation // EGL 1.4 is supported from API 17. But EGLExt that is used for setting presentation
// time stamp on a surface is supported from 18 so we require 18. // time stamp on a surface is supported from 18 so we require 18.
public static boolean isEGL14Supported() { public static boolean isEGL14Supported() {
Logging.d(TAG, "SDK version: " + CURRENT_SDK_VERSION + ". isEGL14Supported: " Logging.d(TAG,
+ (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION)); "SDK version: " + CURRENT_SDK_VERSION
+ ". isEGL14Supported: " + (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION));
return (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION); return (CURRENT_SDK_VERSION >= EGLExt_SDK_VERSION);
} }