diff options
| author | sbrissen <sbrissen@hotmail.com> | 2014-12-12 15:36:31 -0500 |
|---|---|---|
| committer | sbrissen <sbrissen@hotmail.com> | 2014-12-12 15:36:31 -0500 |
| commit | 7b2d8a380d3c2e1ab9771d9dc55ea268408874b0 (patch) | |
| tree | 8e028a3f693ef2c46e25129ea89052924d15b47c /camera | |
| parent | 4a0fa49bd890f127a7ab485168d6d30b206a8b30 (diff) | |
| download | device_samsung_kona-common-7b2d8a380d3c2e1ab9771d9dc55ea268408874b0.zip device_samsung_kona-common-7b2d8a380d3c2e1ab9771d9dc55ea268408874b0.tar.gz device_samsung_kona-common-7b2d8a380d3c2e1ab9771d9dc55ea268408874b0.tar.bz2 | |
kona: initial L bringup
Change-Id: Ic2df78caff752a3bcff645283c13ea3299264bcf
Diffstat (limited to 'camera')
| -rwxr-xr-x[-rw-r--r--] | camera/Android.mk | 1 | ||||
| -rwxr-xr-x | camera/exynos_camera.c | 4 | ||||
| -rwxr-xr-x | camera/exynos_camera.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/camera/Android.mk b/camera/Android.mk index ac54750..4a11cb1 100644..100755 --- a/camera/Android.mk +++ b/camera/Android.mk @@ -32,6 +32,7 @@ LOCAL_SRC_FILES := \ LOCAL_C_INCLUDES := \ $(LOCAL_PATH)/include \ + system/media/camera/include \ hardware/samsung/exynos4/hal/include LOCAL_SHARED_LIBRARIES := libutils libcutils liblog libcamera_client libhardware diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c index f9a4b40..31b2740 100755 --- a/camera/exynos_camera.c +++ b/camera/exynos_camera.c @@ -2002,7 +2002,7 @@ int exynos_camera_preview(struct exynos_camera *exynos_camera) if (exynos_camera->preview_window != NULL && exynos_camera->gralloc != NULL) { exynos_camera->preview_window->dequeue_buffer(exynos_camera->preview_window, &window_buffer, &window_stride); - exynos_camera->gralloc->lock(exynos_camera->gralloc, *window_buffer, GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, width, height, &window_data); + exynos_camera->gralloc->lock(exynos_camera->gralloc, *window_buffer, GRALLOC_USAGE_YUV_ADDR | GRALLOC_USAGE_SW_WRITE_OFTEN, 0, 0, width, height, &window_data); if (window_data == NULL) { ALOGE("%s: Unable to lock gralloc", __func__); @@ -3454,7 +3454,7 @@ int exynos_camera_set_preview_window(struct camera_device *dev, goto error; } - rc = w->set_usage(w, GRALLOC_USAGE_SW_WRITE_OFTEN); + rc = w->set_usage(w, GRALLOC_USAGE_CAMERA | GRALLOC_USAGE_HW_FIMC1 | GRALLOC_USAGE_EXTERNAL_DISP | GRALLOC_USAGE_SW_WRITE_OFTEN); if (rc) { ALOGE("%s: Unable to set usage", __func__); goto error; diff --git a/camera/exynos_camera.h b/camera/exynos_camera.h index d8933c4..49447a2 100755 --- a/camera/exynos_camera.h +++ b/camera/exynos_camera.h @@ -41,7 +41,7 @@ #define EXYNOS_CAMERA_CAPTURE_BUFFERS_COUNT 1 #define EXYNOS_CAMERA_PREVIEW_BUFFERS_COUNT 8 #define EXYNOS_CAMERA_RECORDING_BUFFERS_COUNT 6 -#define EXYNOS_CAMERA_GRALLOC_BUFFERS_COUNT 3 +#define EXYNOS_CAMERA_GRALLOC_BUFFERS_COUNT 6 #define EXYNOS_CAMERA_UNKNOWN_CAPTURE_MODE 167774080 |