From ca77d598857d2ce657575a02d048eee4d296ca7a Mon Sep 17 00:00:00 2001
From: Pierre-Eric Pelloux-Prayer <pierre-eric.pelloux-prayer@linphone.org>
Date: Fri, 7 Oct 2011 12:02:15 +0200
Subject: [PATCH] video: avoid dead-lock on video call end

---
 src/org/linphone/VideoCallActivity.java | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/org/linphone/VideoCallActivity.java b/src/org/linphone/VideoCallActivity.java
index 9c741cb56..0a6487e09 100755
--- a/src/org/linphone/VideoCallActivity.java
+++ b/src/org/linphone/VideoCallActivity.java
@@ -23,12 +23,9 @@ package org.linphone;
 import org.linphone.core.LinphoneCall;
 import org.linphone.core.Log;
 import org.linphone.mediastream.video.AndroidVideoWindowImpl;
-import org.linphone.mediastream.video.capture.AndroidVideoApi5JniWrapper;
 import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
 
 import android.content.Context;
-import android.hardware.Camera;
-import android.hardware.Camera.CameraInfo;
 import android.opengl.GLSurfaceView;
 import android.os.Bundle;
 import android.os.Handler;
@@ -40,7 +37,6 @@ import android.view.MenuItem;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.View;
-import android.view.View.OnClickListener;
 import android.widget.ImageView;
 
 /**
@@ -278,7 +274,13 @@ public class VideoCallActivity extends SoftVolumeActivity {
 	protected void onPause() {
 		Log.d("onPause VideoCallActivity");
 		launched=false;
-		LinphoneManager.getLc().setVideoWindow(null);
+		synchronized (androidVideoWindowImpl) {
+			/* this call will destroy native opengl renderer
+			 * which is used by androidVideoWindowImpl
+			 */
+			LinphoneManager.getLc().setVideoWindow(null);
+		}
+		
 		LinphoneManager.getLc().setPreviewWindow(null);
 		
 		if (!isFinishing() && LinphoneManager.getLc().isIncall()) {