diff options
Diffstat (limited to 'src/camera.c')
| -rw-r--r-- | src/camera.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/src/camera.c b/src/camera.c index e38382c..387b50a 100644 --- a/src/camera.c +++ b/src/camera.c @@ -406,13 +406,17 @@ 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; if (num_buffer_fd == 0 && CAMERA_IS_FD_VALID(tfd[1])) { /* import tbm data_bo and get virtual address */ @@ -441,9 +445,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); @@ -461,8 +462,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) @@ -553,6 +552,8 @@ static void __camera_event_handler_preview(camera_cb_info_s *cb_info, char *recv } _PREVIEW_CB_HANDLER_DONE: + cb_info->stream_data = NULL; + /* send PREVIEW_CB_RETURN message if zero copy buffer is used */ if (num_buffer_fd > 0) _camera_msg_send(MUSE_CAMERA_API_PREVIEW_CB_RETURN, NULL, cb_info, NULL, 0); |