summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--v3/EmulatedBaseCamera.cpp9
-rw-r--r--v3/EmulatedBaseCamera.h3
-rw-r--r--v3/EmulatedCamera3.cpp9
-rw-r--r--v3/EmulatedCamera3.h3
-rw-r--r--[-rwxr-xr-x]v3/EmulatedCameraFactory.cpp114
-rw-r--r--[-rwxr-xr-x]v3/EmulatedCameraFactory.h5
-rw-r--r--v3/EmulatedFakeCamera3.cpp27
-rw-r--r--v3/EmulatedFakeCamera3.h3
-rw-r--r--[-rwxr-xr-x]v3/fake-pipeline2/Sensor.cpp72
-rw-r--r--[-rwxr-xr-x]v3/fake-pipeline2/Sensor.h1
-rw-r--r--[-rwxr-xr-x]v3/fake-pipeline2/camera_hw.cpp5
-rw-r--r--[-rwxr-xr-x]v3/inc/DebugUtils.h5
12 files changed, 178 insertions, 78 deletions
diff --git a/v3/EmulatedBaseCamera.cpp b/v3/EmulatedBaseCamera.cpp
index 28b4063..70af1b5 100644
--- a/v3/EmulatedBaseCamera.cpp
+++ b/v3/EmulatedBaseCamera.cpp
@@ -55,15 +55,10 @@ EmulatedBaseCamera::~EmulatedBaseCamera()
{
}
-void EmulatedBaseCamera::setCameraStatus(camera_status_t status)
+bool EmulatedBaseCamera::getCameraStatus()
{
ALOGE("%s: do nothing", __FUNCTION__);
-}
-
-camera_status_t EmulatedBaseCamera::getCameraStatus()
-{
- ALOGE("%s: do nothing", __FUNCTION__);
- return CAMERA_READY_REMOVE;
+ return false;
}
status_t EmulatedBaseCamera::getCameraInfo(struct camera_info* info)