diff options
| author | Pavel Kirpichyov <pavel.kirpichyov@gmail.com> | 2013-12-07 21:55:03 +0400 |
|---|---|---|
| committer | Pavel Kirpichyov <pavel.kirpichyov@gmail.com> | 2013-12-08 14:36:05 +0200 |
| commit | fc6d124de33545f46ee3b62afc00838d5d42d265 (patch) | |
| tree | 7ba928bc90c2f7de14df01f3ca6a9b9b9faa1997 | |
| parent | a342fe2496dcab9eac14e216fc0718fa4fac194f (diff) | |
| download | device_samsung_galaxys2-common-fc6d124de33545f46ee3b62afc00838d5d42d265.zip device_samsung_galaxys2-common-fc6d124de33545f46ee3b62afc00838d5d42d265.tar.gz device_samsung_galaxys2-common-fc6d124de33545f46ee3b62afc00838d5d42d265.tar.bz2 | |
Exynos camera fixes
* Enable video mode for camera
* Update sports scene name (Thanks to Mark Campbell-Smith <mcampbellsmith@gmail.com>)
The 'sports' scene mode has been renamed to 'action' scene mode
to match the 4.4 camera configuration
Change-Id: I453847256ad26197a90d44897844e78fe86732c1
| -rw-r--r-- | camera/exynos_camera.c | 12 | ||||
| -rw-r--r-- | overlay/packages/apps/Camera2/res/values/config.xml | 2 |
2 files changed, 10 insertions, 4 deletions
diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c index b37a526..c358f2c 100644 --- a/camera/exynos_camera.c +++ b/camera/exynos_camera.c @@ -108,7 +108,7 @@ struct exynos_camera_preset exynos_camera_presets_galaxys2[] = { .whitebalance_values = "auto,incandescent,fluorescent,daylight,cloudy-daylight", .scene_mode = "auto", - .scene_mode_values = "auto,portrait,landscape,night,beach,snow,sunset,fireworks,sports,party,candlelight,dusk-dawn,fall-color,back-light,text", + .scene_mode_values = "auto,portrait,landscape,night,beach,snow,sunset,fireworks,action,party,candlelight,dusk-dawn,fall-color,back-light,text", .effect = "none", .effect_values = "none,mono,negative,sepia,aqua", @@ -885,7 +885,7 @@ int exynos_camera_params_apply(struct exynos_camera *exynos_camera) scene_mode = SCENE_MODE_SUNSET; else if (strcmp(scene_mode_string, "fireworks") == 0) scene_mode = SCENE_MODE_FIREWORKS; - else if (strcmp(scene_mode_string, "sports") == 0) + else if (strcmp(scene_mode_string, "action") == 0) scene_mode = SCENE_MODE_SPORTS; else if (strcmp(scene_mode_string, "party") == 0) scene_mode = SCENE_MODE_PARTY_INDOOR; @@ -2640,6 +2640,14 @@ int exynos_camera_set_parameters(struct camera_device *dev, return -1; } + char *recording_hint_string = exynos_param_string_get(exynos_camera, "recording-hint"); + int cam_mode = 0; // photo + if (recording_hint_string != NULL && strcmp(recording_hint_string, "true") == 0) { + cam_mode = 1; // video + } + + exynos_param_int_set(exynos_camera, "cam_mode", cam_mode); + rc = exynos_camera_params_apply(exynos_camera); if (rc < 0) { ALOGE("%s: Unable to apply params", __func__); diff --git a/overlay/packages/apps/Camera2/res/values/config.xml b/overlay/packages/apps/Camera2/res/values/config.xml index 4217a77..56f055a 100644 --- a/overlay/packages/apps/Camera2/res/values/config.xml +++ b/overlay/packages/apps/Camera2/res/values/config.xml @@ -20,6 +20,4 @@ <resources> <!-- Allows setting video size before recording starts --> <bool name="needsEarlyVideoSize">true</bool> - <!-- Samsung Camcorder Mode --> - <bool name="needsSamsungCamMode">true</bool> </resources> |