camera_internal: Fix invalid type for timestamp

[Version] 0.4.106
[Issue Type] Bug fix

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

diff --git a/include/camera_internal.h b/include/camera_internal.h
index 20c3c7b37799375294583631bd00b1e5b69b9fce..9a87bb0aaf3ca363bb731b68265ab5f835c60664 100644 (file)
--- a/include/camera_internal.h
+++ b/include/camera_internal.h
@@ -314,7 +314,7 @@ int camera_request_codec_config(camera_h camera);
  * @retval #CAMERA_ERROR_INVALID_OPERATION Internal error
  * @retval #CAMERA_ERROR_INVALID_PARAMETER Invalid parameter
  */
-int camera_attr_get_preview_frame_timestamp(camera_h camera, unsigned long *timestamp);
+int camera_attr_get_preview_frame_timestamp(camera_h camera, unsigned long long *timestamp);
 
 /**
  * @internal

diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec
index 11398ca4bf7f324e5f8f38fb2f9d5ef2d62d59f9..bc537863b5f940ba13f7c45ecb3a44184a24c43c 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:    0.4.105
+Version:    0.4.106
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/camera_internal.c b/src/camera_internal.c
index e4775cd81b3cc649fbd46d67f9f0904bcdf05540..f19a1d866752ac304a5f28e5d4c57845fc8dc434 100644 (file)
--- a/src/camera_internal.c
+++ b/src/camera_internal.c
@@ -380,7 +380,7 @@ int camera_request_codec_config(camera_h camera)
 }
 
 
-int camera_attr_get_preview_frame_timestamp(camera_h camera, unsigned long *timestamp)
+int camera_attr_get_preview_frame_timestamp(camera_h camera, unsigned long long *timestamp)
 {
        camera_cli_s *pc = (camera_cli_s *)camera;
 
@@ -396,7 +396,7 @@ int camera_attr_get_preview_frame_timestamp(camera_h camera, unsigned long *time
 
        *timestamp = pc->cb_info->stream_data->timestamp_nsec;
 
-       CAM_LOG_DEBUG("frame timestamp[%lu]", *timestamp);
+       CAM_LOG_DEBUG("frame timestamp[%llu]", *timestamp);
 
        return CAMERA_ERROR_NONE;
 }

diff --git a/test/camera_test.c b/test/camera_test.c
index 6f1365ed288a2122cb3c11fd5ee5c8c80bea0775..69435a83c4175e2706df25c1999650ed7a4a5abf 100644 (file)
--- a/test/camera_test.c
+++ b/test/camera_test.c
@@ -468,7 +468,7 @@ static void _camera_preview_cb(camera_preview_data_s *frame, void *user_data)
        int ret = CAMERA_ERROR_NONE;
        camera_h cam_handle = (camera_h)user_data;
        camera_rotation_e rotation = CAMERA_ROTATION_NONE;
-       unsigned long timestamp = 0;
+       unsigned long long timestamp = 0;
        camera_frame_meta_s frame_meta = {0, };
        camera_status_auto_exposure_e status_ae = CAMERA_STATUS_AUTO_EXPOSURE_NONE;
        camera_status_auto_white_balance_e status_awb = CAMERA_STATUS_AUTO_WHITE_BALANCE_NONE;
@@ -484,7 +484,7 @@ static void _camera_preview_cb(camera_preview_data_s *frame, void *user_data)
 
        ret = camera_attr_get_preview_frame_timestamp(cam_handle, &timestamp);
        if (ret == CAMERA_ERROR_NONE)
-               g_print("[PREVIEW_CB] preview[rotation:%d,timestamp:%lu] callback\n", rotation, timestamp);
+               g_print("[PREVIEW_CB] preview[rotation:%d,timestamp:%llu] callback\n", rotation, timestamp);
        else
                g_print("[PREVIEW_CB] get preview frame timestamp failed[0x%x]\n", ret);
 
@@ -495,7 +495,7 @@ static void _camera_preview_cb(camera_preview_data_s *frame, void *user_data)
                        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);
+               g_print("[PREVIEW_CB] get preview frame meta failed[0x%x]\n", ret);
        }
 
        ret = camera_attr_get_preview_frame_status_auto_exposure(cam_handle, &status_ae);