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 ed6e8dd2d62a19bab45c7338094cd39a73db0503..9ca7a9e66fb804395ea334a67068b4c3cc203b22 100644 |
--- a/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java |
+++ b/talk/app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java |
@@ -153,7 +153,7 @@ public class SurfaceViewRenderer extends SurfaceView |
* reinitialize the renderer after a previous init()/release() cycle. |
*/ |
public void init( |
- EGLContext sharedContext, RendererCommon.RendererEvents rendererEvents) { |
+ EglBase.Context sharedContext, RendererCommon.RendererEvents rendererEvents) { |
synchronized (handlerLock) { |
if (renderThreadHandler != null) { |
throw new IllegalStateException(getResourceName() + "Already initialized"); |
@@ -163,12 +163,19 @@ public class SurfaceViewRenderer extends SurfaceView |
renderThread = new HandlerThread(TAG); |
renderThread.start(); |
drawer = new GlRectDrawer(); |
- eglBase = new EglBase(sharedContext, EglBase.ConfigType.PLAIN); |
+ eglBase = EglBase.create(sharedContext, EglBase.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 EglBase.Context(sharedContext) : null, rendererEvents); |
+ } |
+ |
/** |
* Create and make an EGLSurface current if both init() and surfaceCreated() have been called. |
*/ |
@@ -560,7 +567,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."); |
} |