summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeongmo Yang <jm80.yang@samsung.com>2023-04-28 11:39:03 +0900
committerJeongmo Yang <jm80.yang@samsung.com>2023-04-28 11:39:48 +0900
commit7e37f9297a60e1baadd570019d020d6cb49b9a2b (patch)
tree56450fe776a7398dd8113b04b3cab2afa8d114ca
parentc537a386ee4f0219c4f1a247f18d29ce5e903765 (diff)
downloadcamera-7e37f9297a60e1baadd570019d020d6cb49b9a2b.tar.gz
camera-7e37f9297a60e1baadd570019d020d6cb49b9a2b.tar.bz2
camera-7e37f9297a60e1baadd570019d020d6cb49b9a2b.zip
Remove unused internal API
- int camera_attr_get_preview_frame_meta_timestamp(camera_h camera, camera_meta_timestamp_s *meta_timestamp); [Version] 0.4.101 [Issue Type] Clean up Change-Id: If9cdb5bebe82d734f093f59a301bb61e978252f5 Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
-rw-r--r--include/camera_internal.h34
-rw-r--r--packaging/capi-media-camera.spec2
-rw-r--r--src/camera_internal.c31
-rw-r--r--test/camera_test.c14
4 files changed, 7 insertions, 74 deletions
diff --git a/include/camera_internal.h b/include/camera_internal.h
index b1454ee..d36328e 100644
--- a/include/camera_internal.h
+++ b/include/camera_internal.h
@@ -51,25 +51,6 @@ typedef struct _camera_device_list_s {
/**
* @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.
@@ -314,21 +295,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 8a79716..c8682f5 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.100
+Version: 0.4.101
Release: 0
Group: Multimedia/API
License: Apache-2.0
diff --git a/src/camera_internal.c b/src/camera_internal.c
index a9cd1d9..ab10efb 100644
--- a/src/camera_internal.c
+++ b/src/camera_internal.c
@@ -402,37 +402,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 ac1fc8b..c2fb5c4 100644
--- a/test/camera_test.c
+++ b/test/camera_test.c
@@ -460,7 +460,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) {
g_print("\n[PREVIEW_CB] NULL param! %p %p\n", cam_handle, frame);
@@ -477,14 +477,12 @@ static void _camera_preview_cb(camera_preview_data_s *frame, void *user_data)
else
g_print("[PREVIEW_CB] get preview frame timestamp failed[0x%x]\n", ret);
- 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) {
- g_print("[PREVIEW_CB] meta %llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu\n",
- 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);
+ g_print("[PREVIEW_CB] meta %llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu,%llu%llu,%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);
} else {
g_print("[PREVIEW_CB] get preview frame meta timestamp failed[0x%x]\n", ret);
}