From: Jeongmo Yang Date: Fri, 28 Apr 2023 02:39:03 +0000 (+0900) Subject: Remove unused internal API X-Git-Tag: accepted/tizen/unified/20230605.170347~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=9e9d515048e5a8ba4b3483a60afe5be475c4f188;p=platform%2Fcore%2Fapi%2Fcamera.git Remove unused internal API - int camera_attr_get_preview_frame_meta_timestamp(camera_h camera, camera_meta_timestamp_s *meta_timestamp); [Version] 0.4.107 [Issue Type] Clean up Change-Id: If9cdb5bebe82d734f093f59a301bb61e978252f5 Signed-off-by: Jeongmo Yang --- diff --git a/include/camera_internal.h b/include/camera_internal.h index ea6bdb9..556d46e 100644 --- a/include/camera_internal.h +++ b/include/camera_internal.h @@ -39,25 +39,6 @@ extern "C" { /** * @internal - * @brief The structure type of the meta timestamp. - * @since_tizen 7.0 - * @remarks This is available for specific device only. - */ -typedef struct _camera_meta_timestamp_s { - unsigned long long ts_soe; - unsigned long long ts_eoe; - unsigned long long ts_sof; - unsigned long long ts_eof; - unsigned long long ts_hal; - unsigned long long ts_qmf; - unsigned long long ts_gst; - unsigned long long td_exp; - unsigned long long ts_aux; - unsigned long long td_aux; -} camera_meta_timestamp_s; - -/** - * @internal * @brief The structure type of the frame meta. * @since_tizen 7.0 * @remarks This is available for specific device only. @@ -302,21 +283,6 @@ int camera_attr_get_preview_frame_timestamp(camera_h camera, unsigned long *time /** * @internal - * @brief Gets the meta timestamp of preview frame in nano second. - * @since_tizen 7.0 - * @remarks The function should be called in camera_preview_cb() or camera_media_packet_preview_cb(),\n - * otherwise, it will return #CAMERA_ERROR_INVALID_OPERATION. - * @param[in] camera The handle to the camera - * @param[out] meta_timestamp The meta timestamp of preview frame (in nsec) - * @return @c 0 on success, otherwise a negative error value - * @retval #CAMERA_ERROR_NONE Successful - * @retval #CAMERA_ERROR_INVALID_OPERATION Internal error - * @retval #CAMERA_ERROR_INVALID_PARAMETER Invalid parameter - */ -int camera_attr_get_preview_frame_meta_timestamp(camera_h camera, camera_meta_timestamp_s *meta_timestamp); - -/** - * @internal * @brief Gets the frame meta of preview buffer. * @since_tizen 7.0 * @remarks The function should be called in camera_preview_cb() or camera_media_packet_preview_cb(),\n diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index 31c1534..5495639 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.106 +Version: 0.4.107 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera_internal.c b/src/camera_internal.c index 06e644e..00cfb5b 100644 --- a/src/camera_internal.c +++ b/src/camera_internal.c @@ -401,37 +401,6 @@ int camera_attr_get_preview_frame_timestamp(camera_h camera, unsigned long *time } -int camera_attr_get_preview_frame_meta_timestamp(camera_h camera, camera_meta_timestamp_s *meta_timestamp) -{ - camera_cli_s *pc = (camera_cli_s *)camera; - MMCamcorderVideoStreamDataType *stream = NULL; - - if (!pc || !pc->cb_info || !meta_timestamp) { - CAM_LOG_ERROR("NULL pointer %p %p", pc, meta_timestamp); - return CAMERA_ERROR_INVALID_PARAMETER; - } - - stream = pc->cb_info->stream_data; - if (!stream) { - CAM_LOG_ERROR("no stream data, maybe it's not in preview callback"); - return CAMERA_ERROR_INVALID_OPERATION; - } - - meta_timestamp->ts_soe = stream->frame_meta.ts_soe; - meta_timestamp->ts_eoe = stream->frame_meta.ts_eoe; - meta_timestamp->ts_sof = stream->frame_meta.ts_sof; - meta_timestamp->ts_eof = stream->frame_meta.ts_eof; - meta_timestamp->ts_hal = stream->frame_meta.ts_hal; - meta_timestamp->ts_qmf = stream->frame_meta.ts_qmf; - meta_timestamp->ts_gst = stream->frame_meta.ts_gst; - meta_timestamp->td_exp = stream->frame_meta.td_exp; - meta_timestamp->ts_aux = stream->frame_meta.ts_aux; - meta_timestamp->td_aux = stream->frame_meta.td_aux; - - return CAMERA_ERROR_NONE; -} - - int camera_attr_get_preview_frame_meta(camera_h camera, camera_frame_meta_s *frame_meta) { camera_cli_s *pc = (camera_cli_s *)camera; diff --git a/test/camera_test.c b/test/camera_test.c index 043a67b..7a9ece7 100644 --- a/test/camera_test.c +++ b/test/camera_test.c @@ -464,7 +464,7 @@ static void _camera_preview_cb(camera_preview_data_s *frame, void *user_data) camera_h cam_handle = (camera_h)user_data; camera_rotation_e rotation = CAMERA_ROTATION_NONE; unsigned long timestamp = 0; - camera_meta_timestamp_s meta_timestamp = {0, }; + camera_frame_meta_s frame_meta = {0, }; if (!cam_handle || !frame) { LOGE("NULL param! %p %p", cam_handle, frame); @@ -481,14 +481,12 @@ static void _camera_preview_cb(camera_preview_data_s *frame, void *user_data) LOGI("rotation[%d], timestamp[%lu]", rotation, timestamp); - ret = camera_attr_get_preview_frame_meta_timestamp(cam_handle, &meta_timestamp); + 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", - meta_timestamp.ts_soe, meta_timestamp.ts_eoe, - meta_timestamp.ts_sof, meta_timestamp.ts_eof, - meta_timestamp.ts_hal, meta_timestamp.ts_qmf, - meta_timestamp.ts_gst, meta_timestamp.td_exp, - meta_timestamp.ts_aux, meta_timestamp.td_aux); + LOGD("meta %llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu%llu,%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); } else { LOGW("get preview frame meta timestamp failed[0x%x]", ret); }