Add new field to frame meta for lux index

[Version] 1.2.0
[Issue Type] New feature

Change-Id: I5b54a0ae720b8d057dffad9944cab2f80c1a5895
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>

diff --git a/include/camera_internal.h b/include/camera_internal.h
index 79d20f9..c0056c4 100644 (file)
--- a/include/camera_internal.h
+++ b/include/camera_internal.h
@@ -76,6 +76,7 @@ typedef struct _camera_frame_meta_s {
        unsigned long long td_aux;
        unsigned long long seqnum;
        unsigned long long flags;
+       unsigned long long lux_index;
 } camera_frame_meta_s;
 
 

diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index c481803..ee0fb19 100644 (file)
--- a/packaging/capi-media-camera.spec
+++ b/packaging/capi-media-camera.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-camera
 Summary:    A Camera API
-Version:    1.1.3
+Version:    1.2.0
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/camera.c b/src/camera.c
index 11780ed..387b50a 100644 (file)
--- a/src/camera.c
+++ b/src/camera.c
@@ -406,13 +406,14 @@ static void __camera_event_handler_preview(camera_cb_info_s *cb_info, char *recv
        /* get stream info */
        stream = (MMCamcorderVideoStreamDataType *)buf_pos;
 
-       CAM_LOG_VERBOSE("meta [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu]",
+       CAM_LOG_VERBOSE("meta [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] [%llu] lux[%llu]",
                stream->frame_meta.ts_soe, stream->frame_meta.ts_eoe,
                stream->frame_meta.ts_sof, stream->frame_meta.ts_eof,
                stream->frame_meta.ts_hal, stream->frame_meta.ts_qmf,
                stream->frame_meta.ts_gst, stream->frame_meta.td_exp,
                stream->frame_meta.ts_aux, stream->frame_meta.td_aux,
-               stream->frame_meta.seqnum, stream->frame_meta.flags);
+               stream->frame_meta.seqnum, stream->frame_meta.flags,
+               stream->frame_meta.lux_index);
 
        /* set stream data for camera_attr_get_preview_frame_rotation() and camera_attr_get_preview_frame_meta() */
        cb_info->stream_data = stream;

diff --git a/src/camera_internal.c b/src/camera_internal.c
index 8347f93..eaa691b 100644 (file)
--- a/src/camera_internal.c
+++ b/src/camera_internal.c
@@ -342,6 +342,7 @@ int camera_attr_get_preview_frame_meta(camera_h camera, camera_frame_meta_s *fra
        frame_meta->td_aux = stream->frame_meta.td_aux;
        frame_meta->seqnum = stream->frame_meta.seqnum;
        frame_meta->flags = stream->frame_meta.flags;
+       frame_meta->lux_index = stream->frame_meta.lux_index;
 
        return CAMERA_ERROR_NONE;
 }

diff --git a/test/camera_test.c b/test/camera_test.c
index cc0cd9f..5c26e16 100644 (file)
--- a/test/camera_test.c
+++ b/test/camera_test.c
@@ -496,10 +496,11 @@ static void _camera_preview_cb(camera_preview_data_s *frame, void *user_data)
 
        ret = camera_attr_get_preview_frame_meta(cam_handle, &frame_meta);
        if (ret == CAMERA_ERROR_NONE) {
-               LOGD("meta %llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu%llu,%llu",
+               LOGD("meta %llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu%llu,%llu,lux:%llu",
                        frame_meta.ts_soe, frame_meta.ts_eoe, frame_meta.ts_sof, frame_meta.ts_eof,
                        frame_meta.ts_hal, frame_meta.ts_qmf, frame_meta.ts_gst, frame_meta.td_exp,
-                       frame_meta.ts_aux, frame_meta.td_aux, frame_meta.seqnum, frame_meta.flags);
+                       frame_meta.ts_aux, frame_meta.td_aux, frame_meta.seqnum, frame_meta.flags,
+                       frame_meta.lux_index);
        } else {
                LOGW("get preview frame meta failed[0x%x]", ret);
        }