summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--v3/EmulatedBaseCamera.cpp11
-rw-r--r--v3/EmulatedBaseCamera.h9
-rw-r--r--v3/EmulatedCamera3.cpp11
-rw-r--r--v3/EmulatedCamera3.h2
-rwxr-xr-xv3/EmulatedCameraFactory.cpp43
-rwxr-xr-xv3/EmulatedFakeCamera3.cpp24
-rwxr-xr-xv3/EmulatedFakeCamera3.h4
-rwxr-xr-xv3/fake-pipeline2/Sensor.cpp5
-rwxr-xr-xv3/fake-pipeline2/camera_hw.cpp190
-rwxr-xr-xv3/fake-pipeline2/camera_hw.h5
10 files changed, 201 insertions, 103 deletions
diff --git a/v3/EmulatedBaseCamera.h b/v3/EmulatedBaseCamera.h
index 539b215..53cf329 100644
--- a/v3/EmulatedBaseCamera.h
+++ b/v3/EmulatedBaseCamera.h
@@ -33,6 +33,11 @@ namespace android {
* structures.
*/
+typedef enum camera_status {
+ CAMERA_INIT = 0,
+ CAMERA_READY_REMOVE,
+}camera_status_t;
+
class EmulatedBaseCamera {
public:
EmulatedBaseCamera(int cameraId,
@@ -52,7 +57,8 @@ class EmulatedBaseCamera {
* NO_ERROR on success, or an appropriate error status on failure.
*/
virtual status_t Initialize() = 0;
-
+ virtual void setCameraStatus(camera_status_t status) = 0;
+ virtual camera_status_t getCameraStatus() = 0;
/****************************************************************************
* Camera API implementation
***************************************************************************/
@@ -111,6 +117,7 @@ class EmulatedBaseCamera {
/* Version of the camera device HAL implemented by this camera */
int mCameraDeviceVersion;
+ camera_status_t mstatus;
};
} /* namespace android */