| Index: talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
|
| diff --git a/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java b/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
|
| index adee98bb5be0f48799139123e8426d93fcb6f80d..5d186b82c4df3ba7f7b6f1b3df3d4b937c20cc6b 100644
|
| --- a/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
|
| +++ b/talk/app/webrtc/java/android/org/webrtc/VideoRendererGui.java
|
| @@ -89,25 +89,6 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
|
| yuvImageRenderers = new ArrayList<YuvImageRenderer>();
|
| }
|
|
|
| - public static synchronized void dispose() {
|
| - if (instance == null){
|
| - return;
|
| - }
|
| - synchronized (instance.yuvImageRenderers) {
|
| - for (YuvImageRenderer yuvImageRenderer : instance.yuvImageRenderers) {
|
| - yuvImageRenderer.release();
|
| - }
|
| - instance.yuvImageRenderers.clear();
|
| - if (instance.drawer != null) {
|
| - instance.drawer.release();
|
| - }
|
| - }
|
| - instance.surface = null;
|
| - instance.eglContext = null;
|
| - instance.eglContextReady = null;
|
| - instance = null;
|
| - }
|
| -
|
| /**
|
| * Class used to display stream of YUV420 frames at particular location
|
| * on a screen. New video frames are sent to display using renderFrame()
|
| @@ -468,6 +449,27 @@ public class VideoRendererGui implements GLSurfaceView.Renderer {
|
| return eglContext;
|
| }
|
|
|
| + /** Releases GLSurfaceView video renderer. */
|
| + public static synchronized void dispose() {
|
| + if (instance == null){
|
| + return;
|
| + }
|
| + Log.d(TAG, "VideoRendererGui.dispose");
|
| + synchronized (instance.yuvImageRenderers) {
|
| + for (YuvImageRenderer yuvImageRenderer : instance.yuvImageRenderers) {
|
| + yuvImageRenderer.release();
|
| + }
|
| + instance.yuvImageRenderers.clear();
|
| + if (instance.drawer != null) {
|
| + instance.drawer.release();
|
| + }
|
| + }
|
| + instance.surface = null;
|
| + eglContext = null;
|
| + eglContextReady = null;
|
| + instance = null;
|
| + }
|
| +
|
| /**
|
| * Creates VideoRenderer with top left corner at (x, y) and resolution
|
| * (width, height). All parameters are in percentage of screen resolution.
|
|
|