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

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

Issue 1312523004: Fix AppRTCDemo crash when room is connected after PC is destroyed. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc@master
Patch Set: Created 5 years, 4 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
« no previous file with comments | « no previous file | webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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.
« no previous file with comments | « no previous file | webrtc/examples/androidapp/src/org/appspot/apprtc/CallActivity.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698