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

Add debugs to trace detected and used camera id.

Browse source
This commit is contained in:
Guillaume Beraudo 2011-04-19 14:11:25 +02:00
parent d2d195b698
commit aefad95d86
3 changed files with 21 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/org/linphone/core/video/AndroidCameraConf.java
View file

@ -46,5 +46,15 @@ interface AndroidCameraConf {
boolean hasFrontCamera() { return front != null; } boolean hasFrontCamera() { return front != null; }
boolean hasRearCamera() { return rear != null; } boolean hasRearCamera() { return rear != null; }
boolean hasSeveralCameras() { return front != rear && front != null; } boolean hasSeveralCameras() { return front != rear && front != null; }
@Override
public String toString() {
StringBuilder sb = new StringBuilder();
sb.append("Cameras :");
if (rear != null) sb.append(" rear=").append(rear);
if (front != null) sb.append(" front=").append(front);
if (defaultC != null) sb.append(" default=").append(defaultC);
return sb.toString();
}
} }
} }

6
src/org/linphone/core/video/AndroidCameraRecord.java
View file

@ -22,6 +22,8 @@ import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import org.linphone.core.Version;
import android.hardware.Camera; import android.hardware.Camera;
import android.hardware.Camera.ErrorCallback; import android.hardware.Camera.ErrorCallback;
import android.hardware.Camera.Parameters; import android.hardware.Camera.Parameters;
@ -65,6 +67,7 @@ public abstract class AndroidCameraRecord {
} }
Log.d(tag, "Trying to open camera with id " + params.cameraId);
camera = openCamera(params.cameraId); camera = openCamera(params.cameraId);
camera.setErrorCallback(new ErrorCallback() { camera.setErrorCallback(new ErrorCallback() {
public void onError(int error, Camera camera) { public void onError(int error, Camera camera) {
@ -74,9 +77,12 @@ public abstract class AndroidCameraRecord {
Camera.Parameters parameters=camera.getParameters(); Camera.Parameters parameters=camera.getParameters();
if (Version.sdkStrictlyBelow(9)) {
parameters.set("camera-id",params.cameraId); parameters.set("camera-id",params.cameraId);
camera.setParameters(parameters); camera.setParameters(parameters);
parameters = camera.getParameters(); parameters = camera.getParameters();
}
if (supportedVideoSizes == null) { if (supportedVideoSizes == null) {
supportedVideoSizes = new ArrayList<Size>(getSupportedPreviewSizes(parameters)); supportedVideoSizes = new ArrayList<Size>(getSupportedPreviewSizes(parameters));
} }

1
src/org/linphone/core/video/AndroidCameraRecordManager.java
View file

@ -67,6 +67,7 @@ public class AndroidCameraRecordManager {
// singleton // singleton
private AndroidCameraRecordManager() { private AndroidCameraRecordManager() {
cc = Version.sdkAboveOrEqual(9) ? new AndroidCameraConf9() : new AndroidCameraConf5(); cc = Version.sdkAboveOrEqual(9) ? new AndroidCameraConf9() : new AndroidCameraConf5();
Log.i(tag, "=== Detected " + cc.getFoundCameras()+ " ===");
cameraId = cc.getFoundCameras().defaultC; cameraId = cc.getFoundCameras().defaultC;
} }