-rw-r--r-- | v3/EmulatedCameraFactory.cpp | 2 | ||||
-rw-r--r-- | v3/EmulatedFakeCamera3.cpp | 10 | ||||
-rw-r--r--[-rwxr-xr-x] | v3/fake-pipeline2/util.c | 2 |
3 files changed, 12 insertions, 2 deletions
diff --git a/v3/EmulatedCameraFactory.cpp b/v3/EmulatedCameraFactory.cpp index 42569fd..c5b255d 100644 --- a/v3/EmulatedCameraFactory.cpp +++ b/v3/EmulatedCameraFactory.cpp @@ -118,7 +118,7 @@ EmulatedCameraFactory::EmulatedCameraFactory() } mHotplugThread = new EmulatedCameraHotplugThread(&cameraIdVector[0], mEmulatedCameraNum); - mHotplugThread->run(); + mHotplugThread->run(""); } mConstructedOK = true; diff --git a/v3/EmulatedFakeCamera3.cpp b/v3/EmulatedFakeCamera3.cpp index b6b25c2..c4dae65 100644 --- a/v3/EmulatedFakeCamera3.cpp +++ b/v3/EmulatedFakeCamera3.cpp @@ -859,13 +859,21 @@ const camera_metadata_t* EmulatedFakeCamera3::constructDefaultRequestSettings( /** android.color */ +#if PLATFORM_SDK_VERSION >= 23 + static const camera_metadata_rational colorTransform[9] = { + {1, 1}, {0, 1}, {0, 1}, + {0, 1}, {1, 1}, {0, 1}, + {0, 1}, {0, 1}, {1, 1} + }; + settings.update(ANDROID_COLOR_CORRECTION_TRANSFORM, colorTransform, 9); +#else static const float colorTransform[9] = { 1.0f, 0.f, 0.f, 0.f, 1.f, 0.f, 0.f, 0.f, 1.f }; settings.update(ANDROID_COLOR_CORRECTION_TRANSFORM, colorTransform, 9); - +#endif /** android.tonemap */ static const float tonemapCurve[4] = { 0.f, 0.f, diff --git a/v3/fake-pipeline2/util.c b/v3/fake-pipeline2/util.c index 690f853..dd0e22b 100755..100644 --- a/v3/fake-pipeline2/util.c +++ b/v3/fake-pipeline2/util.c @@ -1,6 +1,8 @@ #include <utils/Log.h>
+#include <string.h>
#include "util.h"
+
#ifndef ALIGN
#define ALIGN(b,w) (((b)+((w)-1))/(w)*(w))
#endif
|