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

video: improved video call handling

Browse source
This commit is contained in:
Pierre-Eric Pelloux-Prayer 2011-09-23 11:12:26 +02:00
parent d25cee417d
commit 4bf7198cc0
4 changed files with 113 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
res/layout-land/videocall.xml
View file

@ -1,11 +1,29 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/video_frame" android:orientation="vertical" android:id="@+id/video_frame" android:orientation="vertical"
android:layout_height="fill_parent" android:layout_width="fill_parent"> android:layout_height="fill_parent" android:layout_width="fill_parent">
<org.linphone.mediastream.video.display.GL2JNIView android:layout_height="fill_parent" android:layout_width="fill_parent" android:id="@+id/video_surface"></org.linphone.mediastream.video.display.GL2JNIView> <org.linphone.mediastream.video.display.GL2JNIView android:layout_height="fill_parent" android:layout_width="fill_parent" android:id="@+id/video_surface"></org.linphone.mediastream.video.display.GL2JNIView>
<SurfaceView android:layout_height="72dip" android:layout_width="88dip" android:id="@+id/video_capture_surface" android:layout_gravity="right|bottom" <SurfaceView
android:layout_margin="15dip"></SurfaceView> android:layout_height="72dip"
</FrameLayout> android:layout_width="88dip"
android:id="@+id/video_capture_surface"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_marginTop="15dip"
android:layout_marginRight="15dip" >
</SurfaceView>
<ImageView
android:layout_width="88dip"
android:layout_height="72dip"
android:id="@+id/imageView1"
android:src="@drawable/mic_muted"
android:layout_alignParentTop="true"
android:layout_alignParentRight="true"
android:layout_marginTop="15dip"
android:layout_marginRight="15dip" >
</ImageView>
</RelativeLayout>

30
res/layout/videocall.xml
View file

@ -1,10 +1,30 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<FrameLayout <RelativeLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/video_frame" android:id="@+id/video_frame"
android:layout_height="fill_parent" android:layout_width="fill_parent"> android:layout_height="fill_parent" android:layout_width="fill_parent">
<org.linphone.mediastream.video.display.GL2JNIView android:layout_height="fill_parent" android:layout_width="fill_parent" android:id="@+id/video_surface"></org.linphone.mediastream.video.display.GL2JNIView> <org.linphone.mediastream.video.display.GL2JNIView android:visibility="visible" android:layout_height="fill_parent" android:layout_width="fill_parent" android:id="@+id/video_surface"></org.linphone.mediastream.video.display.GL2JNIView>
<SurfaceView android:layout_height="88dip" android:layout_width="72dip" android:id="@+id/video_capture_surface" android:layout_gravity="right|bottom" <SurfaceView
android:layout_margin="15dip"></SurfaceView> android:layout_height="88dip"
</FrameLayout> android:layout_width="72dip"
android:id="@+id/video_capture_surface"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="15dip"
android:layout_marginRight="15dip" >
</SurfaceView>
<ImageView
android:layout_width="72dip"
android:layout_height="88dip"
android:id="@+id/imageView1"
android:src="@drawable/mic_muted"
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="15dip"
android:layout_marginRight="15dip" >
</ImageView>
</RelativeLayout>

7
src/org/linphone/LinphoneManager.java
View file

@ -301,10 +301,13 @@ public final class LinphoneManager implements LinphoneCoreListener {
public void onAlreadyInCall(); public void onAlreadyInCall();
} }
public void toggleEnableCamera() { public boolean toggleEnableCamera() {
if (mLc.isIncall()) { if (mLc.isIncall()) {
mLc.getCurrentCall().enableCamera(!mLc.getCurrentCall().cameraEnabled()); boolean enabled = !mLc.getCurrentCall().cameraEnabled();
mLc.getCurrentCall().enableCamera(enabled);
return enabled;
} }
return false;
} }
public void sendStaticImage(boolean send) { public void sendStaticImage(boolean send) {

85
src/org/linphone/VideoCallActivity.java
View file

@ -20,8 +20,6 @@ package org.linphone;
import junit.runner.Version;
import org.linphone.core.LinphoneCall; import org.linphone.core.LinphoneCall;
import org.linphone.core.Log; import org.linphone.core.Log;
import org.linphone.mediastream.video.AndroidVideoWindowImpl; import org.linphone.mediastream.video.AndroidVideoWindowImpl;
@ -37,6 +35,8 @@ import android.view.MenuInflater;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.SurfaceHolder; import android.view.SurfaceHolder;
import android.view.SurfaceView; import android.view.SurfaceView;
import android.view.View;
import android.widget.FrameLayout;
/** /**
* For Android SDK >= 5 * For Android SDK >= 5
@ -44,8 +44,8 @@ import android.view.SurfaceView;
* *
*/ */
public class VideoCallActivity extends SoftVolumeActivity { public class VideoCallActivity extends SoftVolumeActivity {
private SurfaceView mVideoView; private SurfaceView mVideoViewReady;
private SurfaceView mVideoCaptureView; private SurfaceView mVideoCaptureViewReady;
public static boolean launched = false; public static boolean launched = false;
private WakeLock mWakeLock; private WakeLock mWakeLock;
@ -57,21 +57,24 @@ public class VideoCallActivity extends SoftVolumeActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.videocall); setContentView(R.layout.videocall);
mVideoView = (SurfaceView) findViewById(R.id.video_surface); SurfaceView videoView = (SurfaceView) findViewById(R.id.video_surface);
mVideoCaptureView = (SurfaceView) findViewById(R.id.video_capture_surface); //((FrameLayout) findViewById(R.id.video_frame)).bringChildToFront(findViewById(R.id.imageView1));
mVideoCaptureView.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
SurfaceView captureView = (SurfaceView) findViewById(R.id.video_capture_surface);
captureView.getHolder().setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
/* force surfaces Z ordering */ /* force surfaces Z ordering */
if (org.linphone.mediastream.Version.sdkAboveOrEqual(5)) { if (org.linphone.mediastream.Version.sdkAboveOrEqual(5)) {
fixZOrder(); fixZOrder(videoView, captureView);
} }
androidVideoWindowImpl = new AndroidVideoWindowImpl(mVideoView, mVideoCaptureView); androidVideoWindowImpl = new AndroidVideoWindowImpl(videoView, captureView);
androidVideoWindowImpl.setListener(new AndroidVideoWindowImpl.VideoWindowListener() { androidVideoWindowImpl.setListener(new AndroidVideoWindowImpl.VideoWindowListener() {
public void onVideoRenderingSurfaceReady(AndroidVideoWindowImpl vw) { public void onVideoRenderingSurfaceReady(AndroidVideoWindowImpl vw, SurfaceView surface) {
LinphoneManager.getLc().setVideoWindow(vw); LinphoneManager.getLc().setVideoWindow(vw);
mVideoViewReady = surface;
} }
public void onVideoRenderingSurfaceDestroyed(AndroidVideoWindowImpl vw) { public void onVideoRenderingSurfaceDestroyed(AndroidVideoWindowImpl vw) {
@ -79,8 +82,9 @@ public class VideoCallActivity extends SoftVolumeActivity {
LinphoneManager.getLc().setVideoWindow(null); LinphoneManager.getLc().setVideoWindow(null);
} }
public void onVideoPreviewSurfaceReady(AndroidVideoWindowImpl vw) { public void onVideoPreviewSurfaceReady(AndroidVideoWindowImpl vw, SurfaceView surface) {
LinphoneManager.getLc().setPreviewWindow(mVideoCaptureView); mVideoCaptureViewReady = surface;
LinphoneManager.getLc().setPreviewWindow(mVideoCaptureViewReady);
} }
public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) { public void onVideoPreviewSurfaceDestroyed(AndroidVideoWindowImpl vw) {
@ -100,7 +104,10 @@ public class VideoCallActivity extends SoftVolumeActivity {
if (LinphoneManager.getLc().isIncall()) { if (LinphoneManager.getLc().isIncall()) {
LinphoneCall call = LinphoneManager.getLc().getCurrentCall(); LinphoneCall call = LinphoneManager.getLc().getCurrentCall();
if (call != null) { if (call != null) {
LinphoneManager.getInstance().sendStaticImage(!call.cameraEnabled()); boolean camEnabled = call.cameraEnabled();
LinphoneManager.getInstance().sendStaticImage(!camEnabled);
updatePreview(camEnabled);
} }
} }
@ -110,16 +117,28 @@ public class VideoCallActivity extends SoftVolumeActivity {
mWakeLock.acquire(); mWakeLock.acquire();
} }
void fixZOrder() { void updatePreview(boolean cameraCaptureEnabled) {
mVideoView.setZOrderOnTop(false); mVideoCaptureViewReady = null;
mVideoCaptureView.setZOrderOnTop(true); if (cameraCaptureEnabled) {
findViewById(R.id.imageView1).setVisibility(View.INVISIBLE);
findViewById(R.id.video_capture_surface).setVisibility(View.VISIBLE);
} else {
findViewById(R.id.imageView1).setVisibility(View.VISIBLE);
findViewById(R.id.video_capture_surface).setVisibility(View.INVISIBLE);
}
}
void fixZOrder(SurfaceView video, SurfaceView preview) {
video.setZOrderOnTop(false);
preview.setZOrderOnTop(true);
} }
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
((GLSurfaceView)mVideoView).onResume(); if (mVideoViewReady != null)
((GLSurfaceView)mVideoViewReady).onResume();
} }
@ -165,17 +184,24 @@ public class VideoCallActivity extends SoftVolumeActivity {
case R.id.videocall_menu_change_resolution: case R.id.videocall_menu_change_resolution:
LinphoneManager.getInstance().changeResolution(); LinphoneManager.getInstance().changeResolution();
// previous call will cause graph reconstruction -> regive preview window // previous call will cause graph reconstruction -> regive preview window
LinphoneManager.getLc().setPreviewWindow(mVideoCaptureView); if (mVideoCaptureViewReady != null)
LinphoneManager.getLc().setPreviewWindow(mVideoCaptureViewReady);
rewriteChangeResolutionItem(item); rewriteChangeResolutionItem(item);
break; break;
case R.id.videocall_menu_terminate_call: case R.id.videocall_menu_terminate_call:
LinphoneManager.getInstance().terminateCall(); LinphoneManager.getInstance().terminateCall();
break; break;
case R.id.videocall_menu_toggle_camera: case R.id.videocall_menu_toggle_camera:
LinphoneManager.getInstance().toggleEnableCamera(); boolean camEnabled = LinphoneManager.getInstance().toggleEnableCamera();
updatePreview(camEnabled);
Log.e("winwow camera enabled: " + camEnabled);
rewriteToggleCameraItem(item); rewriteToggleCameraItem(item);
// previous call will cause graph reconstruction -> regive preview window // previous call will cause graph reconstruction -> regive preview window
LinphoneManager.getLc().setPreviewWindow(mVideoCaptureView); if (camEnabled) {
if (mVideoCaptureViewReady != null)
LinphoneManager.getLc().setPreviewWindow(mVideoCaptureViewReady);
} else
LinphoneManager.getLc().setPreviewWindow(null);
break; break;
case R.id.videocall_menu_switch_camera: case R.id.videocall_menu_switch_camera:
int id = LinphoneManager.getLc().getVideoDevice(); int id = LinphoneManager.getLc().getVideoDevice();
@ -183,12 +209,13 @@ public class VideoCallActivity extends SoftVolumeActivity {
LinphoneManager.getLc().setVideoDevice(id); LinphoneManager.getLc().setVideoDevice(id);
CallManager.getInstance().updateCall(); CallManager.getInstance().updateCall();
// previous call will cause graph reconstruction -> regive preview window // previous call will cause graph reconstruction -> regive preview window
LinphoneManager.getLc().setPreviewWindow(mVideoCaptureView); if (mVideoCaptureViewReady != null)
LinphoneManager.getLc().setPreviewWindow(mVideoCaptureViewReady);
break; break;
default: default:
Log.e("Unknown menu item [",item,"]"); Log.e("Unknown menu item [",item,"]");
break; break;
} }
return true; return true;
} }
@ -203,11 +230,21 @@ public class VideoCallActivity extends SoftVolumeActivity {
@Override @Override
protected void onPause() { protected void onPause() {
Log.d("onPause VideoCallActivity"); Log.d("onPause VideoCallActivity");
if (!isFinishing() && LinphoneManager.getLc().isIncall()) {
// we're getting paused for real
if (getChangingConfigurations() == 0) {
LinphoneManager.getInstance().sendStaticImage(true);
} else {
LinphoneManager.getLc().setDeviceRotation(AndroidVideoWindowImpl.rotationToAngle(getWindowManager().getDefaultDisplay().getOrientation()));
LinphoneManager.getLc().updateCall(LinphoneManager.getLc().getCurrentCall(), null);
}
}
LinphoneManager.getLc().setVideoWindow(null); LinphoneManager.getLc().setVideoWindow(null);
LinphoneManager.getLc().setPreviewWindow(null); LinphoneManager.getLc().setPreviewWindow(null);
LinphoneManager.getInstance().sendStaticImage(true);
if (mWakeLock.isHeld()) mWakeLock.release(); if (mWakeLock.isHeld()) mWakeLock.release();
super.onPause(); super.onPause();
((GLSurfaceView)mVideoView).onPause(); if (mVideoViewReady != null)
((GLSurfaceView)mVideoViewReady).onPause();
} }
} }