Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1243)

Unified Diff: talk/app/webrtc/java/android/org/webrtc/EglBase.java

Issue 1343163003: Partial revert of r9936. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: talk/app/webrtc/java/android/org/webrtc/EglBase.java
diff --git a/talk/app/webrtc/java/android/org/webrtc/EglBase.java b/talk/app/webrtc/java/android/org/webrtc/EglBase.java
index 2aa28074c5ee94cf0675f3d577d08c73b0494822..20af8ecc75587cd80dfc8dd7f152a326e0e0a86e 100644
--- a/talk/app/webrtc/java/android/org/webrtc/EglBase.java
+++ b/talk/app/webrtc/java/android/org/webrtc/EglBase.java
@@ -32,10 +32,9 @@ import android.opengl.EGLConfig;
import android.opengl.EGLContext;
import android.opengl.EGLDisplay;
import android.opengl.EGLSurface;
+import android.util.Log;
import android.view.Surface;
-import org.webrtc.Logging;
-
/**
* Holds EGL state and utility methods for handling an EGLContext, an EGLDisplay, and an EGLSurface.
*/
@@ -53,7 +52,7 @@ public final class EglBase {
private EGLSurface eglSurface = EGL14.EGL_NO_SURFACE;
public static boolean isEGL14Supported() {
- Logging.d(TAG, "SDK version: " + CURRENT_SDK_VERSION);
+ Log.d(TAG, "SDK version: " + CURRENT_SDK_VERSION);
return (CURRENT_SDK_VERSION >= EGL14_SDK_VERSION);
}
@@ -87,7 +86,7 @@ public final class EglBase {
public void createSurface(Surface surface) {
checkIsNotReleased();
if (configType == ConfigType.PIXEL_BUFFER) {
- Logging.w(TAG, "This EGL context is configured for PIXEL_BUFFER, but uses regular Surface");
+ Log.w(TAG, "This EGL context is configured for PIXEL_BUFFER, but uses regular Surface");
}
if (eglSurface != EGL14.EGL_NO_SURFACE) {
throw new RuntimeException("Already has an EGLSurface");
« no previous file with comments | « talk/app/webrtc/java/android/org/webrtc/CameraEnumerator.java ('k') | talk/app/webrtc/java/android/org/webrtc/GlShader.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698