ADHOC
/
replicant-device_samsung_galaxys2-common
3
0
Fork 0
Code Issues Releases Activity

galaxys2: camera have iso 

Change-Id: I103e58d0f115bc4560c152e9747847ea5ed4ac01
This commit is contained in:
codeworkx 2012-12-02 15:48:43 +01:00
parent ddf7e489b9
commit 4ccae23384
2 changed files with 20 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
BoardCommonConfig.mk
View File

@ -30,11 +30,11 @@ TARGET_ARCH_VARIANT_CPU := cortex-a9
ARCH_ARM_HAVE_NEON := true ARCH_ARM_HAVE_NEON := true
ARCH_ARM_HAVE_TLS_REGISTER := true ARCH_ARM_HAVE_TLS_REGISTER := true
EXYNOS4210_ENHANCEMENTS := true EXYNOS4210_ENHANCEMENTS := true
BOARD_USES_SKTEXTBOX := true
ifdef EXYNOS4210_ENHANCEMENTS ifdef EXYNOS4210_ENHANCEMENTS
COMMON_GLOBAL_CFLAGS += -DEXYNOS4_ENHANCEMENTS COMMON_GLOBAL_CFLAGS += -DEXYNOS4_ENHANCEMENTS
COMMON_GLOBAL_CFLAGS += -DEXYNOS4210_ENHANCEMENTS COMMON_GLOBAL_CFLAGS += -DEXYNOS4210_ENHANCEMENTS
COMMON_GLOBAL_CFLAGS += -DDISABLE_HW_ID_MATCH_CHECK
endif endif
TARGET_BOARD_PLATFORM := exynos4 TARGET_BOARD_PLATFORM := exynos4
@ -79,9 +79,12 @@ ENABLE_WEBGL := true
# HWComposer # HWComposer
BOARD_USES_HWCOMPOSER := true BOARD_USES_HWCOMPOSER := true
BOARD_USE_SYSFS_VSYNC_NOTIFICATION := true BOARD_USE_SYSFS_VSYNC_NOTIFICATION := true
BOARD_USE_SECTVOUT := true
BOARD_USES_FIMGAPI := true BOARD_USES_FIMGAPI := true
# TVOut
BOARD_USE_SECTVOUT := true
BOARD_USES_SKTEXTBOX := true
# OMX # OMX
BOARD_USE_SAMSUNG_COLORFORMAT := true BOARD_USE_SAMSUNG_COLORFORMAT := true
BOARD_NONBLOCK_MODE_PROCESS := true BOARD_NONBLOCK_MODE_PROCESS := true
@ -99,7 +102,8 @@ BOARD_MOBILEDATA_INTERFACE_NAME := "pdp0"
# Camera # Camera
BOARD_USES_PROPRIETARY_LIBCAMERA := true BOARD_USES_PROPRIETARY_LIBCAMERA := true
BOARD_USES_PROPRIETARY_LIBFIMC := true BOARD_USES_PROPRIETARY_LIBFIMC := true
COMMON_GLOBAL_CFLAGS += -DDISABLE_HW_ID_MATCH_CHECK BOARD_CAMERA_HAVE_ISO := true
COMMON_GLOBAL_CFLAGS += -DHAVE_ISO
COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE COMMON_GLOBAL_CFLAGS += -DSAMSUNG_CAMERA_HARDWARE
# Wifi # Wifi

27
camera/CameraWrapper.cpp
View File

@ -110,7 +110,7 @@ static char * camera_fixup_getparams(int id, const char * settings)
params.set(android::CameraParameters::KEY_PREVIEW_SIZE, videoSize); params.set(android::CameraParameters::KEY_PREVIEW_SIZE, videoSize);
} }
params.set("iso-values", iso_values[id]); params.set(android::CameraParameters::KEY_SUPPORTED_ISO_MODES, iso_values[id]);
android::String8 strParams = params.flatten(); android::String8 strParams = params.flatten();
char *ret = strdup(strParams.string()); char *ret = strdup(strParams.string());
@ -125,19 +125,18 @@ char * camera_fixup_setparams(int id, const char * settings)
params.unflatten(android::String8(settings)); params.unflatten(android::String8(settings));
// fix params here // fix params here
if(params.get("iso")) {
const char* isoMode = params.get("iso"); const char* isoMode = params.get(android::CameraParameters::KEY_ISO_MODE);
if(isoMode) { if(strcmp(isoMode, "ISO50") == 0)
if(!strcmp(isoMode, "ISO50")) params.set(android::CameraParameters::KEY_ISO_MODE, "50");
params.set("iso", "50"); else if(strcmp(isoMode, "ISO100") == 0)
else if(!strcmp(isoMode, "ISO100")) params.set(android::CameraParameters::KEY_ISO_MODE, "100");
params.set("iso", "100"); else if(strcmp(isoMode, "ISO200") == 0)
else if(!strcmp(isoMode, "ISO200")) params.set(android::CameraParameters::KEY_ISO_MODE, "200");
params.set("iso", "200"); else if(strcmp(isoMode, "ISO400") == 0)
else if(!strcmp(isoMode, "ISO400")) params.set(android::CameraParameters::KEY_ISO_MODE, "400");
params.set("iso", "400"); else if(strcmp(isoMode, "ISO800") == 0)
else if(!strcmp(isoMode, "ISO800")) params.set(android::CameraParameters::KEY_ISO_MODE, "800");
params.set("iso", "800");
} }
android::String8 strParams = params.flatten(); android::String8 strParams = params.flatten();