diff options
| author | Jeongmo Yang <jm80.yang@samsung.com> | 2024-08-13 14:47:32 +0900 |
|---|---|---|
| committer | Jeongmo Yang <jm80.yang@samsung.com> | 2024-08-19 13:49:34 +0900 |
| commit | ae4cae460f771b38e287c819f861e997f0588a02 (patch) | |
| tree | dee225e5a1223e2c68d1f179864672e5a2f0e902 | |
| parent | 20063f65622db70bd653fdb623ec0c28e0ab8a14 (diff) | |
| download | camera-accepted/tizen_8.0_unified.tar.gz camera-accepted/tizen_8.0_unified.tar.bz2 camera-accepted/tizen_8.0_unified.zip | |
Fix NULL stream data for camera_attr_get_preview_frame_meta()accepted/tizen/8.0/unified/20240821.155424tizen_8.0accepted/tizen_8.0_unified
[Version] 0.4.121
[Issue Type] Bug fix
Change-Id: Ie6a7db724776f08d927af9ce7bf69c642fe77795
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
| -rw-r--r-- | packaging/capi-media-camera.spec | 2 | ||||
| -rw-r--r-- | src/camera.c | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/packaging/capi-media-camera.spec b/packaging/capi-media-camera.spec index 59b59ee..ea56868 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.120 +Version: 0.4.121 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/camera.c b/src/camera.c index c4b4291..5074617 100644 --- a/src/camera.c +++ b/src/camera.c @@ -418,6 +418,9 @@ static void __camera_event_handler_preview(camera_cb_info_s *cb_info, char *recv stream->frame_meta.ts_aux, stream->frame_meta.td_aux, stream->frame_meta.seqnum, stream->frame_meta.flags); + /* set stream data for camera_attr_get_preview_frame_rotation() and camera_attr_get_preview_frame_meta() */ + cb_info->stream_data = stream; + if (num_buffer_fd == 0 && CAMERA_IS_FD_VALID(tfd[1])) { /* import tbm data_bo and get virtual address */ if (!__camera_import_tbm_fd(cb_info->bufmgr, tfd[1], &data_bo, &data_bo_handle)) { @@ -445,9 +448,6 @@ static void __camera_event_handler_preview(camera_cb_info_s *cb_info, char *recv (cb_info->user_cb[MUSE_CAMERA_EVENT_TYPE_EXTRA_PREVIEW] && stream->extra_stream_id >= MM_CAMCORDER_VIDEO_STREAM_ID_EXTRA_MIN)) { camera_create_preview_frame(stream, num_buffer_fd, buffer_bo_handle, &data_bo_handle, &frame); - /* set stream data for camera_get_preview_frame_rotation() */ - cb_info->stream_data = stream; - if (stream->extra_stream_id < MM_CAMCORDER_VIDEO_STREAM_ID_EXTRA_MIN) { monitoring_info = cb_info->monitoring_info_preview; __camera_preview_cb_monitoring_info_start(monitoring_info); @@ -465,8 +465,6 @@ static void __camera_event_handler_preview(camera_cb_info_s *cb_info, char *recv } __camera_preview_cb_monitoring_info_end(monitoring_info); - - cb_info->stream_data = NULL; } if (stream->extra_stream_id >= MM_CAMCORDER_VIDEO_STREAM_ID_EXTRA_MIN) @@ -557,6 +555,8 @@ static void __camera_event_handler_preview(camera_cb_info_s *cb_info, char *recv g_mutex_unlock(&cb_info->bridge_lock); _PREVIEW_CB_HANDLER_DONE: + cb_info->stream_data = NULL; + /* send PREVIEW_CB_RETURN message if zero copy buffer is used(num_buffer_fd is bigger than 0) and preview callback(normal or media packet) is set. */ if (num_buffer_fd > 0 && |