summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java212
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java15
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java434
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java2
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java8
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java70
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java407
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java7
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/CameraExceptionHandler.java123
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java22
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java38
-rw-r--r--camera2/portability/src/com/android/ex/camera2/portability/HistoryHandler.java4
-rw-r--r--camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java4
-rw-r--r--camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java4
-rw-r--r--camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java4
-rw-r--r--camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java4
-rw-r--r--common/java/com/android/common/widget/CompositeCursorAdapter.java11
17 files changed, 933 insertions, 436 deletions
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
index 62cb700..2fc4ad3 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2AgentImpl.java
@@ -65,6 +65,7 @@ class AndroidCamera2AgentImpl extends CameraAgent {
private final DispatchThread mDispatchThread;
private final CameraManager mCameraManager;
private final MediaActionSound mNoisemaker;
+ private CameraExceptionHandler mExceptionHandler;
/**
* Number of camera devices. The length of {@code mCameraDevices} does not reveal this
@@ -86,6 +87,7 @@ class AndroidCamera2AgentImpl extends CameraAgent {
mCameraHandlerThread = new HandlerThread("Camera2 Handler Thread");
mCameraHandlerThread.start();
mCameraHandler = new Camera2Handler(mCameraHandlerThread.getLooper());
+ mExceptionHandler = new CameraExceptionHandler(mCameraHandler);
mCameraState = new AndroidCamera2StateHolder();
mDispatchThread = new DispatchThread(mCameraHandler, mCameraHandlerThread);
mDispatchThread.start();
@@ -134,11 +136,6 @@ class AndroidCamera2AgentImpl extends CameraAgent {
// TODO: Implement
@Override
- public void setCameraDefaultExceptionCallback(CameraExceptionCallback callback,
- Handler handler) {}
-
- // TODO: Implement
- @Override
public void recycle() {}
// TODO: Some indices may now be invalid; ensure everyone can handle that and update the docs
@@ -159,6 +156,21 @@ class AndroidCamera2AgentImpl extends CameraAgent {
return mDispatchThread;
}
+ @Override
+ protected CameraStateHolder getCameraState() {
+ return mCameraState;
+ }
+
+ @Override
+ protected CameraExceptionHandler getCameraExceptionHandler() {
+ return mExceptionHandler;
+ }
+
+ @Override
+ public void setCameraExceptionHandler(CameraExceptionHandler exceptionHandler) {
+ mExceptionHandler = exceptionHandler;
+ }
+
private static abstract class CaptureAvailableListener
extends CameraCaptureSession.CaptureCallback
implements ImageReader.OnImageAvailableListener {};
@@ -168,6 +180,7 @@ class AndroidCamera2AgentImpl extends CameraAgent {
private CameraOpenCallback mOpenCallback;
private int mCameraIndex;
private String mCameraId;
+ private int mCancelAfPending = 0;
// Available in CAMERA_UNCONFIGURED state and above:
private CameraDevice mCamera;
@@ -208,8 +221,10 @@ class AndroidCamera2AgentImpl extends CameraAgent {
@Override
public void handleMessage(final Message msg) {
super.handleMessage(msg);
+ Log.v(TAG, "handleMessage - action = '" + CameraActions.stringify(msg.what) + "'");
+ int cameraAction = msg.what;
try {
- switch(msg.what) {
+ switch (cameraAction) {
case CameraActions.OPEN_CAMERA:
case CameraActions.RECONNECT: {
CameraOpenCallback openCallback = (CameraOpenCallback) msg.obj;
@@ -360,6 +375,11 @@ class AndroidCamera2AgentImpl extends CameraAgent {
}
case CameraActions.AUTO_FOCUS: {
+ if (mCancelAfPending > 0) {
+ Log.v(TAG, "handleMessage - Ignored AUTO_FOCUS because there was "
+ + mCancelAfPending + " pending CANCEL_AUTO_FOCUS messages");
+ break; // ignore AF because a CANCEL_AF is queued after this
+ }
// We only support locking the focus while a preview is being displayed.
// However, it can be requested multiple times in succession; the effect of
// the subsequent invocations is determined by the focus mode defined in the
@@ -437,6 +457,9 @@ class AndroidCamera2AgentImpl extends CameraAgent {
}
case CameraActions.CANCEL_AUTO_FOCUS: {
+ // Ignore all AFs that were already queued until we see
+ // a CANCEL_AUTO_FOCUS_FINISH
+ mCancelAfPending++;
// Why would you want to unlock the lens if it isn't already locked?
if (mCameraState.getState() <
AndroidCamera2StateHolder.CAMERA_PREVIEW_ACTIVE) {
@@ -462,6 +485,13 @@ class AndroidCamera2AgentImpl extends CameraAgent {
break;
}
+ case CameraActions.CANCEL_AUTO_FOCUS_FINISH: {
+ // Stop ignoring AUTO_FOCUS messages unless there are additional
+ // CANCEL_AUTO_FOCUSes that were added
+ mCancelAfPending--;
+ break;
+ }
+
case CameraActions.SET_AUTO_FOCUS_MOVE_CALLBACK: {
mPassiveAfCallback = (CameraAFMoveCallback) msg.obj;
break;
@@ -493,12 +523,18 @@ class AndroidCamera2AgentImpl extends CameraAgent {
case CameraActions.SET_DISPLAY_ORIENTATION: {
// Only set the JPEG capture orientation if requested to do so; otherwise,
- // capture in the sensor's physical orientation
+ // capture in the sensor's physical orientation. (e.g., JPEG rotation is
+ // necessary in auto-rotate mode.
mPersistentSettings.set(CaptureRequest.JPEG_ORIENTATION, msg.arg2 > 0 ?
mCameraProxy.getCharacteristics().getJpegOrientation(msg.arg1) : 0);
break;
}
+ case CameraActions.SET_JPEG_ORIENTATION: {
+ mPersistentSettings.set(CaptureRequest.JPEG_ORIENTATION, msg.arg1);
+ break;
+ }
+
case CameraActions.CAPTURE_PHOTO: {
if (mCameraState.getState() <
AndroidCamera2StateHolder.CAMERA_PREVIEW_ACTIVE) {
@@ -605,12 +641,12 @@ class AndroidCamera2AgentImpl extends CameraAgent {
}
}
} catch (final Exception ex) {
- if (msg.what != CameraActions.RELEASE && mCamera != null) {
+ if (cameraAction != CameraActions.RELEASE && mCamera != null) {
// TODO: Handle this better
mCamera.close();
mCamera = null;
} else if (mCamera == null) {
- if (msg.what == CameraActions.OPEN_CAMERA) {
+ if (cameraAction == CameraActions.OPEN_CAMERA) {
if (mOpenCallback != null) {
mOpenCallback.onDeviceOpenFailure(mCameraIndex,
generateHistoryString(mCameraIndex));
@@ -622,12 +658,12 @@ class AndroidCamera2AgentImpl extends CameraAgent {
}
if (ex instanceof RuntimeException) {
- post(new Runnable() {
- @Override
- public void run() {
- sCameraExceptionCallback.onCameraException((RuntimeException) ex);
- }});
+ String commandHistory = generateHistoryString(Integer.parseInt(mCameraId));
+ mExceptionHandler.onCameraException((RuntimeException) ex, commandHistory,
+ cameraAction, mCameraState.getState());
}
+ } finally {
+ WaitDoneBundle.unblockSyncWaiters(msg);
}
}
@@ -746,8 +782,10 @@ class AndroidCamera2AgentImpl extends CameraAgent {
try {
CameraCharacteristics props =
mCameraManager.getCameraCharacteristics(mCameraId);
- mCameraProxy = new AndroidCamera2ProxyImpl(mCameraIndex, mCamera,
- getCameraDeviceInfo().getCharacteristics(mCameraIndex), props);
+ CameraDeviceInfo.Characteristics characteristics =
+ getCameraDeviceInfo().getCharacteristics(mCameraIndex);
+ mCameraProxy = new AndroidCamera2ProxyImpl(AndroidCamera2AgentImpl.this,
+ mCameraIndex, mCamera, characteristics, props);
mPersistentSettings = new Camera2RequestSettingsSet();
mActiveArray =
props.get(CameraCharacteristics.SENSOR_INFO_ACTIVE_ARRAY_SIZE);
@@ -935,6 +973,7 @@ class AndroidCamera2AgentImpl extends CameraAgent {
}
private class AndroidCamera2ProxyImpl extends CameraAgent.CameraProxy {
+ private final AndroidCamera2AgentImpl mCameraAgent;
private final int mCameraIndex;
private final CameraDevice mCamera;
private final CameraDeviceInfo.Characteristics mCharacteristics;
@@ -942,9 +981,13 @@ class AndroidCamera2AgentImpl extends CameraAgent {
private CameraSettings mLastSettings;
private boolean mShutterSoundEnabled;
- public AndroidCamera2ProxyImpl(int cameraIndex, CameraDevice camera,
+ public AndroidCamera2ProxyImpl(
+ AndroidCamera2AgentImpl agent,
+ int cameraIndex,
+ CameraDevice camera,
CameraDeviceInfo.Characteristics characteristics,
CameraCharacteristics properties) {
+ mCameraAgent = agent;
mCameraIndex = cameraIndex;
mCamera = camera;
mCharacteristics = characteristics;
@@ -972,6 +1015,10 @@ class AndroidCamera2AgentImpl extends CameraAgent {
return mCapabilities;
}
+ public CameraAgent getAgent() {
+ return mCameraAgent;
+ }
+
private AndroidCamera2Capabilities getSpecializedCapabilities() {
return mCapabilities;
}
@@ -1014,53 +1061,67 @@ class AndroidCamera2AgentImpl extends CameraAgent {
@Override
public void autoFocus(final Handler handler, final CameraAFCallback cb) {
- mDispatchThread.runJob(new Runnable() {
- @Override
- public void run() {
- CameraAFCallback cbForward = null;
- if (cb != null) {
- cbForward = new CameraAFCallback() {
- @Override
- public void onAutoFocus(final boolean focused,
- final CameraProxy camera) {
- handler.post(new Runnable() {
- @Override
- public void run() {
- cb.onAutoFocus(focused, camera);
- }});
- }};
- }
+ try {
+ mDispatchThread.runJob(new Runnable() {
+ @Override
+ public void run() {
+ CameraAFCallback cbForward = null;
+ if (cb != null) {
+ cbForward = new CameraAFCallback() {
+ @Override
+ public void onAutoFocus(final boolean focused,
+ final CameraProxy camera) {
+ handler.post(new Runnable() {
+ @Override
+ public void run() {
+ cb.onAutoFocus(focused, camera);
+ }
+ });
+ }
+ };
+ }
- mCameraState.waitForStates(AndroidCamera2StateHolder.CAMERA_PREVIEW_ACTIVE |
- AndroidCamera2StateHolder.CAMERA_FOCUS_LOCKED);
- mCameraHandler.obtainMessage(CameraActions.AUTO_FOCUS, cbForward)
- .sendToTarget();
- }});
+ mCameraState.waitForStates(AndroidCamera2StateHolder.CAMERA_PREVIEW_ACTIVE |
+ AndroidCamera2StateHolder.CAMERA_FOCUS_LOCKED);
+ mCameraHandler.obtainMessage(CameraActions.AUTO_FOCUS, cbForward)
+ .sendToTarget();
+ }
+ });
+ } catch (RuntimeException ex) {
+ mCameraAgent.getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
@Override
public void setAutoFocusMoveCallback(final Handler handler, final CameraAFMoveCallback cb) {
- mDispatchThread.runJob(new Runnable() {
- @Override
- public void run() {
- CameraAFMoveCallback cbForward = null;
- if (cb != null) {
- cbForward = new CameraAFMoveCallback() {
- @Override
- public void onAutoFocusMoving(final boolean moving,
- final CameraProxy camera) {
- handler.post(new Runnable() {
- @Override
- public void run() {
- cb.onAutoFocusMoving(moving, camera);
- }});
- }};
- }
+ try {
+ mDispatchThread.runJob(new Runnable() {
+ @Override
+ public void run() {
+ CameraAFMoveCallback cbForward = null;
+ if (cb != null) {
+ cbForward = new CameraAFMoveCallback() {
+ @Override
+ public void onAutoFocusMoving(final boolean moving,
+ final CameraProxy camera) {
+ handler.post(new Runnable() {
+ @Override
+ public void run() {
+ cb.onAutoFocusMoving(moving, camera);
+ }
+ });
+ }
+ };
+ }
- mCameraHandler.obtainMessage(CameraActions.SET_AUTO_FOCUS_MOVE_CALLBACK,
- cbForward).sendToTarget();
- }});
+ mCameraHandler.obtainMessage(CameraActions.SET_AUTO_FOCUS_MOVE_CALLBACK,
+ cbForward).sendToTarget();
+ }
+ });
+ } catch (RuntimeException ex) {
+ mCameraAgent.getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
@Override
@@ -1074,7 +1135,7 @@ class AndroidCamera2AgentImpl extends CameraAgent {
new CaptureAvailableListener() {
@Override
public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
- long timestamp) {
+ long timestamp, long frameNumber) {
if (shutter != null) {
handler.post(new Runnable() {
@Override
@@ -1102,15 +1163,20 @@ class AndroidCamera2AgentImpl extends CameraAgent {
}
}
}};
- mDispatchThread.runJob(new Runnable() {
- @Override
- public void run() {
- // Wait until PREVIEW_ACTIVE or better
- mCameraState.waitForStates(
- ~(AndroidCamera2StateHolder.CAMERA_PREVIEW_ACTIVE - 1));
- mCameraHandler.obtainMessage(CameraActions.CAPTURE_PHOTO, picListener)
- .sendToTarget();
- }});
+ try {
+ mDispatchThread.runJob(new Runnable() {
+ @Override
+ public void run() {
+ // Wait until PREVIEW_ACTIVE or better
+ mCameraState.waitForStates(
+ ~(AndroidCamera2StateHolder.CAMERA_PREVIEW_ACTIVE - 1));
+ mCameraHandler.obtainMessage(CameraActions.CAPTURE_PHOTO, picListener)
+ .sendToTarget();
+ }
+ });
+ } catch (RuntimeException ex) {
+ mCameraAgent.getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
// TODO: Implement
@@ -1132,10 +1198,6 @@ class AndroidCamera2AgentImpl extends CameraAgent {
// TODO: Implement
@Override
- public void setErrorCallback(Handler handler, CameraErrorCallback cb) {}
-
- // TODO: Implement
- @Override
public void setParameters(android.hardware.Camera.Parameters params) {}
// TODO: Implement
@@ -1355,12 +1417,4 @@ class AndroidCamera2AgentImpl extends CameraAgent {
}
}
}
-
- private static final CameraExceptionCallback sCameraExceptionCallback =
- new CameraExceptionCallback() {
- @Override
- public synchronized void onCameraException(RuntimeException e) {
- throw e;
- }
- };
}
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
index 540d8df..0062097 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCamera2Settings.java
@@ -228,6 +228,11 @@ public class AndroidCamera2Settings extends CameraSettings {
} else if (setting == CONTROL_AWB_LOCK) {
return Objects.equals(mAutoWhiteBalanceLocked, mTemplateSettings.get(CONTROL_AWB_LOCK));
} else if (setting == JPEG_THUMBNAIL_SIZE) {
+ if (mExifThumbnailSize == null) {
+ // It doesn't matter if this is true or false since setting this
+ // to null in the request settings will use the default anyway.
+ return false;
+ }
android.util.Size defaultThumbnailSize = mTemplateSettings.get(JPEG_THUMBNAIL_SIZE);
return (mExifThumbnailSize.width() == 0 && mExifThumbnailSize.height() == 0) ||
(defaultThumbnailSize != null &&
@@ -273,9 +278,13 @@ public class AndroidCamera2Settings extends CameraSettings {
updateRequestSettingOrForceToDefault(CONTROL_AWB_LOCK, mAutoWhiteBalanceLocked);
// TODO: mRecordingHintEnabled
updateRequestGpsData();
- updateRequestSettingOrForceToDefault(JPEG_THUMBNAIL_SIZE,
- new android.util.Size(
- mExifThumbnailSize.width(), mExifThumbnailSize.height()));
+ if (mExifThumbnailSize != null) {
+ updateRequestSettingOrForceToDefault(JPEG_THUMBNAIL_SIZE,
+ new android.util.Size(
+ mExifThumbnailSize.width(), mExifThumbnailSize.height()));
+ } else {
+ updateRequestSettingOrForceToDefault(JPEG_THUMBNAIL_SIZE, null);
+ }
return mRequestSettings;
}
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
index 949ac62..201a905 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraAgentImpl.java
@@ -56,38 +56,42 @@ class AndroidCameraAgentImpl extends CameraAgent {
private final CameraStateHolder mCameraState;
private final DispatchThread mDispatchThread;
- private Handler mCameraExceptionCallbackHandler;
- private CameraExceptionCallback mCameraExceptionCallback =
- new CameraExceptionCallback() {
- @Override
- public void onCameraException(RuntimeException e) {
- throw e;
- }
- };
+ private static final CameraExceptionHandler sDefaultExceptionHandler =
+ new CameraExceptionHandler(null) {
+ @Override
+ public void onCameraError(int errorCode) {
+ Log.w(TAG, "onCameraError called with no handler set: " + errorCode);
+ }
+
+ @Override
+ public void onCameraException(RuntimeException ex, String commandHistory, int action,
+ int state) {
+ Log.w(TAG, "onCameraException called with no handler set", ex);
+ }
+
+ @Override
+ public void onDispatchThreadException(RuntimeException ex) {
+ Log.w(TAG, "onDispatchThreadException called with no handler set", ex);
+ }
+ };
+
+ private CameraExceptionHandler mExceptionHandler = sDefaultExceptionHandler;
AndroidCameraAgentImpl() {
mCameraHandlerThread = new HandlerThread("Camera Handler Thread");
mCameraHandlerThread.start();
- mCameraHandler = new CameraHandler(mCameraHandlerThread.getLooper());
- mCameraExceptionCallbackHandler = mCameraHandler;
+ mCameraHandler = new CameraHandler(this, mCameraHandlerThread.getLooper());
+ mExceptionHandler = new CameraExceptionHandler(mCameraHandler);
mCameraState = new AndroidCameraStateHolder();
mDispatchThread = new DispatchThread(mCameraHandler, mCameraHandlerThread);
mDispatchThread.start();
}
@Override
- public void setCameraDefaultExceptionCallback(CameraExceptionCallback callback,
- Handler handler) {
- synchronized (mCameraExceptionCallback) {
- mCameraExceptionCallback = callback;
- mCameraExceptionCallbackHandler = handler;
- }
- }
-
- @Override
public void recycle() {
closeCamera(null, true);
mDispatchThread.end();
+ mCameraState.invalidate();
}
@Override
@@ -105,6 +109,22 @@ class AndroidCameraAgentImpl extends CameraAgent {
return mDispatchThread;
}
+ @Override
+ protected CameraStateHolder getCameraState() {
+ return mCameraState;
+ }
+
+ @Override
+ protected CameraExceptionHandler getCameraExceptionHandler() {
+ return mExceptionHandler;
+ }
+
+ @Override
+ public void setCameraExceptionHandler(CameraExceptionHandler exceptionHandler) {
+ // In case of null set the default handler to route exceptions to logs
+ mExceptionHandler = exceptionHandler != null ? exceptionHandler : sDefaultExceptionHandler;
+ }
+
private static class AndroidCameraDeviceInfo implements CameraDeviceInfo {
private final Camera.CameraInfo[] mCameraInfos;
private final int mNumberOfCameras;
@@ -237,11 +257,12 @@ class AndroidCameraAgentImpl extends CameraAgent {
/**
* The handler on which the actual camera operations happen.
*/
- private class CameraHandler extends HistoryHandler {
-
+ private class CameraHandler extends HistoryHandler implements Camera.ErrorCallback {
+ private CameraAgent mAgent;
private Camera mCamera;
- private int mCameraId;
+ private int mCameraId = -1;
private ParametersCache mParameterCache;
+ private int mCancelAfPending = 0;
private class CaptureCallbacks {
public final ShutterCallback mShutter;
@@ -258,8 +279,9 @@ class AndroidCameraAgentImpl extends CameraAgent {
}
}
- CameraHandler(Looper looper) {
+ CameraHandler(CameraAgent agent, Looper looper) {
super(looper);
+ mAgent = agent;
}
private void startFaceDetection() {
@@ -297,16 +319,6 @@ class AndroidCameraAgentImpl extends CameraAgent {
}
}
- private void capture(final CaptureCallbacks cb) {
- try {
- mCamera.takePicture(cb.mShutter, cb.mRaw, cb.mPostView, cb.mJpeg);
- } catch (RuntimeException e) {
- // TODO: output camera state and focus state for debugging.
- Log.e(TAG, "take picture failed.");
- throw e;
- }
- }
-
public void requestTakePicture(
final ShutterCallback shutter,
final PictureCallback raw,
@@ -316,6 +328,19 @@ class AndroidCameraAgentImpl extends CameraAgent {
obtainMessage(CameraActions.CAPTURE_PHOTO, callbacks).sendToTarget();
}
+ @Override
+ public void onError(final int errorCode, Camera camera) {
+ mExceptionHandler.onCameraError(errorCode);
+ if (errorCode == android.hardware.Camera.CAMERA_ERROR_SERVER_DIED) {
+ int lastCameraAction = getCurrentMessage();
+ mExceptionHandler.onCameraException(
+ new RuntimeException("Media server died."),
+ generateHistoryString(mCameraId),
+ lastCameraAction,
+ mCameraState.getState());
+ }
+ }
+
/**
* This method does not deal with the API level check. Everyone should
* check first for supported operations before sending message to this handler.
@@ -323,8 +348,16 @@ class AndroidCameraAgentImpl extends CameraAgent {
@Override
public void handleMessage(final Message msg) {
super.handleMessage(msg);
+
+ if (getCameraState().isInvalid()) {
+ Log.v(TAG, "Skip handleMessage - action = '" + CameraActions.stringify(msg.what) + "'");
+ return;
+ }
+ Log.v(TAG, "handleMessage - action = '" + CameraActions.stringify(msg.what) + "'");
+
+ int cameraAction = msg.what;
try {
- switch (msg.what) {
+ switch (cameraAction) {
case CameraActions.OPEN_CAMERA: {
final CameraOpenCallback openCallback = (CameraOpenCallback) msg.obj;
final int cameraId = msg.arg1;
@@ -344,11 +377,13 @@ class AndroidCameraAgentImpl extends CameraAgent {
mCapabilities = new AndroidCameraCapabilities(
mParameterCache.getBlocking());
+ mCamera.setErrorCallback(this);
+
mCameraState.setState(AndroidCameraStateHolder.CAMERA_IDLE);
if (openCallback != null) {
- openCallback.onCameraOpened(
- new AndroidCameraProxyImpl(cameraId, mCamera,
- mCharacteristics, mCapabilities));
+ CameraProxy cameraProxy = new AndroidCameraProxyImpl(
+ mAgent, cameraId, mCamera, mCharacteristics, mCapabilities);
+ openCallback.onCameraOpened(cameraProxy);
}
} else {
if (openCallback != null) {
@@ -363,6 +398,7 @@ class AndroidCameraAgentImpl extends CameraAgent {
mCamera.release();
mCameraState.setState(AndroidCameraStateHolder.CAMERA_UNOPENED);
mCamera = null;
+ mCameraId = -1;
} else {
Log.w(TAG, "Releasing camera without any camera opened.");
}
@@ -377,8 +413,7 @@ class AndroidCameraAgentImpl extends CameraAgent {
mCamera.reconnect();
} catch (IOException ex) {
if (cbForward != null) {
- cbForward.onReconnectionFailure(AndroidCameraAgentImpl.this,
- generateHistoryString(mCameraId));
+ cbForward.onReconnectionFailure(mAgent, generateHistoryString(mCameraId));
}
break;
}
@@ -386,8 +421,8 @@ class AndroidCameraAgentImpl extends CameraAgent {
mCameraState.setState(AndroidCameraStateHolder.CAMERA_IDLE);
if (cbForward != null) {
cbForward.onCameraOpened(
- new AndroidCameraProxyImpl(cameraId, mCamera, mCharacteristics,
- mCapabilities));
+ new AndroidCameraProxyImpl(AndroidCameraAgentImpl.this,
+ cameraId, mCamera, mCharacteristics, mCapabilities));
}
break;
}
@@ -451,17 +486,32 @@ class AndroidCameraAgentImpl extends CameraAgent {
}
case CameraActions.AUTO_FOCUS: {
+ if (mCancelAfPending > 0) {
+ Log.v(TAG, "handleMessage - Ignored AUTO_FOCUS because there was "
+ + mCancelAfPending + " pending CANCEL_AUTO_FOCUS messages");
+ break; // ignore AF because a CANCEL_AF is queued after this
+ }
mCameraState.setState(AndroidCameraStateHolder.CAMERA_FOCUSING);
mCamera.autoFocus((AutoFocusCallback) msg.obj);
break;
}
case CameraActions.CANCEL_AUTO_FOCUS: {
+ // Ignore all AFs that were already queued until we see
+ // a CANCEL_AUTO_FOCUS_FINISH
+ mCancelAfPending++;
mCamera.cancelAutoFocus();
mCameraState.setState(AndroidCameraStateHolder.CAMERA_IDLE);
break;
}
+ case CameraActions.CANCEL_AUTO_FOCUS_FINISH: {
+ // Stop ignoring AUTO_FOCUS messages unless there are additional
+ // CANCEL_AUTO_FOCUSes that were added
+ mCancelAfPending--;
+ break;
+ }
+
case CameraActions.SET_AUTO_FOCUS_MOVE_CALLBACK: {
setAutoFocusMoveCallback(mCamera, msg.obj);
break;
@@ -472,11 +522,21 @@ class AndroidCameraAgentImpl extends CameraAgent {
mCamera.setDisplayOrientation(
mCharacteristics.getPreviewOrientation(msg.arg1));
// Only set the JPEG capture orientation if requested to do so; otherwise,
- // capture in the sensor's physical orientation
+ // capture in the sensor's physical orientation. (e.g., JPEG rotation is
+ // necessary in auto-rotate mode.
Parameters parameters = mParameterCache.getBlocking();
parameters.setRotation(
msg.arg2 > 0 ? mCharacteristics.getJpegOrientation(msg.arg1) : 0);
mCamera.setParameters(parameters);
+ mParameterCache.invalidate();
+ break;
+ }
+
+ case CameraActions.SET_JPEG_ORIENTATION: {
+ Parameters parameters = mParameterCache.getBlocking();
+ parameters.setRotation(msg.arg1);
+ mCamera.setParameters(parameters);
+ mParameterCache.invalidate();
break;
}
@@ -500,11 +560,6 @@ class AndroidCameraAgentImpl extends CameraAgent {
break;
}
- case CameraActions.SET_ERROR_CALLBACK: {
- mCamera.setErrorCallback((ErrorCallback) msg.obj);
- break;
- }
-
case CameraActions.APPLY_SETTINGS: {
Parameters parameters = mParameterCache.getBlocking();
CameraSettings settings = (CameraSettings) msg.obj;
@@ -546,45 +601,53 @@ class AndroidCameraAgentImpl extends CameraAgent {
case CameraActions.CAPTURE_PHOTO: {
mCameraState.setState(AndroidCameraStateHolder.CAMERA_CAPTURING);
- capture((CaptureCallbacks) msg.obj);
+ CaptureCallbacks captureCallbacks = (CaptureCallbacks) msg.obj;
+ mCamera.takePicture(
+ captureCallbacks.mShutter,
+ captureCallbacks.mRaw,
+ captureCallbacks.mPostView,
+ captureCallbacks.mJpeg);
break;
}
default: {
- throw new RuntimeException("Invalid CameraProxy message=" + msg.what);
+ Log.e(TAG, "Invalid CameraProxy message=" + msg.what);
}
}
- } catch (final RuntimeException e) {
- if (msg.what != CameraActions.RELEASE && mCamera != null) {
+ } catch (final RuntimeException ex) {
+ int cameraState = mCameraState.getState();
+ String errorContext = "CameraAction[" + CameraActions.stringify(cameraAction) +
+ "] at CameraState[" + cameraState + "]";
+ Log.e(TAG, "RuntimeException during " + errorContext, ex);
+
+ // Be conservative by invalidating both CameraAgent and CameraProxy objects.
+ mCameraState.invalidate();
+
+ if (mCamera != null) {
+ Log.i(TAG, "Release camera since mCamera is not null.");
try {
mCamera.release();
- mCameraState.setState(AndroidCameraStateHolder.CAMERA_UNOPENED);
- } catch (Exception ex) {
- Log.e(TAG, "Fail to release the camera.");
- }
- mCamera = null;
- } else {
- if (mCamera == null) {
- if (msg.what == CameraActions.OPEN_CAMERA) {
- final int cameraId = msg.arg1;
- if (msg.obj != null) {
- ((CameraOpenCallback) msg.obj).onDeviceOpenFailure(
- msg.arg1, generateHistoryString(cameraId));
- }
- } else {
- Log.w(TAG, "Cannot handle message " + msg.what + ", mCamera is null.");
- }
- return;
+ } catch (Exception e) {
+ Log.e(TAG, "Fail when calling Camera.release().", e);
+ } finally {
+ mCamera = null;
}
}
- synchronized (mCameraExceptionCallback) {
- mCameraExceptionCallbackHandler.post(new Runnable() {
- @Override
- public void run() {
- mCameraExceptionCallback.onCameraException(e);
- }
- });
+
+ // Invoke error callback.
+ if (msg.what == CameraActions.OPEN_CAMERA && mCamera == null) {
+ final int cameraId = msg.arg1;
+ if (msg.obj != null) {
+ ((CameraOpenCallback) msg.obj).onDeviceOpenFailure(
+ msg.arg1, generateHistoryString(cameraId));
+ }
+ } else {
+ CameraExceptionHandler exceptionHandler = mAgent.getCameraExceptionHandler();
+ exceptionHandler.onCameraException(
+ ex, generateHistoryString(mCameraId), cameraAction, cameraState);
}
+ } finally {
+ WaitDoneBundle.unblockSyncWaiters(msg);
}
}
@@ -640,7 +703,9 @@ class AndroidCameraAgentImpl extends CameraAgent {
}
parameters.setRecordingHint(settings.isRecordingHintEnabled());
Size jpegThumbSize = settings.getExifThumbnailSize();
- parameters.setJpegThumbnailSize(jpegThumbSize.width(), jpegThumbSize.height());
+ if (jpegThumbSize != null) {
+ parameters.setJpegThumbnailSize(jpegThumbSize.width(), jpegThumbSize.height());
+ }
parameters.setPictureFormat(settings.getCurrentPhotoFormat());
CameraSettings.GpsData gpsData = settings.getGpsData();
@@ -690,15 +755,20 @@ class AndroidCameraAgentImpl extends CameraAgent {
* camera handler thread.
*/
private class AndroidCameraProxyImpl extends CameraAgent.CameraProxy {
+ private final CameraAgent mCameraAgent;
private final int mCameraId;
/* TODO: remove this Camera instance. */
private final Camera mCamera;
private final CameraDeviceInfo.Characteristics mCharacteristics;
private final AndroidCameraCapabilities mCapabilities;
- private AndroidCameraProxyImpl(int cameraId, Camera camera,
+ private AndroidCameraProxyImpl(
+ CameraAgent cameraAgent,
+ int cameraId,
+ Camera camera,
CameraDeviceInfo.Characteristics characteristics,
AndroidCameraCapabilities capabilities) {
+ mCameraAgent = cameraAgent;
mCamera = camera;
mCameraId = cameraId;
mCharacteristics = characteristics;
@@ -708,6 +778,9 @@ class AndroidCameraAgentImpl extends CameraAgent {
@Deprecated
@Override
public android.hardware.Camera getCamera() {
+ if (getCameraState().isInvalid()) {
+ return null;
+ }
return mCamera;
}
@@ -727,6 +800,11 @@ class AndroidCameraAgentImpl extends CameraAgent {
}
@Override
+ public CameraAgent getAgent() {
+ return mCameraAgent;
+ }
+
+ @Override
public void setPreviewDataCallback(
final Handler handler, final CameraPreviewDataCallback cb) {
mDispatchThread.runJob(new Runnable() {
@@ -789,6 +867,10 @@ class AndroidCameraAgentImpl extends CameraAgent {
mDispatchThread.runJob(new Runnable() {
@Override
public void run() {
+ // Don't bother to wait since camera is in bad state.
+ if (getCameraState().isInvalid()) {
+ return;
+ }
mCameraState.waitForStates(AndroidCameraStateHolder.CAMERA_IDLE);
mCameraHandler.obtainMessage(CameraActions.AUTO_FOCUS, afCallback)
.sendToTarget();
@@ -800,15 +882,19 @@ class AndroidCameraAgentImpl extends CameraAgent {
@Override
public void setAutoFocusMoveCallback(
final Handler handler, final CameraAFMoveCallback cb) {
- mDispatchThread.runJob(new Runnable() {
- @Override
- public void run() {
- mCameraHandler.obtainMessage(CameraActions.SET_AUTO_FOCUS_MOVE_CALLBACK,
- AFMoveCallbackForward.getNewInstance(
- handler, AndroidCameraProxyImpl.this, cb))
- .sendToTarget();
- }
- });
+ try {
+ mDispatchThread.runJob(new Runnable() {
+ @Override
+ public void run() {
+ mCameraHandler.obtainMessage(CameraActions.SET_AUTO_FOCUS_MOVE_CALLBACK,
+ AFMoveCallbackForward.getNewInstance(
+ handler, AndroidCameraProxyImpl.this, cb))
+ .sendToTarget();
+ }
+ });
+ } catch (final RuntimeException ex) {
+ mCameraAgent.getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
@Override
@@ -833,59 +919,62 @@ class AndroidCameraAgentImpl extends CameraAgent {
}
};
- mDispatchThread.runJob(new Runnable() {
- @Override
- public void run() {
- mCameraState.waitForStates(AndroidCameraStateHolder.CAMERA_IDLE |
- AndroidCameraStateHolder.CAMERA_UNLOCKED);
- mCameraHandler.requestTakePicture(ShutterCallbackForward
- .getNewInstance(handler, AndroidCameraProxyImpl.this, shutter),
- PictureCallbackForward
- .getNewInstance(handler, AndroidCameraProxyImpl.this, raw),
- PictureCallbackForward
- .getNewInstance(handler, AndroidCameraProxyImpl.this, post),
- jpegCallback
- );
- }
- });
+ try {
+ mDispatchThread.runJob(new Runnable() {
+ @Override
+ public void run() {
+ // Don't bother to wait since camera is in bad state.
+ if (getCameraState().isInvalid()) {
+ return;
+ }
+ mCameraState.waitForStates(AndroidCameraStateHolder.CAMERA_IDLE |
+ AndroidCameraStateHolder.CAMERA_UNLOCKED);
+ mCameraHandler.requestTakePicture(ShutterCallbackForward
+ .getNewInstance(handler, AndroidCameraProxyImpl.this, shutter),
+ PictureCallbackForward
+ .getNewInstance(handler, AndroidCameraProxyImpl.this, raw),
+ PictureCallbackForward
+ .getNewInstance(handler, AndroidCameraProxyImpl.this, post),
+ jpegCallback
+ );
+ }
+ });
+ } catch (final RuntimeException ex) {
+ mCameraAgent.getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
@Override
public void setZoomChangeListener(final OnZoomChangeListener listener) {
- mDispatchThread.runJob(new Runnable() {
- @Override
- public void run() {
- mCameraHandler.obtainMessage(CameraActions.SET_ZOOM_CHANGE_LISTENER, listener)
- .sendToTarget();
- }
- });
+ try {
+ mDispatchThread.runJob(new Runnable() {
+ @Override
+ public void run() {
+ mCameraHandler.obtainMessage(CameraActions.SET_ZOOM_CHANGE_LISTENER, listener)
+ .sendToTarget();
+ }
+ });
+ } catch (final RuntimeException ex) {
+ mCameraAgent.getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
@Override
public void setFaceDetectionCallback(final Handler handler,
final CameraFaceDetectionCallback cb) {
- mDispatchThread.runJob(new Runnable() {
- @Override
- public void run() {
- mCameraHandler.obtainMessage(CameraActions.SET_FACE_DETECTION_LISTENER,
- FaceDetectionCallbackForward
- .getNewInstance(handler, AndroidCameraProxyImpl.this, cb))
- .sendToTarget();
- }
- });
- }
-
- @Override
- public void setErrorCallback(final Handler handler, final CameraErrorCallback cb) {
- mDispatchThread.runJob(new Runnable() {
- @Override
- public void run() {
- mCameraHandler.obtainMessage(CameraActions.SET_ERROR_CALLBACK,
- ErrorCallbackForward.getNewInstance(
- handler, AndroidCameraProxyImpl.this, cb))
- .sendToTarget();
- }
- });
+ try {
+ mDispatchThread.runJob(new Runnable() {
+ @Override
+ public void run() {
+ mCameraHandler.obtainMessage(CameraActions.SET_FACE_DETECTION_LISTENER,
+ FaceDetectionCallbackForward
+ .getNewInstance(handler, AndroidCameraProxyImpl.this, cb))
+ .sendToTarget();
+ }
+ });
+ } catch (final RuntimeException ex) {
+ mCameraAgent.getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
@Deprecated
@@ -896,15 +985,19 @@ class AndroidCameraAgentImpl extends CameraAgent {
return;
}
final String flattenedParameters = params.flatten();
- mDispatchThread.runJob(new Runnable() {
- @Override
- public void run() {
- mCameraState.waitForStates(AndroidCameraStateHolder.CAMERA_IDLE |
- AndroidCameraStateHolder.CAMERA_UNLOCKED);
- mCameraHandler.obtainMessage(CameraActions.SET_PARAMETERS, flattenedParameters)
- .sendToTarget();
- }
- });
+ try {
+ mDispatchThread.runJob(new Runnable() {
+ @Override
+ public void run() {
+ mCameraState.waitForStates(AndroidCameraStateHolder.CAMERA_IDLE |
+ AndroidCameraStateHolder.CAMERA_UNLOCKED);
+ mCameraHandler.obtainMessage(CameraActions.SET_PARAMETERS, flattenedParameters)
+ .sendToTarget();
+ }
+ });
+ } catch (final RuntimeException ex) {
+ mCameraAgent.getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
@Deprecated
@@ -912,14 +1005,18 @@ class AndroidCameraAgentImpl extends CameraAgent {
public Parameters getParameters() {
final WaitDoneBundle bundle = new WaitDoneBundle();
final Parameters[] parametersHolder = new Parameters[1];
- mDispatchThread.runJobSync(new Runnable() {
- @Override
- public void run() {
- mCameraHandler.obtainMessage(
- CameraActions.GET_PARAMETERS, parametersHolder).sendToTarget();
- mCameraHandler.post(bundle.mUnlockRunnable);
- }
- }, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "get parameters");
+ try {
+ mDispatchThread.runJobSync(new Runnable() {
+ @Override
+ public void run() {
+ mCameraHandler.obtainMessage(
+ CameraActions.GET_PARAMETERS, parametersHolder).sendToTarget();
+ mCameraHandler.post(bundle.mUnlockRunnable);
+ }
+ }, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "get parameters");
+ } catch (final RuntimeException ex) {
+ mCameraAgent.getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
return parametersHolder[0];
}
@@ -1029,49 +1126,6 @@ class AndroidCameraAgentImpl extends CameraAgent {
}
}
- /**
- * A helper class to forward ErrorCallback to another thread.
- */
- private static class ErrorCallbackForward implements Camera.ErrorCallback {
- private final Handler mHandler;
- private final CameraProxy mCamera;
- private final CameraErrorCallback mCallback;
-
- /**
- * Returns a new instance of {@link AFCallbackForward}.
- *
- * @param handler The handler in which the callback will be invoked in.
- * @param camera The {@link CameraProxy} which the callback is from.
- * @param cb The callback to be invoked.
- * @return The instance of the {@link AFCallbackForward},
- * or null if any parameter is null.
- */
- public static ErrorCallbackForward getNewInstance(
- Handler handler, CameraProxy camera, CameraErrorCallback cb) {
- if (handler == null || camera == null || cb == null) {
- return null;
- }
- return new ErrorCallbackForward(handler, camera, cb);
- }
-
- private ErrorCallbackForward(
- Handler h, CameraProxy camera, CameraErrorCallback cb) {
- mHandler = h;
- mCamera = camera;
- mCallback = cb;
- }
-
- @Override
- public void onError(final int error, Camera camera) {
- mHandler.post(new Runnable() {
- @Override
- public void run() {
- mCallback.onError(error, mCamera);
- }
- });
- }
- }
-
/** A helper class to forward AutoFocusMoveCallback to another thread. */
@TargetApi(Build.VERSION_CODES.JELLY_BEAN)
private static class AFMoveCallbackForward implements AutoFocusMoveCallback {
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
index 84b44e6..9892d4a 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraCapabilities.java
@@ -47,7 +47,6 @@ class AndroidCameraCapabilities extends CameraCapabilities {
mPreferredPreviewSizeForVideo = new Size(p.getPreferredPreviewSizeForVideo());
mSupportedPreviewFormats.addAll(p.getSupportedPreviewFormats());
mSupportedPhotoFormats.addAll(p.getSupportedPictureFormats());
- mMaxZoomRatio = p.getZoomRatios().get(p.getMaxZoom()) / ZOOM_MULTIPLIER;
mHorizontalViewAngle = p.getHorizontalViewAngle();
mVerticalViewAngle = p.getVerticalViewAngle();
buildPreviewFpsRange(p);
@@ -60,6 +59,7 @@ class AndroidCameraCapabilities extends CameraCapabilities {
buildWhiteBalances(p);
if (p.isZoomSupported()) {
+ mMaxZoomRatio = p.getZoomRatios().get(p.getMaxZoom()) / ZOOM_MULTIPLIER;
mSupportedFeatures.add(Feature.ZOOM);
}
if (p.isVideoSnapshotSupported()) {
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
index ee69b54..4558fe3 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/AndroidCameraSettings.java
@@ -17,15 +17,23 @@
package com.android.ex.camera2.portability;
import android.hardware.Camera;
+import com.android.ex.camera2.portability.debug.Log;
/**
* The subclass of {@link CameraSettings} for Android Camera 1 API.
*/
public class AndroidCameraSettings extends CameraSettings {
+ private static final Log.Tag TAG = new Log.Tag("AndCamSet");
+
private static final String TRUE = "true";
private static final String RECORDING_HINT = "recording-hint";
public AndroidCameraSettings(CameraCapabilities capabilities, Camera.Parameters params) {
+ if (params == null) {
+ Log.w(TAG, "Settings ctor requires a non-null Camera.Parameters.");
+ return;
+ }
+
CameraCapabilities.Stringifier stringifier = capabilities.getStringifier();
setSizesLocked(false);
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
index aae122b..63b1fec 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraActions.java
@@ -42,14 +42,82 @@ class CameraActions {
public static final int CANCEL_AUTO_FOCUS = 302;
public static final int SET_AUTO_FOCUS_MOVE_CALLBACK = 303;
public static final int SET_ZOOM_CHANGE_LISTENER = 304;
+ public static final int CANCEL_AUTO_FOCUS_FINISH = 305;
// Face detection
public static final int SET_FACE_DETECTION_LISTENER = 461;
public static final int START_FACE_DETECTION = 462;
public static final int STOP_FACE_DETECTION = 463;
- public static final int SET_ERROR_CALLBACK = 464;
// Presentation
public static final int ENABLE_SHUTTER_SOUND = 501;
public static final int SET_DISPLAY_ORIENTATION = 502;
+ public static final int SET_JPEG_ORIENTATION = 503;
// Capture
public static final int CAPTURE_PHOTO = 601;
+
+ public static String stringify(int action) {
+ switch (action) {
+ case OPEN_CAMERA:
+ return "OPEN_CAMERA";
+ case RELEASE:
+ return "RELEASE";
+ case RECONNECT:
+ return "RECONNECT";
+ case UNLOCK:
+ return "UNLOCK";
+ case LOCK:
+ return "LOCK";
+ case SET_PREVIEW_TEXTURE_ASYNC:
+ return "SET_PREVIEW_TEXTURE_ASYNC";
+ case START_PREVIEW_ASYNC:
+ return "START_PREVIEW_ASYNC";
+ case STOP_PREVIEW:
+ return "STOP_PREVIEW";
+ case SET_PREVIEW_CALLBACK_WITH_BUFFER:
+ return "SET_PREVIEW_CALLBACK_WITH_BUFFER";
+ case ADD_CALLBACK_BUFFER:
+ return "ADD_CALLBACK_BUFFER";
+ case SET_PREVIEW_DISPLAY_ASYNC:
+ return "SET_PREVIEW_DISPLAY_ASYNC";
+ case SET_PREVIEW_CALLBACK:
+ return "SET_PREVIEW_CALLBACK";
+ case SET_ONE_SHOT_PREVIEW_CALLBACK:
+ return "SET_ONE_SHOT_PREVIEW_CALLBACK";
+ case SET_PARAMETERS:
+ return "SET_PARAMETERS";
+ case GET_PARAMETERS:
+ return "GET_PARAMETERS";
+ case REFRESH_PARAMETERS:
+ return "REFRESH_PARAMETERS";
+ case APPLY_SETTINGS:
+ return "APPLY_SETTINGS";
+ case AUTO_FOCUS:
+ return "AUTO_FOCUS";
+ case CANCEL_AUTO_FOCUS:
+ return "CANCEL_AUTO_FOCUS";
+ case SET_AUTO_FOCUS_MOVE_CALLBACK:
+ return "SET_AUTO_FOCUS_MOVE_CALLBACK";
+ case SET_ZOOM_CHANGE_LISTENER:
+ return "SET_ZOOM_CHANGE_LISTENER";
+ case CANCEL_AUTO_FOCUS_FINISH:
+ return "CANCEL_AUTO_FOCUS_FINISH";
+ case SET_FACE_DETECTION_LISTENER:
+ return "SET_FACE_DETECTION_LISTENER";
+ case START_FACE_DETECTION:
+ return "START_FACE_DETECTION";
+ case STOP_FACE_DETECTION:
+ return "STOP_FACE_DETECTION";
+ case ENABLE_SHUTTER_SOUND:
+ return "ENABLE_SHUTTER_SOUND";
+ case SET_DISPLAY_ORIENTATION:
+ return "SET_DISPLAY_ORIENTATION";
+ case CAPTURE_PHOTO:
+ return "CAPTURE_PHOTO";
+ default:
+ return "UNKNOWN(" + action + ")";
+ }
+ }
+
+ private CameraActions() {
+ throw new AssertionError();
+ }
}
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
index b624b47..66762fd 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraAgent.java
@@ -23,6 +23,7 @@ import android.hardware.Camera.OnZoomChangeListener;
import android.os.Build;
import android.os.Handler;
import android.os.Looper;
+import android.os.Message;
import android.view.SurfaceHolder;
import com.android.ex.camera2.portability.debug.Log;
@@ -42,7 +43,7 @@ import com.android.ex.camera2.portability.debug.Log;
* {@code android.hardware.Camera.OnZoomChangeListener}, and
*/
public abstract class CameraAgent {
- public static final long CAMERA_OPERATION_TIMEOUT_MS = 2500;
+ public static final long CAMERA_OPERATION_TIMEOUT_MS = 3500;
private static final Log.Tag TAG = new Log.Tag("CamAgnt");
@@ -154,14 +155,6 @@ public abstract class CameraAgent {
}
/**
- * A handler for all camera api runtime exceptions.
- * The default behavior is to throw the runtime exception.
- */
- public static interface CameraExceptionCallback {
- public void onCameraException(RuntimeException e);
- }
-
- /**
* An interface which wraps
* {@link android.hardware.Camera.ErrorCallback}
*/
@@ -292,12 +285,17 @@ public abstract class CameraAgent {
*/
public void openCamera(final Handler handler, final int cameraId,
final CameraOpenCallback callback) {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().obtainMessage(CameraActions.OPEN_CAMERA, cameraId, 0,
- CameraOpenCallbackForward.getNewInstance(handler, callback)).sendToTarget();
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler().obtainMessage(CameraActions.OPEN_CAMERA, cameraId, 0,
+ CameraOpenCallbackForward.getNewInstance(handler, callback)).sendToTarget();
+ }
+ });
+ } catch (final RuntimeException ex) {
+ getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -307,22 +305,30 @@ public abstract class CameraAgent {
* @param synced Whether this call should be synchronous.
*/
public void closeCamera(CameraProxy camera, boolean synced) {
- if (synced) {
- final WaitDoneBundle bundle = new WaitDoneBundle();
-
- getDispatchThread().runJobSync(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().obtainMessage(CameraActions.RELEASE).sendToTarget();
- getCameraHandler().post(bundle.mUnlockRunnable);
- }}, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "camera release");
- } else {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().removeCallbacksAndMessages(null);
- getCameraHandler().obtainMessage(CameraActions.RELEASE).sendToTarget();
- }});
+ try {
+ if (synced) {
+ // Don't bother to wait since camera is in bad state.
+ if (getCameraState().isInvalid()) {
+ return;
+ }
+ final WaitDoneBundle bundle = new WaitDoneBundle();
+
+ getDispatchThread().runJobSync(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler().obtainMessage(CameraActions.RELEASE).sendToTarget();
+ getCameraHandler().post(bundle.mUnlockRunnable);
+ }}, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "camera release");
+ } else {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler().removeCallbacksAndMessages(null);
+ getCameraHandler().obtainMessage(CameraActions.RELEASE).sendToTarget();
+ }});
+ }
+ } catch (final RuntimeException ex) {
+ getCameraExceptionHandler().onDispatchThreadException(ex);
}
}
@@ -330,8 +336,7 @@ public abstract class CameraAgent {
* Sets a callback for handling camera api runtime exceptions on
* a handler.
*/
- public abstract void setCameraDefaultExceptionCallback(CameraExceptionCallback callback,
- Handler handler);
+ public abstract void setCameraExceptionHandler(CameraExceptionHandler exceptionHandler);
/**
* Recycles the resources used by this instance. CameraAgent will be in
@@ -355,11 +360,21 @@ public abstract class CameraAgent {
protected abstract DispatchThread getDispatchThread();
/**
+ * @return The state machine tracking the camera API's current status.
+ */
+ protected abstract CameraStateHolder getCameraState();
+
+ /**
+ * @return The exception handler.
+ */
+ protected abstract CameraExceptionHandler getCameraExceptionHandler();
+
+ /**
* An interface that takes camera operation requests and post messages to the
* camera handler thread. All camera operations made through this interface is
* asynchronous by default except those mentioned specifically.
*/
- public static abstract class CameraProxy {
+ public abstract static class CameraProxy {
/**
* Returns the underlying {@link android.hardware.Camera} object used
@@ -387,6 +402,11 @@ public abstract class CameraAgent {
public abstract CameraCapabilities getCapabilities();
/**
+ * @return The camera agent which creates this proxy.
+ */
+ public abstract CameraAgent getAgent();
+
+ /**
* Reconnects to the camera device. On success, the camera device will
* be returned through {@link CameraAgent
* .CameraOpenCallback#onCameraOpened(com.android.camera.cameradevice.CameraAgent
@@ -398,12 +418,16 @@ public abstract class CameraAgent {
* @param cb The callback when any error happens.
*/
public void reconnect(final Handler handler, final CameraOpenCallback cb) {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().obtainMessage(CameraActions.RECONNECT, getCameraId(), 0,
- CameraOpenCallbackForward.getNewInstance(handler, cb)).sendToTarget();
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler().obtainMessage(CameraActions.RECONNECT, getCameraId(), 0,
+ CameraOpenCallbackForward.getNewInstance(handler, cb)).sendToTarget();
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -412,13 +436,22 @@ public abstract class CameraAgent {
* @see android.hardware.Camera#unlock()
*/
public void unlock() {
+ // Don't bother to wait since camera is in bad state.
+ if (getCameraState().isInvalid()) {
+ return;
+ }
final WaitDoneBundle bundle = new WaitDoneBundle();
- getDispatchThread().runJobSync(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().sendEmptyMessage(CameraActions.UNLOCK);
- getCameraHandler().post(bundle.mUnlockRunnable);
- }}, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "camera unlock");
+ try {
+ getDispatchThread().runJobSync(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler().sendEmptyMessage(CameraActions.UNLOCK);
+ getCameraHandler().post(bundle.mUnlockRunnable);
+ }
+ }, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "camera unlock");
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -426,11 +459,15 @@ public abstract class CameraAgent {
* @see android.hardware.Camera#lock()
*/
public void lock() {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().sendEmptyMessage(CameraActions.LOCK);
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler().sendEmptyMessage(CameraActions.LOCK);
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -455,13 +492,17 @@ public abstract class CameraAgent {
// the STOP_PREVIEW case in its handler; in the meantime, changing API 2
// sizes would require closing and reopening the camera.
public void setPreviewTexture(final SurfaceTexture surfaceTexture) {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler()
- .obtainMessage(CameraActions.SET_PREVIEW_TEXTURE_ASYNC, surfaceTexture)
- .sendToTarget();
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler()
+ .obtainMessage(CameraActions.SET_PREVIEW_TEXTURE_ASYNC, surfaceTexture)
+ .sendToTarget();
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -479,15 +520,23 @@ public abstract class CameraAgent {
* @see CameraSettings#setPreviewSize
*/
public void setPreviewTextureSync(final SurfaceTexture surfaceTexture) {
+ // Don't bother to wait since camera is in bad state.
+ if (getCameraState().isInvalid()) {
+ return;
+ }
final WaitDoneBundle bundle = new WaitDoneBundle();
- getDispatchThread().runJobSync(new Runnable() {
- @Override
- public void run() {
- getCameraHandler()
- .obtainMessage(CameraActions.SET_PREVIEW_TEXTURE_ASYNC, surfaceTexture)
- .sendToTarget();
- getCameraHandler().post(bundle.mUnlockRunnable);
- }}, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "set preview texture");
+ try {
+ getDispatchThread().runJobSync(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler()
+ .obtainMessage(CameraActions.SET_PREVIEW_TEXTURE_ASYNC, surfaceTexture)
+ .sendToTarget();
+ getCameraHandler().post(bundle.mUnlockRunnable);
+ }}, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "set preview texture");
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -496,25 +545,33 @@ public abstract class CameraAgent {
* @param surfaceHolder The {@link SurfaceHolder} for preview.
*/
public void setPreviewDisplay(final SurfaceHolder surfaceHolder) {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler()
- .obtainMessage(CameraActions.SET_PREVIEW_DISPLAY_ASYNC, surfaceHolder)
- .sendToTarget();
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler()
+ .obtainMessage(CameraActions.SET_PREVIEW_DISPLAY_ASYNC, surfaceHolder)
+ .sendToTarget();
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
* Starts the camera preview.
*/
public void startPreview() {
+ try {
getDispatchThread().runJob(new Runnable() {
@Override
public void run() {
getCameraHandler()
.obtainMessage(CameraActions.START_PREVIEW_ASYNC, null).sendToTarget();
}});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -522,6 +579,7 @@ public abstract class CameraAgent {
* the preview starts.
*/
public void startPreviewWithCallback(final Handler h, final CameraStartPreviewCallback cb) {
+ try {
getDispatchThread().runJob(new Runnable() {
@Override
public void run() {
@@ -529,6 +587,9 @@ public abstract class CameraAgent {
CameraStartPreviewCallbackForward.getNewInstance(h, cb))
.sendToTarget();
}});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -537,13 +598,21 @@ public abstract class CameraAgent {
* continues to release resources related to camera preview.
*/
public void stopPreview() {
+ // Don't bother to wait since camera is in bad state.
+ if (getCameraState().isInvalid()) {
+ return;
+ }
final WaitDoneBundle bundle = new WaitDoneBundle();
- getDispatchThread().runJobSync(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().sendEmptyMessage(CameraActions.STOP_PREVIEW);
- getCameraHandler().post(bundle.mUnlockRunnable);
- }}, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "stop preview");
+ try {
+ getDispatchThread().runJobSync(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler().obtainMessage(CameraActions.STOP_PREVIEW, bundle)
+ .sendToTarget();
+ }}, bundle.mWaitLock, CAMERA_OPERATION_TIMEOUT_MS, "stop preview");
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -582,14 +651,18 @@ public abstract class CameraAgent {
* @param callbackBuffer The buffer allocated for the preview data.
*/
public void addCallbackBuffer(final byte[] callbackBuffer) {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler()
- .obtainMessage(CameraActions.ADD_CALLBACK_BUFFER, callbackBuffer)
- .sendToTarget();
- }
- });
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler()
+ .obtainMessage(CameraActions.ADD_CALLBACK_BUFFER, callbackBuffer)
+ .sendToTarget();
+ }
+ });
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -602,14 +675,18 @@ public abstract class CameraAgent {
/**
* Cancels the auto-focus process.
+ *
+ * <p>This action has the highest priority and will get processed before anything
+ * else that is pending. Moreover, any pending auto-focuses that haven't yet
+ * began will also be ignored.</p>
*/
public void cancelAutoFocus() {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().removeMessages(CameraActions.AUTO_FOCUS);
- getCameraHandler().sendEmptyMessage(CameraActions.CANCEL_AUTO_FOCUS);
- }});
+ // Do not use the dispatch thread since we want to avoid a wait-cycle
+ // between applySettingsHelper which waits until the state is not FOCUSING.
+ // cancelAutoFocus should get executed asap, set the state back to idle.
+ getCameraHandler().sendMessageAtFrontOfQueue(
+ getCameraHandler().obtainMessage(CameraActions.CANCEL_AUTO_FOCUS));
+ getCameraHandler().sendEmptyMessage(CameraActions.CANCEL_AUTO_FOCUS_FINISH);
}
/**
@@ -662,14 +739,32 @@ public abstract class CameraAgent {
* @param capture Whether to adjust the JPEG capture orientation as well as the preview one.
*/
public void setDisplayOrientation(final int degrees, final boolean capture) {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler()
- .obtainMessage(CameraActions.SET_DISPLAY_ORIENTATION, degrees,
- capture ? 1 : 0)
- .sendToTarget();
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler()
+ .obtainMessage(CameraActions.SET_DISPLAY_ORIENTATION, degrees,
+ capture ? 1 : 0)
+ .sendToTarget();
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
+ }
+
+ public void setJpegOrientation(final int degrees) {
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler()
+ .obtainMessage(CameraActions.SET_JPEG_ORIENTATION, degrees, 0)
+ .sendToTarget();
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -692,34 +787,33 @@ public abstract class CameraAgent {
* Starts the face detection.
*/
public void startFaceDetection() {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().sendEmptyMessage(CameraActions.START_FACE_DETECTION);
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler().sendEmptyMessage(CameraActions.START_FACE_DETECTION);
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
* Stops the face detection.
*/
public void stopFaceDetection() {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().sendEmptyMessage(CameraActions.STOP_FACE_DETECTION);
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler().sendEmptyMessage(CameraActions.STOP_FACE_DETECTION);
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
- * Registers an error callback.
- *
- * @param handler The handler on which the callback will be invoked.
- * @param cb The error callback.
- * @see android.hardware.Camera#setErrorCallback(android.hardware.Camera.ErrorCallback)
- */
- public abstract void setErrorCallback(Handler handler, CameraErrorCallback cb);
-
- /**
* Sets the camera parameters.
*
* @param params The camera parameters to use.
@@ -765,19 +859,31 @@ public abstract class CameraAgent {
}
final CameraSettings copyOfSettings = settings.copy();
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraState().waitForStates(statesToAwait);
- getCameraHandler().obtainMessage(CameraActions.APPLY_SETTINGS, copyOfSettings)
- .sendToTarget();
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ CameraStateHolder cameraState = getCameraState();
+ // Don't bother to wait since camera is in bad state.
+ if (cameraState.isInvalid()) {
+ return;
+ }
+ cameraState.waitForStates(statesToAwait);
+ getCameraHandler().obtainMessage(CameraActions.APPLY_SETTINGS, copyOfSettings)
+ .sendToTarget();
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
return true;
}
/**
* Applies the settings to the camera device.
*
+ * <p>If the camera is either focusing or capturing; settings applications
+ * will be (asynchronously) deferred until those operations complete.</p>
+ *
* @param settings The settings to use on the device.
* @return Whether the settings can be applied.
*/
@@ -788,11 +894,15 @@ public abstract class CameraAgent {
* settings regardless of the dirty bit.
*/
public void refreshSettings() {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler().sendEmptyMessage(CameraActions.REFRESH_PARAMETERS);
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler().sendEmptyMessage(CameraActions.REFRESH_PARAMETERS);
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -802,13 +912,17 @@ public abstract class CameraAgent {
* {@code false} to disable it.
*/
public void enableShutterSound(final boolean enable) {
- getDispatchThread().runJob(new Runnable() {
- @Override
- public void run() {
- getCameraHandler()
- .obtainMessage(CameraActions.ENABLE_SHUTTER_SOUND, (enable ? 1 : 0), 0)
- .sendToTarget();
- }});
+ try {
+ getDispatchThread().runJob(new Runnable() {
+ @Override
+ public void run() {
+ getCameraHandler()
+ .obtainMessage(CameraActions.ENABLE_SHUTTER_SOUND, (enable ? 1 : 0), 0)
+ .sendToTarget();
+ }});
+ } catch (final RuntimeException ex) {
+ getAgent().getCameraExceptionHandler().onDispatchThreadException(ex);
+ }
}
/**
@@ -851,5 +965,20 @@ public abstract class CameraAgent {
}
}};
}
+
+ /**
+ * Notify all synchronous waiters waiting on message completion with {@link #mWaitLock}.
+ *
+ * <p>This assumes that the message was sent with {@code this} as the {@code Message#obj}.
+ * Otherwise the message is ignored.</p>
+ */
+ /*package*/ static void unblockSyncWaiters(Message msg) {
+ if (msg == null) return;
+
+ if (msg.obj instanceof WaitDoneBundle) {
+ WaitDoneBundle bundle = (WaitDoneBundle)msg.obj;
+ bundle.mUnlockRunnable.run();
+ }
+ }
}
}
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
index 60c8cb2..31c47d3 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraCapabilities.java
@@ -22,6 +22,7 @@ import java.util.ArrayList;
import java.util.EnumSet;
import java.util.HashSet;
import java.util.List;
+import java.util.Locale;
import java.util.Set;
import java.util.TreeSet;
@@ -323,17 +324,17 @@ public class CameraCapabilities {
* @return The converted string.
*/
private static String toApiCase(String enumCase) {
- return enumCase.toLowerCase().replaceAll("_", "-");
+ return enumCase.toLowerCase(Locale.US).replaceAll("_", "-");
}
/**
- * Conerts the string to underscore-delimited uppercase to match the enum constant names.
+ * Converts the string to underscore-delimited uppercase to match the enum constant names.
*
* @param apiCase An API-related string representation.
* @return The converted string.
*/
private static String toEnumCase(String apiCase) {
- return apiCase.toUpperCase().replaceAll("-", "_");
+ return apiCase.toUpperCase(Locale.US).replaceAll("-", "_");
}
/**
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraExceptionHandler.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraExceptionHandler.java
new file mode 100644
index 0000000..dc71b4b
--- /dev/null
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraExceptionHandler.java
@@ -0,0 +1,123 @@
+/*
+ * Copyright (C) 2012 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.ex.camera2.portability;
+
+import android.os.Handler;
+
+/**
+ * A handler for all camera api runtime exceptions.
+ * The default behavior is to throw the runtime exception.
+ */
+public class CameraExceptionHandler {
+ private Handler mHandler;
+
+ private CameraExceptionCallback mCallback =
+ new CameraExceptionCallback() {
+ @Override
+ public void onCameraError(int errorCode) {
+ }
+ @Override
+ public void onCameraException(
+ RuntimeException e, String commandHistory, int action, int state) {
+ throw e;
+ }
+ @Override
+ public void onDispatchThreadException(RuntimeException e) {
+ throw e;
+ }
+ };
+
+ /**
+ * A callback helps to handle RuntimeException thrown by camera framework.
+ */
+ public static interface CameraExceptionCallback {
+ public void onCameraError(int errorCode);
+ public void onCameraException(
+ RuntimeException e, String commandHistory, int action, int state);
+ public void onDispatchThreadException(RuntimeException e);
+ }
+
+ /**
+ * Construct a new instance of {@link CameraExceptionHandler} with a custom callback which will
+ * be executed on a specific {@link Handler}.
+ *
+ * @param callback The callback which will be invoked.
+ * @param handler The handler in which the callback will be invoked in.
+ */
+ public CameraExceptionHandler(CameraExceptionCallback callback, Handler handler) {
+ mHandler = handler;
+ mCallback = callback;
+ }
+
+ /**
+ * Construct a new instance of {@link CameraExceptionHandler} with a default callback which will
+ * be executed on a specific {@link Handler}.
+ *
+ * @param handler The handler in which the default callback will be invoked in.
+ */
+ public CameraExceptionHandler(Handler handler) {
+ mHandler = handler;
+ }
+
+ /**
+ * Invoke @{link CameraExceptionCallback} when an error is reported by Android camera framework.
+ *
+ * @param errorCode An integer to represent the error code.
+ * @see android.hardware.Camera#setErrorCallback(android.hardware.Camera.ErrorCallback)
+ */
+ public void onCameraError(final int errorCode) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mCallback.onCameraError(errorCode);
+ }
+ });
+ }
+
+ /**
+ * Invoke @{link CameraExceptionCallback} when a runtime exception is thrown by Android camera
+ * framework.
+ *
+ * @param ex The runtime exception object.
+ */
+ public void onCameraException(
+ final RuntimeException ex, final String commandHistory,
+ final int action, final int state) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mCallback.onCameraException(ex, commandHistory, action, state);
+ }
+ });
+ }
+
+ /**
+ * Invoke @{link CameraExceptionCallback} when a runtime exception is thrown by
+ * @{link DispatchThread}.
+ *
+ * @param ex The runtime exception object.
+ */
+ public void onDispatchThreadException(final RuntimeException ex) {
+ mHandler.post(new Runnable() {
+ @Override
+ public void run() {
+ mCallback.onDispatchThreadException(ex);
+ }
+ });
+ }
+}
+
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
index 87e9adf..ccd980a 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraSettings.java
@@ -58,7 +58,7 @@ public abstract class CameraSettings {
protected boolean mAutoWhiteBalanceLocked;
protected boolean mRecordingHintEnabled;
protected GpsData mGpsData;
- protected Size mExifThumbnailSize = new Size(0,0);
+ protected Size mExifThumbnailSize;
/**
* An immutable class storing GPS related information.
@@ -491,20 +491,22 @@ public abstract class CameraSettings {
}
/**
- * Sets the size of the thumbnail in EXIF header.
+ * Sets the size of the thumbnail in EXIF header. To suppress thumbnail
+ * generation, set a size of (0,0).
*
- * @param s The size for the thumbnail. {@code null} will clear the size to
- * (0,0).
+ * @param s The size for the thumbnail. If {@code null}, agent will not
+ * set a thumbnail size.
*/
public void setExifThumbnailSize(Size s) {
- if (s != null) {
- mExifThumbnailSize = s;
- } else {
- mExifThumbnailSize = new Size(0,0);
- }
+ mExifThumbnailSize = s;
}
+ /**
+ * Gets the size of the thumbnail in EXIF header.
+ *
+ * @return desired thumbnail size, or null if no size was set
+ */
public Size getExifThumbnailSize() {
- return new Size(mExifThumbnailSize);
+ return (mExifThumbnailSize == null) ? null : new Size(mExifThumbnailSize);
}
}
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java b/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
index 35ae51c..b758af2 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/CameraStateHolder.java
@@ -24,20 +24,56 @@ public abstract class CameraStateHolder {
private static final Log.Tag TAG = new Log.Tag("CamStateHolder");
private int mState;
+ private boolean mInvalid;
+ /**
+ * Construct a new instance of @{link CameraStateHolder} with an initial state.
+ *
+ * @param state The initial state.
+ */
public CameraStateHolder(int state) {
setState(state);
+ mInvalid = false;
}
+ /**
+ * Change to a new state.
+ *
+ * @param state The new state.
+ */
public synchronized void setState(int state) {
+ if (mState != state) {
+ Log.v(TAG, "setState - state = " + Integer.toBinaryString(state));
+ }
mState = state;
this.notifyAll();
}
+ /**
+ * Obtain the current state.
+ *
+ * @return The current state.
+ */
public synchronized int getState() {
return mState;
}
+ /**
+ * Change the state to be invalid. Once invalidated, the state will be invalid forever.
+ */
+ public synchronized void invalidate() {
+ mInvalid = true;
+ }
+
+ /**
+ * Whether the state is invalid.
+ *
+ * @return True if the state is invalid.
+ */
+ public synchronized boolean isInvalid() {
+ return mInvalid;
+ }
+
private static interface ConditionChecker {
/**
* @return Whether the condition holds.
@@ -83,6 +119,7 @@ public abstract class CameraStateHolder {
* reached.
*/
public boolean waitForStates(final int states) {
+ Log.v(TAG, "waitForStates - states = " + Integer.toBinaryString(states));
return waitForCondition(new ConditionChecker() {
@Override
public boolean success() {
@@ -100,6 +137,7 @@ public abstract class CameraStateHolder {
* reached.
*/
public boolean waitToAvoidStates(final int states) {
+ Log.v(TAG, "waitToAvoidStates - states = " + Integer.toBinaryString(states));
return waitForCondition(new ConditionChecker() {
@Override
public boolean success() {
diff --git a/camera2/portability/src/com/android/ex/camera2/portability/HistoryHandler.java b/camera2/portability/src/com/android/ex/camera2/portability/HistoryHandler.java
index ec2a555..6b1c5ab 100644
--- a/camera2/portability/src/com/android/ex/camera2/portability/HistoryHandler.java
+++ b/camera2/portability/src/com/android/ex/camera2/portability/HistoryHandler.java
@@ -35,6 +35,10 @@ class HistoryHandler extends Handler {
mMsgHistory.offerLast(-1);
}
+ Integer getCurrentMessage() {
+ return mMsgHistory.peekLast();
+ }
+
String generateHistoryString(int cameraId) {
String info = new String("HIST");
info += "_ID" + cameraId;
diff --git a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java
index 4fb2c43..f55437f 100644
--- a/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java
+++ b/camera2/public/src/com/android/ex/camera2/blocking/BlockingCaptureCallback.java
@@ -123,8 +123,8 @@ public class BlockingCaptureCallback extends CameraCaptureSession.CaptureCallbac
@Override
public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
- long timestamp) {
- if (mProxy != null) mProxy.onCaptureStarted(session, request, timestamp);
+ long timestamp, long frameNumber) {
+ if (mProxy != null) mProxy.onCaptureStarted(session, request, timestamp, frameNumber);
mStateChangeListener.onStateChanged(CAPTURE_STARTED);
}
diff --git a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java
index 97b5b6e..e6988b5 100644
--- a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java
+++ b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackForwarder.java
@@ -89,11 +89,11 @@ public class Camera2CaptureCallbackForwarder extends CaptureCallback {
@Override
public void onCaptureStarted(final CameraCaptureSession session, final CaptureRequest request,
- final long timestamp) {
+ final long timestamp, final long frameNumber) {
mHandler.post(new Runnable() {
@Override
public void run() {
- mListener.onCaptureStarted(session, request, timestamp);
+ mListener.onCaptureStarted(session, request, timestamp, frameNumber);
}});
}
}
diff --git a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java
index f813076..86c6070 100644
--- a/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java
+++ b/camera2/utils/src/com/android/ex/camera2/utils/Camera2CaptureCallbackSplitter.java
@@ -87,9 +87,9 @@ public class Camera2CaptureCallbackSplitter extends CaptureCallback {
@Override
public void onCaptureStarted(CameraCaptureSession session, CaptureRequest request,
- long timestamp) {
+ long timestamp, long frameNumber) {
for (CaptureCallback target : mRecipients) {
- target.onCaptureStarted(session, request, timestamp);
+ target.onCaptureStarted(session, request, timestamp, frameNumber);
}
}
}
diff --git a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
index 3156cf7..ea320a7 100644
--- a/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
+++ b/camera2/utils/tests/src/com/android/ex/camera2/utils/Camera2UtilsTest.java
@@ -55,9 +55,9 @@ public class Camera2UtilsTest extends Camera2DeviceTester {
for (CaptureCallback each : terminals) {
verify(each).onCaptureSequenceCompleted(null, 0, 0L);
}
- splitter.onCaptureStarted(null, null, 0L);
+ splitter.onCaptureStarted(null, null, 0L, 1L);
for (CaptureCallback each : terminals) {
- verify(each).onCaptureStarted(null, null, 0L);
+ verify(each).onCaptureStarted(null, null, 0L, 1L);
}
}
diff --git a/common/java/com/android/common/widget/CompositeCursorAdapter.java b/common/java/com/android/common/widget/CompositeCursorAdapter.java
index dddbcf6..8a3fa9b 100644
--- a/common/java/com/android/common/widget/CompositeCursorAdapter.java
+++ b/common/java/com/android/common/widget/CompositeCursorAdapter.java
@@ -170,7 +170,12 @@ public abstract class CompositeCursorAdapter extends BaseAdapter {
mCount = 0;
for (Partition partition : mPartitions) {
Cursor cursor = partition.cursor;
- int count = cursor != null ? cursor.getCount() : 0;
+ int count;
+ if (cursor == null || cursor.isClosed()) {
+ count = 0;
+ } else {
+ count = cursor.getCount();
+ }
if (partition.hasHeader) {
if (count != 0 || partition.showIfEmpty) {
count++;
@@ -428,7 +433,9 @@ public abstract class CompositeCursorAdapter extends BaseAdapter {
return null;
}
Cursor cursor = mPartition.cursor;
- cursor.moveToPosition(offset);
+ if (cursor == null || cursor.isClosed() || !cursor.moveToPosition(offset)) {
+ return null;
+ }
return cursor;
}
start = end;