diff options
author | Jeongmo Yang <jm80.yang@samsung.com> | 2024-08-29 16:53:03 +0900 |
---|---|---|
committer | Jeongmo Yang <jm80.yang@samsung.com> | 2024-09-02 17:58:25 +0900 |
commit | 21f04015a4aec8b6f6fce4ba8aad012a86318abb (patch) | |
tree | 2baebd9064ab81636929d50762a150555ec9cd56 | |
parent | 35c257a7eb7e0c527ced264a9e6b82060ae883c2 (diff) | |
download | camera-accepted/tizen_9.0_unified.tar.gz camera-accepted/tizen_9.0_unified.tar.bz2 camera-accepted/tizen_9.0_unified.zip |
Add new field to frame meta for lux indexHEADtizen_9.0_m2_releaseaccepted/tizen/unified/x/asan/20241013.235752accepted/tizen/unified/x/20240904.025232accepted/tizen/unified/toolchain/20241004.101434accepted/tizen/unified/dev/20240910.111414accepted/tizen/unified/20240903.110746accepted/tizen/9.0/unified/20241030.233343tizen_9.0tizenaccepted/tizen_unified_x_asanaccepted/tizen_unified_xaccepted/tizen_unified_toolchainaccepted/tizen_unified_devaccepted/tizen_unifiedaccepted/tizen_9.0_unified
[Version] 1.2.0
[Issue Type] New feature
Change-Id: I5b54a0ae720b8d057dffad9944cab2f80c1a5895
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r-- | include/camera_internal.h | 1 | ||||
-rw-r--r-- | packaging/capi-media-camera.spec | 2 | ||||
-rw-r--r-- | src/camera.c | 5 | ||||
-rw-r--r-- | src/camera_internal.c | 1 | ||||
-rw-r--r-- | test/camera_test.c | 5 |
5 files changed, 9 insertions, 5 deletions
diff --git a/include/camera_internal.h b/include/camera_internal.h index 79d20f9..c0056c4 100644 --- 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 --- 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 --- 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 --- 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 --- 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); } |