summaryrefslogtreecommitdiff
Diffstat
-rw-r--r--[-rwxr-xr-x]Android.mk7
-rw-r--r--v3/Android.mk8
-rw-r--r--v3/EmulatedFakeCamera3.cpp6
-rw-r--r--v3/fake-pipeline2/Sensor.cpp85
-rw-r--r--v3/fake-pipeline2/Sensor.h6
5 files changed, 94 insertions, 18 deletions
diff --git a/v3/EmulatedFakeCamera3.cpp b/v3/EmulatedFakeCamera3.cpp
index a23fa1d..2967de3 100644
--- a/v3/EmulatedFakeCamera3.cpp
+++ b/v3/EmulatedFakeCamera3.cpp
@@ -1712,8 +1712,10 @@ status_t EmulatedFakeCamera3::constructStaticInfo() {
lensPosition[1] = 20;
lensPosition[2] = 0;
}
+#if PLATFORM_SDK_VERSION <= 22
info.update(ANDROID_LENS_POSITION, lensPosition, sizeof(lensPosition)/
sizeof(float));
+#endif
static const uint8_t lensCalibration = ANDROID_LENS_INFO_FOCUS_DISTANCE_CALIBRATION_UNCALIBRATED;
info.update(ANDROID_LENS_INFO_FOCUS_DISTANCE_CALIBRATION,&lensCalibration,1);
@@ -2200,7 +2202,7 @@ status_t EmulatedFakeCamera3::doFakeAE(CameraMetadata &settings) {
// OK for AUTO modes
break;
default:
- ALOGE("%s: Emulator doesn't support AE mode %d",
+ ALOGVV("%s: Emulator doesn't support AE mode %d",
__FUNCTION__, aeMode);
return BAD_VALUE;
}
@@ -2776,7 +2778,7 @@ bool EmulatedFakeCamera3::ReadoutThread::threadLoop() {
return false;
}
- CAMHAL_LOGDB("Sensor done with readout for frame %d, captured at %lld ",
+ ALOGVV("Sensor done with readout for frame %d, captured at %lld ",
mCurrentRequest.frameNumber, captureTime);
// Check if we need to JPEG encode a buffer, and send it for async