Rework video capture. Fix high/low resolution switch.

src/org/linphone/BandwidthManager.java

@@ -120,6 +120,6 @@ public class BandwidthManager {
 	}
 
 	public VideoSize getMaximumVideoSize() {
-		return maximumVideoSize(currentProfile, AndroidCameraRecordManager.getInstance().outputIsPortrait());
+		return maximumVideoSize(currentProfile, AndroidCameraRecordManager.getInstance().isOutputPortraitDependingOnCameraAndPhoneOrientations());
 	}
 }

src/org/linphone/CallManager.java

@@ -121,6 +121,7 @@ class CallManager {
 	}
 
 	/**
+	 * Change the preferred video size used by linphone core. (impact landscape/portrait buffer).
 	 * Update current call, without reinvite.
 	 * The camera will be restarted when mediastreamer chain is recreated and setParameters is called.
 	 */

src/org/linphone/LinphoneManager.java

@@ -85,7 +85,6 @@ import android.preference.PreferenceManager;
 import android.provider.Settings;
 import android.provider.Settings.SettingNotFoundException;
 import android.util.Log;
-import android.view.OrientationEventListener;
 
 /**
  * 
@@ -110,7 +109,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	private SharedPreferences mPref;
 	private Resources mR;
 	private LinphoneCore mLc;
-	private int mPhoneOrientation;
 	private static Transports initialTransports;
 	private static LinphonePreferenceManager lpm;
 
@@ -130,19 +128,7 @@ public final class LinphoneManager implements LinphoneCoreListener {
 		mPowerManager = (PowerManager) c.getSystemService(Context.POWER_SERVICE);
 		mR = c.getResources();
 
-		// Register a sensor to track phoneOrientation for placing new calls.
-		new OrientationEventListener(c) {
-			@Override
-			public void onOrientationChanged(int o) {
-				if (o == OrientationEventListener.ORIENTATION_UNKNOWN) return;
-
-				o = 90 * (o / 90);
-
-				if (Math.abs(mPhoneOrientation - o) < 90) return;
-
-				mPhoneOrientation = o;
-			}
-		}.enable();
+		AndroidCameraRecordManager.getInstance().startOrientationSensor(c.getApplicationContext());
 	}
 	
 	public static final String TAG=Version.TAG;
@@ -268,7 +254,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	public void resetCameraFromPreferences() {
 		boolean useFrontCam = mPref.getBoolean(mR.getString(R.string.pref_video_use_front_camera_key), false);
 		AndroidCameraRecordManager.getInstance().setUseFrontCamera(useFrontCam);
-		AndroidCameraRecordManager.getInstance().setPhoneOrientation(mPhoneOrientation);
 	}
 
 	public static interface AddressType {
@@ -307,7 +292,6 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	public void changeResolution() {
 		BandwidthManager manager = BandwidthManager.getInstance();
 		manager.setUserRestriction(!manager.isUserRestriction());
-		sendStaticImage(AndroidCameraRecordManager.getInstance().isMuted());
 	}
 
 	public void terminateCall() {
@@ -320,9 +304,8 @@ public final class LinphoneManager implements LinphoneCoreListener {
 	 * Camera will be restarted when mediastreamer chain is recreated and setParameters is called.
 	 */
 	public void switchCamera() {
-		AndroidCameraRecordManager rm = AndroidCameraRecordManager.getInstance();
-		rm.stopVideoRecording();
-		rm.toggleUseFrontCamera();
+		AndroidCameraRecordManager.getInstance().stopVideoRecording();
+		AndroidCameraRecordManager.getInstance().toggleUseFrontCamera();
 		CallManager.getInstance().updateCall();
 	}
 

src/org/linphone/LinphoneService.java

@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 package org.linphone;
 
 import java.io.IOException;
+import java.util.List;
 
 import org.linphone.LinphoneManager.LinphoneServiceListener;
 import org.linphone.LinphoneManager.NewOutgoingCallUiListener;
@@ -28,6 +29,7 @@ import org.linphone.core.LinphoneCall.State;
 import org.linphone.core.LinphoneCore.GlobalState;
 import org.linphone.core.LinphoneCore.RegistrationState;
 
+import android.app.ActivityManager;
 import android.app.Notification;
 import android.app.NotificationManager;
 import android.app.PendingIntent;
@@ -234,9 +236,11 @@ public final class LinphoneService extends Service implements LinphoneServiceLis
 					.setClass(this, LinphoneActivity.class)
 					.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
 		} else if (state == LinphoneCall.State.StreamsRunning) {
-			if (LinphoneActivity.isInstanciated()
+			if (!VideoCallActivity.launched && LinphoneActivity.isInstanciated()
 					&& getResources().getBoolean(R.bool.use_video_activity)
 					&& call.getCurrentParamsCopy().getVideoEnabled()) {
+				// Do not call if video activity already launched as it would cause a pause() of the launched one
+				// and a race condition with capture surfaceview leading to a crash
 				LinphoneActivity.instance().startVideoActivity();
 			}
 		}

src/org/linphone/VideoCallActivity.java

@@ -24,10 +24,12 @@ import org.linphone.core.LinphoneCore;
 import org.linphone.core.Version;
 import org.linphone.core.VideoSize;
 import org.linphone.core.video.AndroidCameraRecordManager;
+import org.linphone.core.video.AndroidCameraRecordManager.OnCapturingStateChangedListener;
 
 import android.content.Context;
 import android.content.pm.ActivityInfo;
 import android.os.Bundle;
+import android.os.Handler;
 import android.os.PowerManager;
 import android.os.PowerManager.WakeLock;
 import android.util.Log;
@@ -42,7 +44,7 @@ import android.view.ViewGroup.LayoutParams;
  * @author Guillaume Beraudo
  *
  */
-public class VideoCallActivity extends SoftVolumeActivity  {
+public class VideoCallActivity extends SoftVolumeActivity implements OnCapturingStateChangedListener {
 	private SurfaceView mVideoView;
 	private SurfaceView mVideoCaptureView;
 	private AndroidCameraRecordManager recordManager;
@@ -50,8 +52,8 @@ public class VideoCallActivity extends SoftVolumeActivity  {
 	public static boolean launched = false;
 	private WakeLock mWakeLock;
 	private static final int capturePreviewLargestDimension = 150;
-	private int previousPhoneOrientation;
-	private int phoneOrientation;
+	private Handler handler = new Handler();
+
 
 	public void onCreate(Bundle savedInstanceState) {
 		launched = true;
@@ -65,10 +67,9 @@ public class VideoCallActivity extends SoftVolumeActivity  {
 
 		mVideoCaptureView = (SurfaceView) findViewById(R.id.video_capture_surface);
 
-		previousPhoneOrientation = AndroidCameraRecordManager.getInstance().getPhoneOrientation();
-		phoneOrientation = 90 * getWindowManager().getDefaultDisplay().getOrientation();
 		recordManager = AndroidCameraRecordManager.getInstance();
-		recordManager.setSurfaceView(mVideoCaptureView, phoneOrientation);
+		recordManager.setOnCapturingStateChanged(this);
+		recordManager.setSurfaceView(mVideoCaptureView);
 		mVideoCaptureView.setZOrderOnTop(true);
 
 		if (!recordManager.isMuted()) LinphoneManager.getInstance().sendStaticImage(false);
@@ -76,24 +77,26 @@ public class VideoCallActivity extends SoftVolumeActivity  {
 		mWakeLock = pm.newWakeLock(PowerManager.SCREEN_BRIGHT_WAKE_LOCK|PowerManager.ON_AFTER_RELEASE,"Linphone");
 		mWakeLock.acquire();
 
-		if (Version.sdkStrictlyBelow(8)) {
+		fixScreenOrientationForOldDevices();
+	}
+
+	private void fixScreenOrientationForOldDevices() {
+		if (Version.sdkAboveOrEqual(Version.API08_FROYO_22)) return;
+
 		// Force to display in portrait orientation for old devices
 		// as they do not support surfaceView rotation
 		setRequestedOrientation(recordManager.isCameraOrientationPortrait() ?
 				ActivityInfo.SCREEN_ORIENTATION_PORTRAIT :
 				ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
-		}
-
 		resizeCapturePreview(mVideoCaptureView);
 	}
 
-
 	@Override
 	protected void onResume() {
-		// Update call if orientation changed
-		if (Version.sdkAboveOrEqual(8) && previousPhoneOrientation != phoneOrientation) {
+		if (Version.sdkAboveOrEqual(8) && recordManager.isOutputOrientationMismatch()) {
+			Log.i(tag,"Phone orientation has changed: updating call.");
 			CallManager.getInstance().updateCall();
-			resizeCapturePreview(mVideoCaptureView);
+			// resizeCapturePreview by callback when recording started
 		}
 		super.onResume();
 	}
@@ -162,14 +165,11 @@ public class VideoCallActivity extends SoftVolumeActivity  {
 	public boolean onOptionsItemSelected(MenuItem item) {
 		switch (item.getItemId()) {
 		case R.id.videocall_menu_back_to_dialer:
-			if (!recordManager.isMuted())
-				LinphoneManager.getInstance().sendStaticImage(true);
 			finish();
 			break;
 		case R.id.videocall_menu_change_resolution:
 			LinphoneManager.getInstance().changeResolution();
 			rewriteChangeResolutionItem(item);
-			resizeCapturePreview(mVideoCaptureView);
 			break;
 		case R.id.videocall_menu_terminate_call:
 			LinphoneManager.getInstance().terminateCall();
@@ -181,7 +181,7 @@ public class VideoCallActivity extends SoftVolumeActivity  {
 			break;
 		case R.id.videocall_menu_switch_camera:
 			LinphoneManager.getInstance().switchCamera();
-			resizeCapturePreview(mVideoCaptureView);
+			fixScreenOrientationForOldDevices();
 			break;
 		default:
 			Log.e(LinphoneManager.TAG, "Unknown menu item ["+item+"]");
@@ -206,4 +206,15 @@ public class VideoCallActivity extends SoftVolumeActivity  {
 		super.onPause();
 	}
 
+	public void captureStarted() {
+		handler.post(new Runnable() {
+			public void run() {
+				resizeCapturePreview(mVideoCaptureView);
+			}
+		});
+	}
+
+	public void captureStopped() {
+	}
+
 }

src/org/linphone/core/video/AndroidCameraConf5.java

@@ -74,9 +74,9 @@ class AndroidCameraConf5 implements AndroidCameraConf {
 			//  |        |
 			//  | Phone  |
 			//  |________|
-			return 90;
+			return 180;
 		}
-		return 0;
+		return 90;
 	}
 
 

src/org/linphone/core/video/AndroidCameraConf9.java

@@ -49,11 +49,10 @@ class AndroidCameraConf9 implements AndroidCameraConf {
 	public int getCameraOrientation(int cameraId) {
 		android.hardware.Camera.CameraInfo info = new android.hardware.Camera.CameraInfo();
 		Camera.getCameraInfo(cameraId, info);
-		Log.d(Version.TAG, String.format("Camera info for %d: orientation=%d returned=%d ",
+		Log.d(Version.TAG, String.format("Camera info for %d: orientation=%d",
 						cameraId,
-						info.orientation,
-						(info.orientation - 90) %360));
-		return (info.orientation - 90) %360;
+						info.orientation));
+		return info.orientation;
 	}
 	
 	public boolean isFrontCamera(int cameraId) {

src/org/linphone/core/video/AndroidCameraRecord.java

@@ -211,6 +211,7 @@ public abstract class AndroidCameraRecord implements AutoFocusCallback {
 		public SurfaceView surfaceView;
 
 		public MirrorType mirror = MirrorType.NO;
+        public int phoneOrientation;
 
 		public RecorderParams(long ptr) {
 			filterDataNativePtr = ptr;
@@ -238,4 +239,8 @@ public abstract class AndroidCameraRecord implements AutoFocusCallback {
 		if (success) Log.i(tag, "Autofocus success");
 		else Log.i(tag, "Autofocus failure");
 	}
+
+	public int getStoredPhoneOrientation() {
+		return params.phoneOrientation;
+	}
 }

src/org/linphone/core/video/AndroidCameraRecordManager.java

@@ -20,11 +20,14 @@ package org.linphone.core.video;
 
 import java.util.List;
 
+import org.linphone.LinphoneManager;
 import org.linphone.core.Version;
 import org.linphone.core.video.AndroidCameraRecord.RecorderParams;
 
+import android.content.Context;
 import android.hardware.Camera.Size;
 import android.util.Log;
+import android.view.OrientationEventListener;
 import android.view.SurfaceHolder;
 import android.view.SurfaceView;
 import android.view.SurfaceHolder.Callback;
@@ -40,6 +43,8 @@ import android.view.SurfaceHolder.Callback;
 public class AndroidCameraRecordManager {
 	private static final String tag = "Linphone";
 	private static AndroidCameraRecordManager instance;
+    private OrientationEventListener orientationEventListener;
+    private OnCapturingStateChangedListener capturingStateChangedListener;
 
 	/**
 	 * @return instance
@@ -59,9 +64,7 @@ public class AndroidCameraRecordManager {
 
 	private AndroidCameraRecord recorder;
 	private List<Size> supportedVideoSizes;
-	private int phoneOrientation;
-	public int getPhoneOrientation() {return phoneOrientation;}
-	public void setPhoneOrientation(int degrees) {this.phoneOrientation = degrees;}
+	private int mAlwaysChangingPhoneOrientation=0;
 
 
 	// singleton
@@ -112,7 +115,10 @@ public class AndroidCameraRecordManager {
 
 	
 	public void setParametersFromFilter(long filterDataPtr, int height, int width, float fps) {
+		if (recorder != null) {
+			Log.w(tag, "Recorder should not be running");
 			stopVideoRecording();
+		}
 		RecorderParams p = new RecorderParams(filterDataPtr);
 		p.fps = fps;
 		p.width = width;
@@ -135,8 +141,7 @@ public class AndroidCameraRecordManager {
 	} 
 	
 	
-	public final void setSurfaceView(final SurfaceView sv, final int phoneOrientation) {
-		this.phoneOrientation = phoneOrientation;
+	public final void setSurfaceView(final SurfaceView sv) {
 		SurfaceHolder holder = sv.getHolder();
 	    holder.setType(SurfaceHolder.SURFACE_TYPE_PUSH_BUFFERS);
 
@@ -188,9 +193,18 @@ public class AndroidCameraRecordManager {
 	}
 
 	private synchronized void tryToStartVideoRecording() {
+		if (orientationEventListener == null) {
+			throw new RuntimeException("startOrientationSensor was not called");
+		}
+
 		if (muted || surfaceView == null || parameters == null) return;
 
-		parameters.rotation = bufferRotationForCorrectImageOrientation();
+		if (recorder != null) {
+			Log.e(tag, "Recorder already present");
+			stopVideoRecording();
+		}
+
+		parameters.rotation = bufferRotationToCompensateCameraAndPhoneOrientations();
 
 		parameters.surfaceView = surfaceView;
 		if (Version.sdkAboveOrEqual(9)) {
@@ -204,20 +218,26 @@ public class AndroidCameraRecordManager {
 		}
 
 		recorder.startPreview();
+
+		if (capturingStateChangedListener != null) {
+			capturingStateChangedListener.captureStarted();
+		}
 	}
 
 	public synchronized void stopVideoRecording() {
 		if (recorder != null) {
 			recorder.stopPreview();
 			recorder = null;
+			if (capturingStateChangedListener != null) {
+				capturingStateChangedListener.captureStopped();
+			}
 		}
 	}
 
 	
-	// FIXME select right camera
+	
 	/**
-	 * Eventually null if API < 5.
-	 * 
+	 * FIXME select right camera
 	 */
 	public List<Size> supportedVideoSizes() {
 		if (supportedVideoSizes != null) {
@@ -229,8 +249,6 @@ public class AndroidCameraRecordManager {
 			if (supportedVideoSizes != null) return supportedVideoSizes;
 		}
 
-		// eventually null
-
 		return supportedVideoSizes;
 	}
 
@@ -249,11 +267,11 @@ public class AndroidCameraRecordManager {
 		parameters = null;
 	}
 
-	public boolean outputIsPortrait() {
-		final int rotation = bufferRotationForCorrectImageOrientation();
+	public boolean isOutputPortraitDependingOnCameraAndPhoneOrientations() {
+		final int rotation = bufferRotationToCompensateCameraAndPhoneOrientations();
 		final boolean isPortrait = (rotation % 180) == 90;
 		
-		Log.d(tag, "Camera sensor in portrait orientation? " + isPortrait);
+		Log.d(tag, "Camera sensor in " + (isPortrait? "portrait":"landscape") + " orientation.");
 		return isPortrait;
 	}
 
@@ -263,15 +281,21 @@ public class AndroidCameraRecordManager {
 
 
 	public boolean isCameraOrientationPortrait() {
-		return (cc.getCameraOrientation(cameraId) % 180) == 90;
+		return (cc.getCameraOrientation(cameraId) % 180) == 0;
 	}
 
 
 
-	private int bufferRotationForCorrectImageOrientation() {
-		if (Version.sdkAboveOrEqual(8)) {
+	private int bufferRotationToCompensateCameraAndPhoneOrientations() {
+		if (Version.sdkStrictlyBelow(Version.API08_FROYO_22)) {
+			// Don't perform any rotation
+			// Phone screen should use fitting orientation
+			return 0;
+		}
+
+		final int phoneOrientation = mAlwaysChangingPhoneOrientation;
 		final int cameraOrientation = cc.getCameraOrientation(cameraId);
-			final int rotation = (360 - cameraOrientation + 90 - phoneOrientation) % 360;
+		final int rotation = (cameraOrientation + phoneOrientation) % 360;
 		Log.d(tag, String.format(
 				"Capture video buffer of cameraId=%d will need a rotation of "
 				+ "%d degrees: camera_orientation=%d, phone_orientation=%d",
@@ -279,6 +303,54 @@ public class AndroidCameraRecordManager {
 		return rotation;
 	}
 
-		return 0;
+
+	/**
+	 * Register a sensor to track phoneOrientation changes
+	 */
+	public void startOrientationSensor(Context c) {
+		if (orientationEventListener == null) {
+			orientationEventListener = new LocalOrientationEventListener(c);
+			orientationEventListener.enable();
 		}
 	}
+
+	private class LocalOrientationEventListener extends OrientationEventListener {
+		public LocalOrientationEventListener(Context context) {
+			super(context);
+		}
+		@Override
+		public void onOrientationChanged(final int o) {
+			if (o == OrientationEventListener.ORIENTATION_UNKNOWN) return;
+
+			int degrees=270;
+			if (o < 45 || o >315) degrees=0;
+			else if (o<135) degrees=90;
+			else if (o<225) degrees=180;
+
+			if (mAlwaysChangingPhoneOrientation == degrees) return;
+
+			Log.i(tag, "Phone orientation changed to " + degrees);
+			mAlwaysChangingPhoneOrientation = degrees;
+		}
+	}
+
+	/**
+	 * @return true if linphone core configured to send a A buffer while phone orientation induces !A buffer (A=landscape or portrait)
+	 */
+	public boolean isOutputOrientationMismatch() {
+		final boolean currentlyPortrait = LinphoneManager.getLc().getPreferredVideoSize().isPortrait();
+		final boolean shouldBePortrait = isOutputPortraitDependingOnCameraAndPhoneOrientations();
+		return currentlyPortrait ^ shouldBePortrait;
+	}
+
+	public void setOnCapturingStateChanged(OnCapturingStateChangedListener listener) {
+		this.capturingStateChangedListener=listener;
+	}
+
+	public static interface OnCapturingStateChangedListener {
+		void captureStarted();
+		void captureStopped();
+	}
+
+
+}