Skip to content

Cancro : zsl and HDR fix #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tavisca-akatte wants to merge 3 commits into
base: lollipop-mr1
Choose a base branch
from
Open

Cancro : zsl and HDR fix #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cdb8738
Cancro: fix camera HDR overexposed photos
tavisca-akatte Nov 5, 2015
93bb2d5
Added zero shutter lag for cancro devices
tavisca-akatte Nov 6, 2015
8629d29
Corrected author
ajitkatte Nov 8, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 27 additions & 1 deletion camera/CameraWrapper.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,8 @@
#include <camera/Camera.h>
#include <camera/CameraParameters.h>

static char KEY_QC_MORPHO_HDR[] = "morpho-hdr";

static android::Mutex gCameraWrapperLock;
static camera_module_t *gVendorModule = 0;

Expand All @@ -54,7 +56,7 @@ camera_module_t HAL_MODULE_INFO_SYM = {
.hal_api_version = HARDWARE_HAL_API_VERSION,
.id = CAMERA_HARDWARE_MODULE_ID,
.name = "Cancro Camera Wrapper",
.author = "The Android Open Source Project",
.author = "The CyanogenMod Project",
.methods = &camera_module_methods,
.dso = NULL, /* remove compilation warnings */
.reserved = {0}, /* remove compilation warnings */
Expand Down Expand Up @@ -119,6 +121,9 @@ static char *camera_fixup_getparams(int id __attribute__((unused)),

static char *camera_fixup_setparams(int id, const char *settings)
{
bool videoMode = false;
bool hdrMode = false;

android::CameraParameters params;
params.unflatten(android::String8(settings));

Expand All @@ -129,6 +134,27 @@ static char *camera_fixup_setparams(int id, const char *settings)

params.set(android::CameraParameters::KEY_VIDEO_STABILIZATION, "false");

/* ZSL */
if (params.get(android::CameraParameters::KEY_RECORDING_HINT)) {
videoMode = !strcmp(params.get(android::CameraParameters::KEY_RECORDING_HINT), "true");
}
if (videoMode) {
params.set("zsl", "off");
} else {
params.set("zsl", "on");
}

/* HDR */
if (params.get(android::CameraParameters::KEY_SCENE_MODE)) {
hdrMode = (!strcmp(params.get(android::CameraParameters::KEY_SCENE_MODE), "hdr"));
}
if (hdrMode) {
params.set(KEY_QC_MORPHO_HDR, "true");
params.set(android::CameraParameters::KEY_FLASH_MODE, android::CameraParameters::FLASH_MODE_OFF);
} else {
params.set(KEY_QC_MORPHO_HDR, "false");
}

#if !LOG_NDEBUG
ALOGV("%s: fixed parameters:", __FUNCTION__);
params.dump();
Expand Down