Difuse/difuse-phone-android
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fixes required for old video display

Browse source
This commit is contained in:
Sylvain Berfini 2016-03-01 16:23:07 +01:00
parent 6ee77c8bb4
commit 4154a5f348
1 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/org/linphone/CallVideoFragment.java
View file

@ -27,7 +27,7 @@ import org.linphone.mediastream.video.AndroidVideoWindowImpl;
import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration; import org.linphone.mediastream.video.capture.hwconf.AndroidCameraConfiguration;
import android.app.Activity; import android.app.Activity;
import android.opengl.GLSurfaceView; //import android.opengl.GLSurfaceView;
import android.os.Bundle; import android.os.Bundle;
import android.app.Fragment; import android.app.Fragment;
import android.view.GestureDetector; import android.view.GestureDetector;
@ -68,15 +68,12 @@ public class CallVideoFragment extends Fragment implements OnGestureListener, On
androidVideoWindowImpl = new AndroidVideoWindowImpl(mVideoView, mCaptureView, new AndroidVideoWindowImpl.VideoWindowListener() { androidVideoWindowImpl = new AndroidVideoWindowImpl(mVideoView, mCaptureView, new AndroidVideoWindowImpl.VideoWindowListener() {
public void onVideoRenderingSurfaceReady(AndroidVideoWindowImpl vw, SurfaceView surface) { public void onVideoRenderingSurfaceReady(AndroidVideoWindowImpl vw, SurfaceView surface) {
LinphoneManager.getLc().setVideoWindow(vw);
mVideoView = surface; mVideoView = surface;
LinphoneManager.getLc().setVideoWindow(vw);
} }
public void onVideoRenderingSurfaceDestroyed(AndroidVideoWindowImpl vw) { public void onVideoRenderingSurfaceDestroyed(AndroidVideoWindowImpl vw) {
LinphoneCore lc = LinphoneManager.getLc();
if (lc != null) {
lc.setVideoWindow(null);
}
} }
public void onVideoPreviewSurfaceReady(AndroidVideoWindowImpl vw, SurfaceView surface) { public void onVideoPreviewSurfaceReady(AndroidVideoWindowImpl vw, SurfaceView surface) {
@ -85,8 +82,7 @@ public class CallVideoFragment extends Fragment implements OnGestureListener, On
} }
public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) { public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) {
// Remove references kept in jni code and restart camera
LinphoneManager.getLc().setPreviewWindow(null);
} }
}); });
@ -134,10 +130,6 @@ public class CallVideoFragment extends Fragment implements OnGestureListener, On
public void onResume() { public void onResume() {
super.onResume(); super.onResume();
if (mVideoView != null) {
((GLSurfaceView) mVideoView).onResume();
}
if (androidVideoWindowImpl != null) { if (androidVideoWindowImpl != null) {
synchronized (androidVideoWindowImpl) { synchronized (androidVideoWindowImpl) {
LinphoneManager.getLc().setVideoWindow(androidVideoWindowImpl); LinphoneManager.getLc().setVideoWindow(androidVideoWindowImpl);
@ -160,10 +152,6 @@ public class CallVideoFragment extends Fragment implements OnGestureListener, On
} }
} }
if (mVideoView != null) {
((GLSurfaceView) mVideoView).onPause();
}
super.onPause(); super.onPause();
} }