From: Jeongmo Yang Date: Thu, 22 Feb 2018 01:51:41 +0000 (+0900) Subject: Update code for changed mm-utility functions X-Git-Tag: accepted/tizen/unified/20180226.142321^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git;a=commitdiff_plain;h=25708b6f9682b81ce64d12ab7acdb18699180ceb Update code for changed mm-utility functions [Version] 0.10.153 [Profile] Common [Issue Type] Update Change-Id: I2a36f96fe36481c563897db82c1065190de0944f Signed-off-by: Jeongmo Yang --- diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index 5a2ce85..aa38ad9 100644 --- a/packaging/libmm-camcorder.spec +++ b/packaging/libmm-camcorder.spec @@ -1,6 +1,6 @@ Name: libmm-camcorder Summary: Camera and recorder library -Version: 0.10.152 +Version: 0.10.153 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_camcorder_util.h b/src/include/mm_camcorder_util.h index 79e7a35..db349e3 100644 --- a/src/include/mm_camcorder_util.h +++ b/src/include/mm_camcorder_util.h @@ -276,7 +276,7 @@ gboolean _mmcamcorder_encode_jpeg(void *src_data, unsigned int src_width, unsign void **result_data, unsigned int *result_length); /* resize */ gboolean _mmcamcorder_resize_frame(unsigned char *src_data, unsigned int src_width, unsigned int src_height, unsigned int src_length, int src_format, - unsigned char **dst_data, unsigned int *dst_width, unsigned int *dst_height, unsigned int *dst_length); + unsigned char **dst_data, unsigned int *dst_width, unsigned int *dst_height, size_t *dst_length); gboolean _mmcamcorder_downscale_UYVYorYUYV(unsigned char *src, unsigned int src_width, unsigned int src_height, unsigned char **dst, unsigned int dst_width, unsigned int dst_height); diff --git a/src/mm_camcorder_stillshot.c b/src/mm_camcorder_stillshot.c index 4879af4..d8175a2 100644 --- a/src/mm_camcorder_stillshot.c +++ b/src/mm_camcorder_stillshot.c @@ -1404,9 +1404,9 @@ static void __mmcamcorder_image_capture_cb(GstElement *element, GstSample *sampl /* encode thumbnail */ if (encode_src.data) { + size_t thumb_length = 0; unsigned int thumb_width = 0; unsigned int thumb_height = 0; - unsigned int thumb_length = 0; unsigned char *thumb_raw_data = NULL; /* encode image */ diff --git a/src/mm_camcorder_util.c b/src/mm_camcorder_util.c index 04065e8..5e70de0 100644 --- a/src/mm_camcorder_util.c +++ b/src/mm_camcorder_util.c @@ -1336,16 +1336,16 @@ gboolean _mmcamcorder_send_message(MMHandleType handle, _MMCamcorderMsgItem *dat MMCamFaceDetectInfo *cam_fd_info = (MMCamFaceDetectInfo *)data->param.data; if (cam_fd_info) { SAFE_G_FREE(cam_fd_info->face_info); - SAFE_G_FREE(cam_fd_info); - data->param.size = 0; + data->param.data = NULL; + g_free(cam_fd_info); } } else if (data->id == MM_MESSAGE_CAMCORDER_VIDEO_CAPTURED || data->id == MM_MESSAGE_CAMCORDER_AUDIO_CAPTURED) { MMCamRecordingReport *report = (MMCamRecordingReport *)data->param.data; if (report) { SAFE_G_FREE(report->recording_filename); data->param.data = NULL; + g_free(report); } - SAFE_G_FREE(report); } #endif /* _MMCAMCORDER_ENABLE_IDLE_MESSAGE_CALLBACK */ @@ -1716,15 +1716,15 @@ gboolean _mmcamcorder_link_elements(GList *element_list) } gboolean _mmcamcorder_resize_frame(unsigned char *src_data, unsigned int src_width, unsigned int src_height, unsigned int src_length, int src_format, - unsigned char **dst_data, unsigned int *dst_width, unsigned int *dst_height, unsigned int *dst_length) + unsigned char **dst_data, unsigned int *dst_width, unsigned int *dst_height, size_t *dst_length) { int ret = TRUE; int mm_ret = MM_ERROR_NONE; int input_format = MM_UTIL_COLOR_YUV420; - unsigned char *dst_tmp_data = NULL; if (!src_data || !dst_data || !dst_width || !dst_height || !dst_length) { - _mmcam_dbg_err("something is NULL %p,%p,%p,%p,%p", src_data, dst_data, dst_width, dst_height, dst_length); + _mmcam_dbg_err("something is NULL %p,%p,%p,%p,%p", + src_data, dst_data, dst_width, dst_height, dst_length); return FALSE; } @@ -1755,32 +1755,16 @@ gboolean _mmcamcorder_resize_frame(unsigned char *src_data, unsigned int src_wid _mmcam_dbg_log("src size %dx%d -> dst size %dx%d", src_width, src_height, *dst_width, *dst_height); - /* get length of resized image */ - mm_ret = mm_util_get_image_size(input_format, *dst_width, *dst_height, dst_length); - if (mm_ret != MM_ERROR_NONE) { - GST_ERROR("mm_util_get_image_size failed 0x%x", ret); - return FALSE; - } - - _mmcam_dbg_log("dst_length : %d", *dst_length); - - dst_tmp_data = (unsigned char *)malloc(*dst_length); - if (dst_tmp_data == NULL) { - _mmcam_dbg_err("failed to alloc dst_thumb_size(size %d)", *dst_length); - return FALSE; - } - - mm_ret = mm_util_resize_image(src_data, src_width, src_height, input_format, dst_tmp_data, dst_width, dst_height); + mm_ret = mm_util_resize_image(src_data, src_width, src_height, input_format, + *dst_width, *dst_height, dst_data, dst_width, dst_height, dst_length); if (mm_ret != MM_ERROR_NONE) { GST_ERROR("mm_util_resize_image failed 0x%x", ret); - free(dst_tmp_data); return FALSE; } - *dst_data = dst_tmp_data; - - _mmcam_dbg_log("resize done %p, %dx%d", *dst_data, *dst_width, *dst_height); + _mmcam_dbg_log("resize done %dx%d -> %dx%d, %p, length %zu", + src_width, src_height, *dst_width, *dst_height, *dst_data, *dst_length); return TRUE; }