switch (data->id) {
case MM_MESSAGE_CAMCORDER_STATE_CHANGED:
- case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_ASM:
case MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_RM:
data->param.union_type = MM_MSG_UNION_STATE;
break;
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 */
case MM_PIXEL_FORMAT_RGB888:
fourcc = GST_MAKE_FOURCC('R', 'G', 'B', ' ');
break;
+ case MM_PIXEL_FORMAT_RGBA:
+ fourcc = GST_MAKE_FOURCC('B', 'G', 'R', 'x');
+ break;
+ case MM_PIXEL_FORMAT_ARGB:
+ fourcc = GST_MAKE_FOURCC('x', 'R', 'G', 'B');
+ break;
case MM_PIXEL_FORMAT_ENCODED:
if (codectype == MM_IMAGE_CODEC_JPEG) {
fourcc = GST_MAKE_FOURCC('J', 'P', 'E', 'G');
case MM_PIXEL_FORMAT_ENCODED_H264:
fourcc = GST_MAKE_FOURCC('H', '2', '6', '4');
break;
+ case MM_PIXEL_FORMAT_INVZ:
+ fourcc = GST_MAKE_FOURCC('I', 'N', 'V', 'Z');
+ break;
default:
_mmcam_dbg_log("Not proper pixel type[%d]. Set default - I420", pixtype);
if (use_zero_copy_format)
case GST_MAKE_FOURCC('H', '2', '6', '4'):
pixtype = MM_PIXEL_FORMAT_ENCODED_H264;
break;
+ case GST_MAKE_FOURCC('I', 'N', 'V', 'Z'):
+ pixtype = MM_PIXEL_FORMAT_INVZ;
+ break;
default:
_mmcam_dbg_log("Not supported fourcc type(%c%c%c%c)", fourcc, fourcc>>8, fourcc>>16, fourcc>>24);
pixtype = MM_PIXEL_FORMAT_INVALID;
}
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_IMG_FMT_YUV420;
- unsigned char *dst_tmp_data = NULL;
+ int input_format = MM_UTIL_COLOR_YUV420;
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;
}
/* set input format for mm-util */
switch (src_format) {
case MM_PIXEL_FORMAT_I420:
- input_format = MM_UTIL_IMG_FMT_I420;
+ input_format = MM_UTIL_COLOR_I420;
break;
case MM_PIXEL_FORMAT_YV12:
- input_format = MM_UTIL_IMG_FMT_YUV420;
+ input_format = MM_UTIL_COLOR_YUV420;
break;
case MM_PIXEL_FORMAT_NV12:
- input_format = MM_UTIL_IMG_FMT_NV12;
+ input_format = MM_UTIL_COLOR_NV12;
break;
case MM_PIXEL_FORMAT_YUYV:
- input_format = MM_UTIL_IMG_FMT_YUYV;
+ input_format = MM_UTIL_COLOR_YUYV;
break;
case MM_PIXEL_FORMAT_UYVY:
- input_format = MM_UTIL_IMG_FMT_UYVY;
+ input_format = MM_UTIL_COLOR_UYVY;
break;
case MM_PIXEL_FORMAT_RGB888:
- input_format = MM_UTIL_IMG_FMT_RGB888;
+ input_format = MM_UTIL_COLOR_RGB24;
break;
default:
_mmcam_dbg_err("NOT supported format [%d]", src_format);
_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;
}
switch (src_format) {
case MM_PIXEL_FORMAT_NV12:
- //jpeg_format = MM_UTIL_JPEG_FMT_NV12;
+ //jpeg_format = MM_UTIL_COLOR_NV12;
ret_conv = _mmcamcorder_convert_NV12_to_I420(src_data, src_width, src_height, &converted_src, &converted_src_size);
- jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
+ jpeg_format = MM_UTIL_COLOR_YUV420;
break;
case MM_PIXEL_FORMAT_NV16:
- jpeg_format = MM_UTIL_JPEG_FMT_NV16;
+ jpeg_format = MM_UTIL_COLOR_NV16;
converted_src = src_data;
break;
case MM_PIXEL_FORMAT_NV21:
- jpeg_format = MM_UTIL_JPEG_FMT_NV21;
+ jpeg_format = MM_UTIL_COLOR_NV21;
converted_src = src_data;
break;
case MM_PIXEL_FORMAT_YUYV:
- //jpeg_format = MM_UTIL_JPEG_FMT_YUYV;
+ //jpeg_format = MM_UTIL_COLOR_YUYV;
ret_conv = _mmcamcorder_convert_YUYV_to_I420(src_data, src_width, src_height, &converted_src, &converted_src_size);
- jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
+ jpeg_format = MM_UTIL_COLOR_YUV420;
break;
case MM_PIXEL_FORMAT_UYVY:
- //jpeg_format = MM_UTIL_JPEG_FMT_UYVY;
+ //jpeg_format = MM_UTIL_COLOR_UYVY;
ret_conv = _mmcamcorder_convert_UYVY_to_I420(src_data, src_width, src_height, &converted_src, &converted_src_size);
- jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
+ jpeg_format = MM_UTIL_COLOR_YUV420;
break;
case MM_PIXEL_FORMAT_I420:
- jpeg_format = MM_UTIL_JPEG_FMT_YUV420;
+ jpeg_format = MM_UTIL_COLOR_YUV420;
converted_src = src_data;
break;
case MM_PIXEL_FORMAT_RGB888:
- jpeg_format = MM_UTIL_JPEG_FMT_RGB888;
+ jpeg_format = MM_UTIL_COLOR_RGB24;
converted_src = src_data;
break;
case MM_PIXEL_FORMAT_RGBA:
- jpeg_format = MM_UTIL_JPEG_FMT_RGBA8888;
+ jpeg_format = MM_UTIL_COLOR_RGBA;
converted_src = src_data;
break;
case MM_PIXEL_FORMAT_ARGB:
- jpeg_format = MM_UTIL_JPEG_FMT_ARGB8888;
+ jpeg_format = MM_UTIL_COLOR_ARGB;
converted_src = src_data;
break;
case MM_PIXEL_FORMAT_422P:
- jpeg_format = MM_UTIL_JPEG_FMT_YUV422; // not supported
+ jpeg_format = MM_UTIL_COLOR_YUV422; // not supported
return FALSE;
case MM_PIXEL_FORMAT_NV12T:
case MM_PIXEL_FORMAT_YV12:
projects / platform / core / multimedia / libmm-camcorder.git / blobdiff