Index: talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java |
diff --git a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java |
index f45d53b2a1b57685ee390bed340474f8a5f96270..47058bbeab17c26ff4490404d67d91385a9842f1 100644 |
--- a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java |
+++ b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java |
@@ -65,7 +65,7 @@ public class SurfaceViewRenderer extends SurfaceView |
// EGL and GL resources for drawing YUV/OES textures. After initilization, these are only accessed |
// from the render thread. |
- private EglBase eglBase; |
+ private Egl eglBase; |
private GlRectDrawer drawer; |
// Texture ids for YUV frames. Allocated on first arrival of a YUV frame. |
private int[] yuvTextures = null; |
@@ -148,7 +148,7 @@ public class SurfaceViewRenderer extends SurfaceView |
* reinitialize the renderer after a previous init()/release() cycle. |
*/ |
public void init( |
- EGLContext sharedContext, RendererCommon.RendererEvents rendererEvents) { |
+ Egl.Context sharedContext, RendererCommon.RendererEvents rendererEvents) { |
synchronized (handlerLock) { |
if (renderThreadHandler != null) { |
throw new IllegalStateException(getResourceName() + "Already initialized"); |
@@ -158,12 +158,19 @@ public class SurfaceViewRenderer extends SurfaceView |
renderThread = new HandlerThread(TAG); |
renderThread.start(); |
drawer = new GlRectDrawer(); |
- eglBase = new EglBase(sharedContext, EglBase.ConfigType.PLAIN); |
+ eglBase = Egl.create(sharedContext, Egl.ConfigType.PLAIN); |
renderThreadHandler = new Handler(renderThread.getLooper()); |
} |
tryCreateEglSurface(); |
} |
+ @Deprecated |
+ // TODO(perkj): Remove when applications has been updated. |
+ public void init( |
+ EGLContext sharedContext, RendererCommon.RendererEvents rendererEvents) { |
+ init(sharedContext != null ? new EglBase10.Egl10Context(sharedContext) : null, rendererEvents); |
+ } |
+ |
/** |
* Create and make an EGLSurface current if both init() and surfaceCreated() have been called. |
*/ |
@@ -538,7 +545,7 @@ public class SurfaceViewRenderer extends SurfaceView |
if (framesReceived > 0 && framesRendered > 0) { |
final long timeSinceFirstFrameNs = System.nanoTime() - firstFrameTimeNs; |
Logging.d(TAG, getResourceName() + "Duration: " + (int) (timeSinceFirstFrameNs / 1e6) + |
- " ms. FPS: " + (float) framesRendered * 1e9 / timeSinceFirstFrameNs); |
+ " ms. FPS: " + framesRendered * 1e9 / timeSinceFirstFrameNs); |
Logging.d(TAG, getResourceName() + "Average render time: " |
+ (int) (renderTimeNs / (1000 * framesRendered)) + " us."); |
} |