From 6e9eda653c5e9b1f52371bd25e8cf431d734546b Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Thu, 29 Aug 2024 16:53:03 +0900 Subject: [PATCH] Add new field to frame meta for lux index [Version] 0.4.111 [Issue Type] New feature Change-Id: I5b54a0ae720b8d057dffad9944cab2f80c1a5895 Signed-off-by: Jeongmo Yang --- include/camera_internal.h | 1 + packaging/capi-media-camera.spec | 2 +- src/camera.c | 5 +++-- src/camera_internal.c | 1 + 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 22fbeba..5659e16 100644 --- a/include/camera_internal.h +++ b/include/camera_internal.h @@ -91,6 +91,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 1bd95d9..af49ac4 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: 0.4.110 +Version: 0.4.111 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera.c b/src/camera.c index e846bf4..a5972e0 100644 --- a/src/camera.c +++ b/src/camera.c @@ -425,13 +425,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 291e3ff..7281c4c 100644 --- a/src/camera_internal.c +++ b/src/camera_internal.c @@ -430,6 +430,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 de8eff2..1627729 100644 --- a/test/camera_test.c +++ b/test/camera_test.c @@ -492,10 +492,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) { - g_print("[PREVIEW_CB] meta %llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu%llu,%llu\n", + g_print("[PREVIEW_CB] meta %llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu%llu,%llu,lux:%llu\n", 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 { g_print("[PREVIEW_CB] get preview frame meta failed[0x%x]\n", ret); } -- 2.7.4