summaryrefslogtreecommitdiffstats
path: root/camera
diff options
context:
space:
mode:
Diffstat (limited to 'camera')
-rw-r--r--camera/Android.mk1
-rw-r--r--camera/exynos_camera.c4
-rw-r--r--camera/exynos_exif.c8
3 files changed, 7 insertions, 6 deletions
diff --git a/camera/Android.mk b/camera/Android.mk
index 352a36d..f57758b 100644
--- a/camera/Android.mk
+++ b/camera/Android.mk
@@ -26,6 +26,7 @@ LOCAL_SRC_FILES := \
exynos_v4l2.c
LOCAL_C_INCLUDES := \
+ system/media/camera/include \
hardware/samsung/exynos4/hal/include
LOCAL_SHARED_LIBRARIES := libutils libcutils liblog libcamera_client libhardware libs5pjpeg
diff --git a/camera/exynos_camera.c b/camera/exynos_camera.c
index df3f990..3379bab 100644
--- a/camera/exynos_camera.c
+++ b/camera/exynos_camera.c
@@ -80,8 +80,8 @@ struct exynos_camera_preset exynos_camera_presets_galaxys2[] = {
.video_snapshot_supported = 0,
.full_video_snap_supported = 0,
- .recording_size = "720x480",
- .recording_size_values = "1920x1080,1280x720,720x480,640x480",
+ .recording_size = "1280x720",
+ .recording_size_values = "1920x1080,1280x720,640x480",
.recording_format = "yuv420sp",
.focus_mode = "auto",
diff --git a/camera/exynos_exif.c b/camera/exynos_exif.c
index 8887e5b..b9f57ca 100644
--- a/camera/exynos_exif.c
+++ b/camera/exynos_exif.c
@@ -372,7 +372,7 @@ bv_ioctl:
}
int exynos_exif_write_data(void *exif_data, unsigned short tag,
- unsigned short type, unsigned int count, int *offset, void *start,
+ unsigned short type, unsigned int count, unsigned int *offset, void *start,
void *data, int length)
{
unsigned char *pointer;
@@ -421,12 +421,12 @@ int exynos_exif_create(struct exynos_camera *exynos_camera,
unsigned char user_comment_code[] = { 0x41, 0x53, 0x43, 0x49, 0x49, 0x0, 0x0, 0x0 };
unsigned char exif_ascii_prefix[] = { 0x41, 0x53, 0x43, 0x49, 0x49, 0x0, 0x0, 0x0 };
- camera_memory_t *exif_data_memory;
+ camera_memory_t *exif_data_memory = NULL;
void *exif_data;
int exif_data_size;
int exif_size;
- void *exif_ifd_data_start, *exif_ifd_start, *exif_ifd_gps, *exif_ifd_thumb;
+ void *exif_ifd_data_start, *exif_ifd_start, *exif_ifd_thumb, *exif_ifd_gps = NULL;
void *exif_thumb_data;
unsigned int exif_thumb_size;
@@ -644,7 +644,7 @@ int exynos_exif_create(struct exynos_camera *exynos_camera,
count = exynos_exif_write_data(pointer, EXIF_TAG_GPS_IFD_POINTER,
EXIF_TYPE_LONG, 1, NULL, NULL, &offset, sizeof(offset));
- pointer = exif_ifd_start + offset;
+ pointer = (unsigned char *) exif_ifd_start + offset;
if (exif_attributes->gps_processing_method[0] == 0)
value = NUM_0TH_IFD_GPS - 1;