X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmm_camcorder_internal.c;h=cb094f5ddb3b868ff006ad2ad1b97ddf03e3ee93;hb=refs%2Fchanges%2F81%2F188781%2F2;hp=76193cf0b37e29254d7e03961d30a311deff811f;hpb=f7daa8787a7673238759a71e3978e78d18c77a55;p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c index 76193cf..cb094f5 100644 --- a/src/mm_camcorder_internal.c +++ b/src/mm_camcorder_internal.c @@ -23,6 +23,7 @@ | INCLUDE FILES | ========================================================================================*/ #include +#include #include #include #include @@ -40,10 +41,6 @@ #include -#ifdef _MMCAMCORDER_MURPHY_SUPPORT -#include -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ - #ifdef _MMCAMCORDER_RM_SUPPORT #include #endif /* _MMCAMCORDER_RM_SUPPORT */ @@ -57,6 +54,7 @@ #define __MMCAMCORDER_FORCE_STOP_WAIT_TIME 100000 /* us */ #define __MMCAMCORDER_SOUND_WAIT_TIMEOUT 3 #define __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN 64 +#define __MMCAMCORDER_CONF_FILENAME_LENGTH 32 #define DPM_ALLOWED 1 #define DPM_DISALLOWED 0 @@ -75,6 +73,11 @@ static gint __mmcamcorder_gst_handle_core_error(MMHandleType handle, int cod static gint __mmcamcorder_gst_handle_resource_warning(MMHandleType handle, GstMessage *message , GError *error); static gboolean __mmcamcorder_handle_gst_warning(MMHandleType handle, GstMessage *message, GError *error); +#ifdef _MMCAMCORDER_MM_RM_SUPPORT +static int __mmcamcorder_resource_release_cb(mm_resource_manager_h rm, + mm_resource_manager_res_h res, void *user_data); +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ + #ifdef _MMCAMCORDER_RM_SUPPORT rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src, rm_device_request_s *info, void *cb_data); @@ -95,7 +98,6 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) { int ret = MM_ERROR_NONE; int sys_info_ret = SYSTEM_INFO_ERROR_NONE; - int UseConfCtrl = 0; int rcmd_fmt_capture = MM_PIXEL_FORMAT_YUYV; int rcmd_fmt_recording = MM_PIXEL_FORMAT_NV12; int rcmd_dpy_rotation = MM_DISPLAY_ROTATION_270; @@ -104,7 +106,6 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) int camera_default_flip = MM_FLIP_NONE; int camera_facing_direction = MM_CAMCORDER_CAMERA_FACING_DIRECTION_REAR; char *err_attr_name = NULL; - const char *ConfCtrlFile = NULL; mmf_camcorder_t *hcamcorder = NULL; type_element *EvasSurfaceElement = NULL; @@ -124,13 +125,12 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) hcamcorder->sub_context = NULL; hcamcorder->old_state = MM_CAMCORDER_STATE_NONE; hcamcorder->capture_in_recording = FALSE; - hcamcorder->session_type = MM_SESSION_TYPE_MEDIA; g_mutex_init(&(hcamcorder->mtsafe).lock); g_cond_init(&(hcamcorder->mtsafe).cond); g_mutex_init(&(hcamcorder->mtsafe).cmd_lock); g_cond_init(&(hcamcorder->mtsafe).cmd_cond); - g_mutex_init(&(hcamcorder->mtsafe).asm_lock); + g_mutex_init(&(hcamcorder->mtsafe).interrupt_lock); g_mutex_init(&(hcamcorder->mtsafe).state_lock); g_mutex_init(&(hcamcorder->mtsafe).gst_state_lock); g_mutex_init(&(hcamcorder->mtsafe).gst_encode_state_lock); @@ -139,10 +139,9 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) g_mutex_init(&(hcamcorder->mtsafe).vstream_cb_lock); g_mutex_init(&(hcamcorder->mtsafe).astream_cb_lock); g_mutex_init(&(hcamcorder->mtsafe).mstream_cb_lock); -#ifdef _MMCAMCORDER_MURPHY_SUPPORT - g_cond_init(&(hcamcorder->mtsafe).resource_cond); +#ifdef _MMCAMCORDER_MM_RM_SUPPORT g_mutex_init(&(hcamcorder->mtsafe).resource_lock); -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ g_mutex_init(&hcamcorder->restart_preview_lock); @@ -209,180 +208,158 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) _mmcam_dbg_warn("DPM handle %p", hcamcorder->dpm_handle); if (info->videodev_type != MM_VIDEO_DEVICE_NONE) { + char conf_file_name[__MMCAMCORDER_CONF_FILENAME_LENGTH] = {'\0',}; + int resolution_width = 0; + int resolution_height = 0; + MMCamAttrsInfo fps_info; + + snprintf(conf_file_name, sizeof(conf_file_name), "%s%d.ini", + CONFIGURE_CTRL_FILE_PREFIX, info->videodev_type); + + _mmcam_dbg_log("Load control configure file [%d][%s]", info->videodev_type, conf_file_name); + + ret = _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, + CONFIGURE_TYPE_CTRL, (const char *)conf_file_name, &hcamcorder->conf_ctrl); + if (ret != MM_ERROR_NONE) { + _mmcam_dbg_err("Failed to get configure(control) info."); + goto _ERR_DEFAULT_VALUE_INIT; + } +/* + _mmcamcorder_conf_print_info(&hcamcorder->conf_main); + _mmcamcorder_conf_print_info(&hcamcorder->conf_ctrl); +*/ + ret = _mmcamcorder_init_convert_table((MMHandleType)hcamcorder); + if (ret != MM_ERROR_NONE) { + _mmcam_dbg_warn("converting table initialize error!!"); + ret = MM_ERROR_CAMCORDER_INTERNAL; + goto _ERR_DEFAULT_VALUE_INIT; + } + + ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_ALL); + if (ret != MM_ERROR_NONE) { + _mmcam_dbg_warn("attribute initialize from configure error!!"); + ret = MM_ERROR_CAMCORDER_INTERNAL; + goto _ERR_DEFAULT_VALUE_INIT; + } + + /* Get device info, recommend preview fmt and display rotation from INI */ + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_CAMERA, + "RecommendPreviewFormatCapture", + &rcmd_fmt_capture); + + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_CAMERA, + "RecommendPreviewFormatRecord", + &rcmd_fmt_recording); + + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_CAMERA, + "RecommendDisplayRotation", + &rcmd_dpy_rotation); + + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_CAPTURE, + "PlayCaptureSound", + &play_capture_sound); + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, - "UseConfCtrl", &UseConfCtrl); + "DeviceCount", + &camera_device_count); - if (UseConfCtrl) { - int resolution_width = 0; - int resolution_height = 0; - MMCamAttrsInfo fps_info; + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_CAMERA, + "FacingDirection", + &camera_facing_direction); - _mmcam_dbg_log("Enable Configure Control system."); + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_EFFECT, + "BrightnessStepDenominator", + &hcamcorder->brightness_step_denominator); - switch (info->videodev_type) { - case MM_VIDEO_DEVICE_CAMERA0: - _mmcamcorder_conf_get_value_string((MMHandleType)hcamcorder, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, - "ConfCtrlFile0", &ConfCtrlFile); - break; - case MM_VIDEO_DEVICE_CAMERA1: - _mmcamcorder_conf_get_value_string((MMHandleType)hcamcorder, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, - "ConfCtrlFile1", &ConfCtrlFile); - break; - default: - _mmcam_dbg_err("Not supported camera type."); - ret = MM_ERROR_CAMCORDER_NOT_SUPPORTED; - goto _ERR_DEFAULT_VALUE_INIT; - } + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, + CONFIGURE_CATEGORY_CTRL_CAPTURE, + "SupportZSL", + &hcamcorder->support_zsl_capture); - _mmcam_dbg_log("videodev_type : [%d], ConfCtrlPath : [%s]", info->videodev_type, ConfCtrlFile); + _mmcam_dbg_log("Recommend fmt[cap:%d,rec:%d], dpy rot %d, cap snd %d, dev cnt %d, cam facing dir %d, step denom %d, support zsl %d", + rcmd_fmt_capture, rcmd_fmt_recording, rcmd_dpy_rotation, + play_capture_sound, camera_device_count, camera_facing_direction, + hcamcorder->brightness_step_denominator, hcamcorder->support_zsl_capture); - ret = _mmcamcorder_conf_get_info((MMHandleType)hcamcorder, CONFIGURE_TYPE_CTRL, ConfCtrlFile, &hcamcorder->conf_ctrl); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("Failed to get configure(control) info."); - goto _ERR_DEFAULT_VALUE_INIT; - } -/* - _mmcamcorder_conf_print_info(&hcamcorder->conf_main); - _mmcamcorder_conf_print_info(&hcamcorder->conf_ctrl); -*/ - ret = _mmcamcorder_init_convert_table((MMHandleType)hcamcorder); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_warn("converting table initialize error!!"); - ret = MM_ERROR_CAMCORDER_INTERNAL; - goto _ERR_DEFAULT_VALUE_INIT; - } + /* Get UseZeroCopyFormat value from INI */ + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, + "UseZeroCopyFormat", + &(hcamcorder->use_zero_copy_format)); - ret = _mmcamcorder_init_attr_from_configure((MMHandleType)hcamcorder, MM_CAMCONVERT_CATEGORY_ALL); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_warn("converting table initialize error!!"); - ret = MM_ERROR_CAMCORDER_INTERNAL; - goto _ERR_DEFAULT_VALUE_INIT; - } + /* Get SupportMediaPacketPreviewCb value from INI */ + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, + "SupportMediaPacketPreviewCb", + &(hcamcorder->support_media_packet_preview_cb)); - /* Get device info, recommend preview fmt and display rotation from INI */ - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, - CONFIGURE_CATEGORY_CTRL_CAMERA, - "RecommendPreviewFormatCapture", - &rcmd_fmt_capture); - - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, - CONFIGURE_CATEGORY_CTRL_CAMERA, - "RecommendPreviewFormatRecord", - &rcmd_fmt_recording); - - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, - CONFIGURE_CATEGORY_CTRL_CAMERA, - "RecommendDisplayRotation", - &rcmd_dpy_rotation); - - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_CAPTURE, - "PlayCaptureSound", - &play_capture_sound); - - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, - "DeviceCount", - &camera_device_count); - - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, - CONFIGURE_CATEGORY_CTRL_CAMERA, - "FacingDirection", - &camera_facing_direction); - - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, - CONFIGURE_CATEGORY_CTRL_EFFECT, - "BrightnessStepDenominator", - &hcamcorder->brightness_step_denominator); - - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_ctrl, - CONFIGURE_CATEGORY_CTRL_CAPTURE, - "SupportZSL", - &hcamcorder->support_zsl_capture); - - _mmcam_dbg_log("Recommend fmt[cap:%d,rec:%d], dpy rot %d, cap snd %d, dev cnt %d, cam facing dir %d, step denom %d, support zsl %d", - rcmd_fmt_capture, rcmd_fmt_recording, rcmd_dpy_rotation, - play_capture_sound, camera_device_count, camera_facing_direction, - hcamcorder->brightness_step_denominator, hcamcorder->support_zsl_capture); - - /* Get UseZeroCopyFormat value from INI */ - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, - "UseZeroCopyFormat", - &(hcamcorder->use_zero_copy_format)); - - /* Get SupportMediaPacketPreviewCb value from INI */ - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, - "SupportMediaPacketPreviewCb", - &(hcamcorder->support_media_packet_preview_cb)); - - /* Get UseVideoconvert value from INI */ - _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, - CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT, - "UseVideoconvert", - &hcamcorder->use_videoconvert); - - ret = mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, - MMCAM_CAMERA_WIDTH, &resolution_width, - MMCAM_CAMERA_HEIGHT, &resolution_height, - NULL); + /* Get UseVideoconvert value from INI */ + _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, + CONFIGURE_CATEGORY_MAIN_VIDEO_OUTPUT, + "UseVideoconvert", + &hcamcorder->use_videoconvert); - mm_camcorder_get_fps_list_by_resolution((MMHandleType)hcamcorder, resolution_width, resolution_height, &fps_info); + ret = mm_camcorder_get_attributes((MMHandleType)hcamcorder, NULL, + MMCAM_CAMERA_WIDTH, &resolution_width, + MMCAM_CAMERA_HEIGHT, &resolution_height, + NULL); - _mmcam_dbg_log("UseZeroCopyFormat %d, UseVideoconvert %d, SupportMediaPacketPreviewCb %d", - hcamcorder->use_zero_copy_format, hcamcorder->use_videoconvert, hcamcorder->support_media_packet_preview_cb); - _mmcam_dbg_log("res : %d X %d, Default FPS by resolution : %d", - resolution_width, resolution_height, fps_info.int_array.def); + mm_camcorder_get_fps_list_by_resolution((MMHandleType)hcamcorder, resolution_width, resolution_height, &fps_info); - if (camera_facing_direction == 1) { - if (rcmd_dpy_rotation == MM_DISPLAY_ROTATION_270 || rcmd_dpy_rotation == MM_DISPLAY_ROTATION_90) - camera_default_flip = MM_FLIP_VERTICAL; - else - camera_default_flip = MM_FLIP_HORIZONTAL; + _mmcam_dbg_log("UseZeroCopyFormat %d, UseVideoconvert %d, SupportMediaPacketPreviewCb %d", + hcamcorder->use_zero_copy_format, hcamcorder->use_videoconvert, hcamcorder->support_media_packet_preview_cb); + _mmcam_dbg_log("res : %d X %d, Default FPS by resolution : %d", + resolution_width, resolution_height, fps_info.int_array.def); - _mmcam_dbg_log("camera_default_flip : [%d]", camera_default_flip); - } + if (camera_facing_direction == 1) { + if (rcmd_dpy_rotation == MM_DISPLAY_ROTATION_270 || rcmd_dpy_rotation == MM_DISPLAY_ROTATION_90) + camera_default_flip = MM_FLIP_VERTICAL; + else + camera_default_flip = MM_FLIP_HORIZONTAL; - mm_camcorder_set_attributes((MMHandleType)hcamcorder, &err_attr_name, - MMCAM_CAMERA_DEVICE_COUNT, camera_device_count, - MMCAM_CAMERA_FACING_DIRECTION, camera_facing_direction, - MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_CAPTURE, rcmd_fmt_capture, - MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_RECORDING, rcmd_fmt_recording, - MMCAM_RECOMMEND_DISPLAY_ROTATION, rcmd_dpy_rotation, - MMCAM_SUPPORT_ZSL_CAPTURE, hcamcorder->support_zsl_capture, - MMCAM_SUPPORT_ZERO_COPY_FORMAT, hcamcorder->use_zero_copy_format, - MMCAM_SUPPORT_MEDIA_PACKET_PREVIEW_CB, hcamcorder->support_media_packet_preview_cb, - MMCAM_CAMERA_FPS, fps_info.int_array.def, - MMCAM_DISPLAY_FLIP, camera_default_flip, - "capture-sound-enable", play_capture_sound, - NULL); - if (err_attr_name) { - _mmcam_dbg_err("Set %s FAILED.", err_attr_name); - SAFE_FREE(err_attr_name); - ret = MM_ERROR_CAMCORDER_INTERNAL; - goto _ERR_DEFAULT_VALUE_INIT; - } + _mmcam_dbg_log("camera_default_flip : [%d]", camera_default_flip); + } - /* Get default value of brightness */ - mm_camcorder_get_attributes((MMHandleType)hcamcorder, &err_attr_name, - MMCAM_FILTER_BRIGHTNESS, &hcamcorder->brightness_default, - NULL); - if (err_attr_name) { - _mmcam_dbg_err("Get brightness FAILED."); - SAFE_FREE(err_attr_name); - ret = MM_ERROR_CAMCORDER_INTERNAL; - goto _ERR_DEFAULT_VALUE_INIT; - } - _mmcam_dbg_log("Default brightness : %d", hcamcorder->brightness_default); - } else { - _mmcam_dbg_log("Disable Configure Control system."); - hcamcorder->conf_ctrl = NULL; + mm_camcorder_set_attributes((MMHandleType)hcamcorder, &err_attr_name, + MMCAM_CAMERA_DEVICE_COUNT, camera_device_count, + MMCAM_CAMERA_FACING_DIRECTION, camera_facing_direction, + MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_CAPTURE, rcmd_fmt_capture, + MMCAM_RECOMMEND_PREVIEW_FORMAT_FOR_RECORDING, rcmd_fmt_recording, + MMCAM_RECOMMEND_DISPLAY_ROTATION, rcmd_dpy_rotation, + MMCAM_SUPPORT_ZSL_CAPTURE, hcamcorder->support_zsl_capture, + MMCAM_SUPPORT_ZERO_COPY_FORMAT, hcamcorder->use_zero_copy_format, + MMCAM_SUPPORT_MEDIA_PACKET_PREVIEW_CB, hcamcorder->support_media_packet_preview_cb, + MMCAM_CAMERA_FPS, fps_info.int_array.def, + MMCAM_DISPLAY_FLIP, camera_default_flip, + MMCAM_CAPTURE_SOUND_ENABLE, play_capture_sound, + NULL); + if (err_attr_name) { + _mmcam_dbg_err("Set %s FAILED.", err_attr_name); + SAFE_FREE(err_attr_name); + ret = MM_ERROR_CAMCORDER_INTERNAL; + goto _ERR_DEFAULT_VALUE_INIT; + } + + /* Get default value of brightness */ + mm_camcorder_get_attributes((MMHandleType)hcamcorder, &err_attr_name, + MMCAM_FILTER_BRIGHTNESS, &hcamcorder->brightness_default, + NULL); + if (err_attr_name) { + _mmcam_dbg_err("Get brightness FAILED."); + SAFE_FREE(err_attr_name); + ret = MM_ERROR_CAMCORDER_INTERNAL; + goto _ERR_DEFAULT_VALUE_INIT; } + _mmcam_dbg_log("Default brightness : %d", hcamcorder->brightness_default); + /* add DPM camera policy changed callback */ if (hcamcorder->dpm_handle) { ret = dpm_add_policy_changed_cb(hcamcorder->dpm_handle, "camera", @@ -395,15 +372,17 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) _mmcam_dbg_log("DPM camera changed cb id %d", hcamcorder->dpm_camera_cb_id); } -#ifdef _MMCAMCORDER_MURPHY_SUPPORT +#ifdef _MMCAMCORDER_MM_RM_SUPPORT /* initialize resource manager */ - ret = _mmcamcorder_resource_manager_init(&hcamcorder->resource_manager, (void *)hcamcorder); - if (ret != MM_ERROR_NONE) { + ret = mm_resource_manager_create(MM_RESOURCE_MANAGER_APP_CLASS_MEDIA, + __mmcamcorder_resource_release_cb, hcamcorder, + &hcamcorder->resource_manager); + if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { _mmcam_dbg_err("failed to initialize resource manager"); ret = MM_ERROR_CAMCORDER_INTERNAL; goto _ERR_DEFAULT_VALUE_INIT; } -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ } else { _mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main, CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT, @@ -472,29 +451,15 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) /* get model name */ sys_info_ret = system_info_get_platform_string("http://tizen.org/system/model_name", &hcamcorder->model_name); - if (hcamcorder->model_name) { - _mmcam_dbg_log("model name [%s], sys_info_ret 0x%x", hcamcorder->model_name, sys_info_ret); - } else { - _mmcam_dbg_warn("failed get model name, sys_info_ret 0x%x", sys_info_ret); - } + + _mmcam_dbg_warn("model name [%s], ret 0x%x", + hcamcorder->model_name ? hcamcorder->model_name : "NULL", sys_info_ret); /* get software version */ sys_info_ret = system_info_get_platform_string("http://tizen.org/system/build.string", &hcamcorder->software_version); - if (hcamcorder->software_version) { - _mmcam_dbg_log("software version [%s], sys_info_ret 0x%d", hcamcorder->software_version, sys_info_ret); - } else { - _mmcam_dbg_warn("failed get software version, sys_info_ret 0x%x", sys_info_ret); - } -#ifdef _MMCAMCORDER_MURPHY_SUPPORT - if (info->videodev_type != MM_VIDEO_DEVICE_NONE) { - ret = _mmcamcorder_resource_wait_for_connection(&hcamcorder->resource_manager, (void *)hcamcorder); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("failed to connect resource manager"); - goto _ERR_DEFAULT_VALUE_INIT; - } - } -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ + _mmcam_dbg_warn("software version [%s], ret 0x%x", + hcamcorder->software_version ? hcamcorder->software_version : "NULL", sys_info_ret); /* Set initial state */ _mmcamcorder_set_state((MMHandleType)hcamcorder, MM_CAMCORDER_STATE_NULL); @@ -506,10 +471,11 @@ int _mmcamcorder_create(MMHandleType *handle, MMCamPreset *info) return MM_ERROR_NONE; _ERR_DEFAULT_VALUE_INIT: -#ifdef _MMCAMCORDER_MURPHY_SUPPORT +#ifdef _MMCAMCORDER_MM_RM_SUPPORT /* de-initialize resource manager */ - _mmcamcorder_resource_manager_deinit(&hcamcorder->resource_manager); -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ + if (hcamcorder->resource_manager != NULL) + mm_resource_manager_destroy(hcamcorder->resource_manager); +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ /* release DPM related handle */ if (hcamcorder->dpm_handle) { @@ -539,7 +505,7 @@ _ERR_DEFAULT_VALUE_INIT: g_cond_clear(&(hcamcorder->mtsafe).cond); g_mutex_clear(&(hcamcorder->mtsafe).cmd_lock); g_cond_clear(&(hcamcorder->mtsafe).cmd_cond); - g_mutex_clear(&(hcamcorder->mtsafe).asm_lock); + g_mutex_clear(&(hcamcorder->mtsafe).interrupt_lock); g_mutex_clear(&(hcamcorder->mtsafe).state_lock); g_mutex_clear(&(hcamcorder->mtsafe).gst_state_lock); g_mutex_clear(&(hcamcorder->mtsafe).gst_encode_state_lock); @@ -548,10 +514,9 @@ _ERR_DEFAULT_VALUE_INIT: g_mutex_clear(&(hcamcorder->mtsafe).vstream_cb_lock); g_mutex_clear(&(hcamcorder->mtsafe).astream_cb_lock); g_mutex_clear(&(hcamcorder->mtsafe).mstream_cb_lock); -#ifdef _MMCAMCORDER_MURPHY_SUPPORT - g_cond_clear(&(hcamcorder->mtsafe).resource_cond); +#ifdef _MMCAMCORDER_MM_RM_SUPPORT g_mutex_clear(&(hcamcorder->mtsafe).resource_lock); -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ g_mutex_clear(&hcamcorder->snd_info.open_mutex); g_cond_clear(&hcamcorder->snd_info.open_cond); @@ -665,16 +630,18 @@ int _mmcamcorder_destroy(MMHandleType handle) hcamcorder->sub_context = NULL; } -#ifdef _MMCAMCORDER_MURPHY_SUPPORT +#ifdef _MMCAMCORDER_MM_RM_SUPPORT /* de-initialize resource manager */ _MMCAMCORDER_LOCK_RESOURCE(hcamcorder); - ret = _mmcamcorder_resource_manager_deinit(&hcamcorder->resource_manager); - if (ret != MM_ERROR_NONE) - _mmcam_dbg_err("failed to de-initialize resource manager 0x%x", ret); + if (hcamcorder->resource_manager != NULL) { + ret = mm_resource_manager_destroy(hcamcorder->resource_manager); + if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) + _mmcam_dbg_err("failed to de-initialize resource manager 0x%x", ret); + } _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ /* Remove idle function which is not called yet */ if (hcamcorder->setting_event_id) { @@ -705,29 +672,6 @@ int _mmcamcorder_destroy(MMHandleType handle) /* Remove messages which are not called yet */ _mmcamcorder_remove_message_all(handle); - /* unset remained watch cb */ - if (hcamcorder->sound_focus_watch_id > 0) { - mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id); - _mmcam_dbg_warn("unset sound focus watch cb [id %d] done", hcamcorder->sound_focus_watch_id); - hcamcorder->sound_focus_watch_id = 0; - } - - /* unregister sound focus and unsubscribe sound signal */ - _mmcam_dbg_log("sound focus id %d, sound signal subscribe id %u", - hcamcorder->sound_focus_id, hcamcorder->sound_focus_subscribe_id); - - if (hcamcorder->sound_focus_id > 0) { - mm_sound_unregister_focus(hcamcorder->sound_focus_id); - _mmcam_dbg_log("unregister sound focus done"); - hcamcorder->sound_focus_id = 0; - } - - if (hcamcorder->sound_focus_subscribe_id > 0) { - mm_sound_unsubscribe_signal(hcamcorder->sound_focus_subscribe_id); - _mmcam_dbg_log("unsubscribe sound signal done"); - hcamcorder->sound_focus_subscribe_id = 0; - } - #ifdef _MMCAMCORDER_RM_SUPPORT if (hcamcorder->rm_handle != 0) { iret = rm_unregister(hcamcorder->rm_handle); @@ -777,7 +721,7 @@ int _mmcamcorder_destroy(MMHandleType handle) g_cond_clear(&(hcamcorder->mtsafe).cond); g_mutex_clear(&(hcamcorder->mtsafe).cmd_lock); g_cond_clear(&(hcamcorder->mtsafe).cmd_cond); - g_mutex_clear(&(hcamcorder->mtsafe).asm_lock); + g_mutex_clear(&(hcamcorder->mtsafe).interrupt_lock); g_mutex_clear(&(hcamcorder->mtsafe).state_lock); g_mutex_clear(&(hcamcorder->mtsafe).gst_state_lock); g_mutex_clear(&(hcamcorder->mtsafe).gst_encode_state_lock); @@ -786,10 +730,9 @@ int _mmcamcorder_destroy(MMHandleType handle) g_mutex_clear(&(hcamcorder->mtsafe).vstream_cb_lock); g_mutex_clear(&(hcamcorder->mtsafe).astream_cb_lock); g_mutex_clear(&(hcamcorder->mtsafe).mstream_cb_lock); -#ifdef _MMCAMCORDER_MURPHY_SUPPORT - g_cond_clear(&(hcamcorder->mtsafe).resource_cond); +#ifdef _MMCAMCORDER_MM_RM_SUPPORT g_mutex_clear(&(hcamcorder->mtsafe).resource_lock); -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ g_mutex_clear(&hcamcorder->snd_info.open_mutex); g_cond_clear(&hcamcorder->snd_info.open_cond); @@ -826,10 +769,8 @@ _ERR_CAMCORDER_CMD_PRECON: int _mmcamcorder_realize(MMHandleType handle) { int ret = MM_ERROR_NONE; - int ret_sound = MM_ERROR_NONE; int state = MM_CAMCORDER_STATE_NONE; int display_surface_type = MM_DISPLAY_SURFACE_OVERLAY; - int pid_for_sound_focus = 0; double motion_rate = _MMCAMCORDER_DEFAULT_RECORDING_MOTION_RATE; char *videosink_element_type = NULL; const char *videosink_name = NULL; @@ -889,63 +830,6 @@ int _mmcamcorder_realize(MMHandleType handle) MMCAM_CAMERA_RECORDING_MOTION_RATE, &motion_rate, NULL); - /* sound focus */ - if (hcamcorder->sound_focus_register) { - /* acquire sound focus or set sound focus watch callback */ - if (hcamcorder->session_flags & MM_SESSION_OPTION_PAUSE_OTHERS) { - /* acquire sound focus */ - _mmcam_dbg_log("PAUSE_OTHERS - acquire sound focus"); - - ret_sound = mm_sound_acquire_focus(hcamcorder->sound_focus_id, FOCUS_FOR_BOTH, NULL); - if (ret_sound != MM_ERROR_NONE) { - _mmcam_dbg_err("mm_sound_acquire_focus failed [0x%x]", ret_sound); - - ret = MM_ERROR_POLICY_BLOCKED; - goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; - } - - hcamcorder->acquired_focus = FOCUS_FOR_BOTH; - } else if (hcamcorder->session_flags & MM_SESSION_OPTION_UNINTERRUPTIBLE) { - /* do nothing */ - _mmcam_dbg_log("SESSION_UNINTERRUPTIBLE - do nothing for sound focus"); - } else { - /* unset remained watch cb */ - if (hcamcorder->sound_focus_watch_id > 0) { - mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id); - _mmcam_dbg_warn("unset sound focus watch cb [id %d] done", hcamcorder->sound_focus_watch_id); - hcamcorder->sound_focus_watch_id = 0; - } - - /* set sound focus watch callback */ - mm_camcorder_get_attributes(handle, NULL, - MMCAM_PID_FOR_SOUND_FOCUS, &pid_for_sound_focus, - NULL); - - if (pid_for_sound_focus == 0) { - pid_for_sound_focus = getpid(); - _mmcam_dbg_warn("pid for sound focus is not set, use my pid %d", pid_for_sound_focus); - } - - _mmcam_dbg_log("ETC - set sound focus watch callback - pid %d", pid_for_sound_focus); - - ret_sound = mm_sound_set_focus_watch_callback_for_session(pid_for_sound_focus, - FOCUS_FOR_BOTH, - (mm_sound_focus_changed_watch_cb)_mmcamcorder_sound_focus_watch_cb, - hcamcorder, - &hcamcorder->sound_focus_watch_id); - if (ret_sound != MM_ERROR_NONE) { - _mmcam_dbg_err("mm_sound_set_focus_watch_callback failed [0x%x]", ret_sound); - - ret = MM_ERROR_POLICY_BLOCKED; - goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; - } - - _mmcam_dbg_log("sound focus watch cb id %d", hcamcorder->sound_focus_watch_id); - } - } else { - _mmcam_dbg_log("no need to register sound focus"); - } - /* alloc sub context */ hcamcorder->sub_context = _mmcamcorder_alloc_subcontext(hcamcorder->type); if (!hcamcorder->sub_context) { @@ -1057,92 +941,56 @@ int _mmcamcorder_realize(MMHandleType handle) _mmcam_dbg_warn("NULL dpm_handle"); } -#ifdef _MMCAMCORDER_MURPHY_SUPPORT - /* check connection */ - if (hcamcorder->resource_manager.is_connected == FALSE) { - _mmcam_dbg_warn("resource manager disconnected before, try to reconnect"); - - /* release remained resource */ - _mmcamcorder_resource_manager_deinit(&hcamcorder->resource_manager); - - /* init resource manager and wait for connection */ - ret = _mmcamcorder_resource_manager_init(&hcamcorder->resource_manager, (void *)hcamcorder); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("failed to initialize resource manager"); - ret = MM_ERROR_CAMCORDER_INTERNAL; - goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; - } - - ret = _mmcamcorder_resource_wait_for_connection(&hcamcorder->resource_manager, (void *)hcamcorder); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("failed to connect resource manager"); +#ifdef _MMCAMCORDER_MM_RM_SUPPORT + _MMCAMCORDER_LOCK_RESOURCE(hcamcorder); + /* prepare resource manager for camera */ + if (hcamcorder->camera_resource == NULL) { + ret = mm_resource_manager_mark_for_acquire(hcamcorder->resource_manager, + MM_RESOURCE_MANAGER_RES_TYPE_CAMERA, + 1, + &hcamcorder->camera_resource); + if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { + _mmcam_dbg_err("could not prepare for camera resource"); + ret = MM_ERROR_RESOURCE_INTERNAL; + _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } - } - - ret = _mmcamcorder_resource_create_resource_set(&hcamcorder->resource_manager); - if (ret != MM_ERROR_NONE) { - goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; - } - - hcamcorder->resource_manager.acquire_count = 0; - - /* prepare resource manager for camera */ - ret = _mmcamcorder_resource_manager_prepare(&hcamcorder->resource_manager, MM_CAMCORDER_RESOURCE_TYPE_CAMERA); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("could not prepare for camera resource"); - ret = MM_ERROR_CAMCORDER_INTERNAL; - goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; + } else { + _mmcam_dbg_log("camera already acquired"); } /* prepare resource manager for "video_overlay only if display surface is X" */ if (display_surface_type == MM_DISPLAY_SURFACE_OVERLAY) { - ret = _mmcamcorder_resource_manager_prepare(&hcamcorder->resource_manager, MM_CAMCORDER_RESOURCE_TYPE_VIDEO_OVERLAY); - if (ret != MM_ERROR_NONE) { - _mmcam_dbg_err("could not prepare for video overlay resource"); - ret = MM_ERROR_CAMCORDER_INTERNAL; - goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; + if (hcamcorder->video_overlay_resource == NULL) { + ret = mm_resource_manager_mark_for_acquire(hcamcorder->resource_manager, + MM_RESOURCE_MANAGER_RES_TYPE_VIDEO_OVERLAY, + MM_RESOURCE_MANAGER_RES_VOLUME_FULL, + &hcamcorder->video_overlay_resource); + if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { + _mmcam_dbg_err("could not prepare for overlay resource"); + ret = MM_ERROR_RESOURCE_INTERNAL; + _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); + goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; + } + } else { + _mmcam_dbg_log("overlay already acquired"); } } /* acquire resources */ - _MMCAMCORDER_LOCK_RESOURCE(hcamcorder); - - ret = _mmcamcorder_resource_manager_acquire(&hcamcorder->resource_manager); - if (ret != MM_ERROR_NONE) { - _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); - + ret = mm_resource_manager_commit(hcamcorder->resource_manager); + if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { _mmcam_dbg_err("could not acquire resources"); - + ret = MM_ERROR_RESOURCE_INTERNAL; + _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } - - if (hcamcorder->resource_manager.acquire_remain > 0) { - gint64 end_time = 0; - - _mmcam_dbg_warn("wait for resource state change"); - - /* wait for resource state change */ - end_time = g_get_monotonic_time() + (__MMCAMCORDER_RESOURCE_WAIT_TIME * G_TIME_SPAN_SECOND); - - if (_MMCAMCORDER_RESOURCE_WAIT_UNTIL(hcamcorder, end_time)) { - _mmcam_dbg_warn("signal received"); - } else { - _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); - _mmcam_dbg_err("timeout"); - ret = MM_ERROR_RESOURCE_INTERNAL; - goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; - } - } else { - _mmcam_dbg_log("already all acquired"); - } - _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ #ifdef _MMCAMCORDER_RM_SUPPORT mm_camcorder_get_attributes(handle, NULL, - MMCAM_PID_FOR_SOUND_FOCUS, &app_pid, + MMCAM_CLIENT_PID, &app_pid, NULL); rci.app_pid = app_pid; aul_app_get_appid_bypid(rci.app_pid, rci.app_id, sizeof(rci.app_id)); @@ -1152,7 +1000,7 @@ int _mmcamcorder_realize(MMHandleType handle) iret = rm_register((rm_resource_cb)_mmcamcorder_rm_callback, (void*)hcamcorder, &(hcamcorder->rm_handle), &rci); if (iret != RM_OK) { _mmcam_dbg_err("rm_register fail"); - ret = MM_ERROR_POLICY_BLOCKED; + ret = MM_ERROR_RESOURCE_INTERNAL; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } } @@ -1215,7 +1063,7 @@ int _mmcamcorder_realize(MMHandleType handle) iret = rm_allocate_resources(hcamcorder->rm_handle, &(hcamcorder->request_resources), &hcamcorder->returned_devices); if (iret != RM_OK) { _mmcam_dbg_err("Resource allocation request failed"); - ret = MM_ERROR_POLICY_BLOCKED; + ret = MM_ERROR_RESOURCE_INTERNAL; goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; } #endif /* _MMCAMCORDER_RM_SUPPORT */ @@ -1257,17 +1105,24 @@ int _mmcamcorder_realize(MMHandleType handle) return MM_ERROR_NONE; _ERR_CAMCORDER_CMD: -#ifdef _MMCAMCORDER_MURPHY_SUPPORT +#ifdef _MMCAMCORDER_MM_RM_SUPPORT /* release hw resources */ + _MMCAMCORDER_LOCK_RESOURCE(hcamcorder); if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE) { - int ret_resource = _mmcamcorder_resource_manager_release(&hcamcorder->resource_manager); - if (ret_resource == MM_ERROR_RESOURCE_INVALID_STATE) { - _mmcam_dbg_warn("it could be in the middle of resource callback or there's no acquired resource"); - } else if (ret_resource != MM_ERROR_NONE) { - _mmcam_dbg_err("failed to release resource, ret_resource(0x%x)", ret_resource); + if (hcamcorder->camera_resource != NULL) { + mm_resource_manager_mark_for_release(hcamcorder->resource_manager, + hcamcorder->camera_resource); + hcamcorder->camera_resource = NULL; } + if (hcamcorder->video_overlay_resource != NULL) { + mm_resource_manager_mark_for_release(hcamcorder->resource_manager, + hcamcorder->video_overlay_resource); + hcamcorder->video_overlay_resource = NULL; + } + mm_resource_manager_commit(hcamcorder->resource_manager); } -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ + _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ #ifdef _MMCAMCORDER_RM_SUPPORT if (hcamcorder->rm_handle) { if (hcamcorder->returned_devices.allocated_num > 0) { @@ -1294,18 +1149,6 @@ _ERR_CAMCORDER_CMD: _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK: _MMCAMCORDER_UNLOCK_CMD(hcamcorder); - if (hcamcorder->sound_focus_watch_id > 0) { - mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id); - _mmcam_dbg_warn("unset sound focus watch cb [id %d] done", hcamcorder->sound_focus_watch_id); - hcamcorder->sound_focus_watch_id = 0; - } - - if (hcamcorder->acquired_focus > 0) { - mm_sound_release_focus(hcamcorder->sound_focus_id, hcamcorder->acquired_focus, NULL); - _mmcam_dbg_warn("release sound focus [focus %d] done", hcamcorder->acquired_focus); - hcamcorder->acquired_focus = 0; - } - _ERR_CAMCORDER_CMD_PRECON: _mmcam_dbg_err("Realize fail (type %d, state %d, ret %x)", hcamcorder->type, state, ret); @@ -1350,22 +1193,42 @@ int _mmcamcorder_unrealize(MMHandleType handle) hcamcorder->sub_context = NULL; } -#ifdef _MMCAMCORDER_MURPHY_SUPPORT - _mmcam_dbg_warn("lock resource - cb calling %d", hcamcorder->resource_release_cb_calling); - +#ifdef _MMCAMCORDER_MM_RM_SUPPORT _MMCAMCORDER_LOCK_RESOURCE(hcamcorder); + _mmcam_dbg_warn("lock resource - cb calling %d", hcamcorder->is_release_cb_calling); if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE && hcamcorder->state_change_by_system != _MMCAMCORDER_STATE_CHANGE_BY_RM && - hcamcorder->resource_release_cb_calling == FALSE) { - gint64 end_time = 0; + hcamcorder->is_release_cb_calling == FALSE) { /* release resource */ - ret = _mmcamcorder_resource_manager_release(&hcamcorder->resource_manager); - if (ret == MM_ERROR_RESOURCE_INVALID_STATE) { - _mmcam_dbg_warn("it could be in the middle of resource callback or there's no acquired resource"); - ret = MM_ERROR_NONE; - } else if (ret != MM_ERROR_NONE) { + if (hcamcorder->camera_resource != NULL) { + ret = mm_resource_manager_mark_for_release(hcamcorder->resource_manager, + hcamcorder->camera_resource); + if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { + _mmcam_dbg_err("could not mark camera resource for release"); + ret = MM_ERROR_CAMCORDER_INTERNAL; + _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); + _mmcam_dbg_log("unlock resource"); + goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; + } + } + + if (hcamcorder->video_overlay_resource != NULL) { + ret = mm_resource_manager_mark_for_release(hcamcorder->resource_manager, + hcamcorder->video_overlay_resource); + if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { + _mmcam_dbg_err("could not mark overlay resource for release"); + ret = MM_ERROR_CAMCORDER_INTERNAL; + _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); + _mmcam_dbg_log("unlock resource"); + goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; + } + } + + ret = mm_resource_manager_commit(hcamcorder->resource_manager); + + if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) { _mmcam_dbg_err("failed to release resource, ret(0x%x)", ret); ret = MM_ERROR_CAMCORDER_INTERNAL; @@ -1373,22 +1236,18 @@ int _mmcamcorder_unrealize(MMHandleType handle) _mmcam_dbg_log("unlock resource"); goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK; - } - - if (hcamcorder->resource_manager.acquire_remain < hcamcorder->resource_manager.acquire_count) { - /* wait for resource release */ - _mmcam_dbg_log("resource is not released all. wait for signal..."); - - end_time = g_get_monotonic_time() + (__MMCAMCORDER_RESOURCE_WAIT_TIME * G_TIME_SPAN_SECOND); - - _MMCAMCORDER_RESOURCE_WAIT_UNTIL(hcamcorder, end_time); + } else { + if (hcamcorder->camera_resource != NULL) + hcamcorder->camera_resource = NULL; + if (hcamcorder->video_overlay_resource != NULL) + hcamcorder->video_overlay_resource = NULL; } } _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); _mmcam_dbg_warn("unlock resource"); -#endif /* _MMCAMCORDER_MURPHY_SUPPORT */ +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ #ifdef _MMCAMCORDER_RM_SUPPORT if (hcamcorder->rm_handle && (hcamcorder->returned_devices.allocated_num > 0)) { @@ -1409,32 +1268,6 @@ int _mmcamcorder_unrealize(MMHandleType handle) /* Deinitialize main context member */ hcamcorder->command = NULL; - _mmcam_dbg_log("focus register %d, session flag 0x%x, state_change_by_system %d", - hcamcorder->sound_focus_register, hcamcorder->session_flags, hcamcorder->state_change_by_system); - - /* release sound focus or unset sound focus watch callback */ - _mmcam_dbg_log("by_system %d, flag 0x%x, acquired_focus %d, focus_id %d, watch_id %d", - hcamcorder->state_change_by_system, hcamcorder->session_flags, hcamcorder->acquired_focus, - hcamcorder->sound_focus_id, hcamcorder->sound_focus_watch_id); - - if (hcamcorder->state_change_by_system != _MMCAMCORDER_STATE_CHANGE_BY_FOCUS) { - if (hcamcorder->sound_focus_watch_id > 0) { - mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id); - _mmcam_dbg_warn("unset sound focus watch cb [id %d] done", hcamcorder->sound_focus_watch_id); - hcamcorder->sound_focus_watch_id = 0; - } - - if (hcamcorder->acquired_focus > 0) { - mm_sound_release_focus(hcamcorder->sound_focus_id, hcamcorder->acquired_focus, NULL); - _mmcam_dbg_warn("release sound focus [focus %d] done", hcamcorder->acquired_focus); - hcamcorder->acquired_focus = 0; - } - } else { - _mmcam_dbg_warn("state change by focus. so, no need to unset watch callback"); - /* acquired focus will be released automatically */ - hcamcorder->acquired_focus = 0; - } - _MMCAMCORDER_UNLOCK_CMD(hcamcorder); _mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_NULL); @@ -1659,7 +1492,7 @@ int _mmcamcorder_capture_start(MMHandleType handle) _MMCAMCORDER_UNLOCK_CMD(hcamcorder); /* Init break continuous shot attr */ - if (mm_camcorder_set_attributes(handle, NULL, "capture-break-cont-shot", 0, NULL) != MM_ERROR_NONE) + if (mm_camcorder_set_attributes(handle, NULL, MMCAM_CAPTURE_BREAK_CONTINUOUS_SHOT, 0, NULL) != MM_ERROR_NONE) _mmcam_dbg_warn("capture-break-cont-shot set 0 failed"); return MM_ERROR_NONE; @@ -1734,15 +1567,18 @@ int _mmcamcorder_record(MMHandleType handle) int dpm_mic_state = DPM_ALLOWED; mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); + _MMCamcorderSubContext *sc = NULL; _mmcam_dbg_log(""); - if (!hcamcorder) { + if (!hcamcorder || !MMF_CAMCORDER_SUBCONTEXT(hcamcorder)) { _mmcam_dbg_err("Not initialized"); ret = MM_ERROR_CAMCORDER_NOT_INITIALIZED; return ret; } + sc = MMF_CAMCORDER_SUBCONTEXT(handle); + if (!_MMCAMCORDER_TRYLOCK_CMD(hcamcorder)) { _mmcam_dbg_err("Another command is running."); ret = MM_ERROR_CAMCORDER_CMD_IS_RUNNING; @@ -1759,8 +1595,15 @@ int _mmcamcorder_record(MMHandleType handle) /* initialize error code */ hcamcorder->error_code = MM_ERROR_NONE; + /* get audio disable */ + mm_camcorder_get_attributes(handle, NULL, + MMCAM_AUDIO_DISABLE, &sc->audio_disable, + NULL); + + sc->audio_disable |= sc->is_modified_rate; + /* check mic policy from DPM */ - if (hcamcorder->dpm_handle) { + if (hcamcorder->dpm_handle && sc->audio_disable == FALSE) { if (dpm_restriction_get_microphone_state(hcamcorder->dpm_handle, &dpm_mic_state) == DPM_ERROR_NONE) { _mmcam_dbg_log("DPM mic state %d", dpm_mic_state); if (dpm_mic_state == DPM_DISALLOWED) { @@ -1775,7 +1618,8 @@ int _mmcamcorder_record(MMHandleType handle) _mmcam_dbg_err("get DPM mic state failed, keep going..."); } } else { - _mmcam_dbg_warn("NULL dpm_handle"); + _mmcam_dbg_warn("skip dpm check - handle %p, audio disable %d", + hcamcorder->dpm_handle, sc->audio_disable); } ret = hcamcorder->command((MMHandleType)hcamcorder, _MMCamcorder_CMD_RECORD); @@ -2013,10 +1857,7 @@ int _mmcamcorder_set_video_stream_callback(MMHandleType handle, mm_camcorder_vid if (callback == NULL) _mmcam_dbg_warn("Video Stream Callback is disabled, because application sets it to NULL"); - if (!_MMCAMCORDER_TRYLOCK_VSTREAM_CALLBACK(hcamcorder)) { - _mmcam_dbg_warn("Application's video stream callback is running now"); - return MM_ERROR_CAMCORDER_INVALID_CONDITION; - } + _MMCAMCORDER_LOCK_VSTREAM_CALLBACK(hcamcorder); hcamcorder->vstream_cb = callback; hcamcorder->vstream_cb_param = user_data; @@ -2551,10 +2392,6 @@ void _mmcamcorder_set_state(MMHandleType handle, int state) /* To discern who changes the state */ switch (hcamcorder->state_change_by_system) { - case _MMCAMCORDER_STATE_CHANGE_BY_FOCUS: - msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_ASM; - msg.param.state.code = hcamcorder->interrupt_code; - break; case _MMCAMCORDER_STATE_CHANGE_BY_RM: msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGED_BY_RM; msg.param.state.code = MM_ERROR_NONE; @@ -2653,7 +2490,7 @@ _MMCamcorderSubContext *_mmcamcorder_alloc_subcontext(int type) } sc->fourcc = 0x80000000; - sc->cam_stability_count = 0; + sc->frame_stability_count = 0; sc->drop_vframe = 0; sc->pass_first_vframe = 0; sc->is_modified_rate = FALSE; @@ -3273,185 +3110,6 @@ DROP_MESSAGE: } -void _mmcamcorder_sound_focus_cb(int id, mm_sound_focus_type_e focus_type, - mm_sound_focus_state_e focus_state, const char *reason_for_change, - int option, const char *additional_info, void *user_data) -{ - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(user_data); - int current_state = MM_CAMCORDER_STATE_NONE; - - mmf_return_if_fail((MMHandleType)hcamcorder); - - current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder); - if (current_state <= MM_CAMCORDER_STATE_NONE || current_state >= MM_CAMCORDER_STATE_NUM) { - _mmcam_dbg_err("Abnormal state. Or null handle. (%p, %d)", hcamcorder, current_state); - return; - } - - _mmcam_dbg_warn("sound focus callback : focus state %d, reason %s", - focus_state, reason_for_change ? reason_for_change : "N/A"); - - if (hcamcorder->session_flags & MM_SESSION_OPTION_UNINTERRUPTIBLE) { - _mmcam_dbg_warn("session flag is UNINTERRUPTIBLE. do nothing."); - return; - } - - _MMCAMCORDER_LOCK_ASM(hcamcorder); - - /* check the reason */ - if (!strncmp(reason_for_change, "ringtone-voip", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) || - !strncmp(reason_for_change, "ringtone-call", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) || - !strncmp(reason_for_change, "voip", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) || - !strncmp(reason_for_change, "call-voice", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN)) { - hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_CALL_START; - } else if (!strncmp(reason_for_change, "alarm", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN)) { - hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_ALARM_START; - } else { - hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_MEDIA; - } - - if (focus_state == FOCUS_IS_RELEASED) { - hcamcorder->acquired_focus &= ~focus_type; - - _mmcam_dbg_warn("FOCUS is released [type %d, remained focus %d] : Stop pipeline[state:%d]", - focus_type, hcamcorder->acquired_focus, current_state); - - __mmcamcorder_force_stop(hcamcorder, _MMCAMCORDER_STATE_CHANGE_BY_FOCUS); - - _mmcam_dbg_warn("Finish opeartion. Pipeline is released"); - } else if (focus_state == FOCUS_IS_ACQUIRED) { - _MMCamcorderMsgItem msg; - - hcamcorder->acquired_focus |= focus_type; - - _mmcam_dbg_warn("FOCUS is acquired [type %d, new focus %d]", - focus_type, hcamcorder->acquired_focus); - - msg.id = MM_MESSAGE_READY_TO_RESUME; - _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); - - _mmcam_dbg_warn("Finish opeartion"); - } else { - _mmcam_dbg_warn("unknown focus state %d", focus_state); - } - - _MMCAMCORDER_UNLOCK_ASM(hcamcorder); - - _mmcam_dbg_warn("done"); - - return; -} - - -void _mmcamcorder_sound_signal_callback(mm_sound_signal_name_t signal, int value, void *user_data) -{ - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(user_data); - - mmf_return_if_fail(hcamcorder); - - _mmcam_dbg_warn("sound signal %d - value %d", signal, value); - - _MMCAMCORDER_LOCK_ASM(hcamcorder); - - if (signal == MM_SOUND_SIGNAL_RELEASE_INTERNAL_FOCUS && value == 1) { - _mmcam_dbg_warn("focus id %d, focus watch id %d", - hcamcorder->sound_focus_id, hcamcorder->sound_focus_watch_id); - - /* unregister focus related callback */ - if (hcamcorder->sound_focus_id > 0) { - if (hcamcorder->acquired_focus > 0) { - mm_sound_release_focus(hcamcorder->sound_focus_id, hcamcorder->acquired_focus, NULL); - _mmcam_dbg_warn("release acquired focus [focus %d] done", hcamcorder->acquired_focus); - hcamcorder->acquired_focus = 0; - } - - mm_sound_unregister_focus(hcamcorder->sound_focus_id); - _mmcam_dbg_warn("unregister sound focus done"); - hcamcorder->sound_focus_id = 0; - } - - if (hcamcorder->sound_focus_watch_id > 0) { - mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id); - _mmcam_dbg_warn("unset watch cb done"); - hcamcorder->sound_focus_watch_id = 0; - } - } - - /* reset flag not to run sound focus related code since now */ - hcamcorder->sound_focus_register = FALSE; - - _MMCAMCORDER_UNLOCK_ASM(hcamcorder); - - _mmcam_dbg_warn("done"); - - return; -} - - -void _mmcamcorder_sound_focus_watch_cb(int id, mm_sound_focus_type_e focus_type, mm_sound_focus_state_e focus_state, - const char *reason_for_change, const char *additional_info, void *user_data) -{ - mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(user_data); - int current_state = MM_CAMCORDER_STATE_NONE; - - mmf_return_if_fail(hcamcorder); - - current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder); - if (current_state <= MM_CAMCORDER_STATE_NONE || - current_state >= MM_CAMCORDER_STATE_NUM) { - _mmcam_dbg_err("Abnormal state. Or null handle. (%p, %d)", hcamcorder, current_state); - return; - } - - _mmcam_dbg_warn("sound focus watch callback : id %d, focus state %d, reason %s", - id, focus_state, reason_for_change ? reason_for_change : "N/A"); - - if (hcamcorder->session_flags & MM_SESSION_OPTION_UNINTERRUPTIBLE) { - _mmcam_dbg_warn("session flag is UNINTERRUPTIBLE. do nothing."); - return; - } - - _MMCAMCORDER_LOCK_ASM(hcamcorder); - - /* check the reason */ - if (!strncmp(reason_for_change, "ringtone-voip", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) || - !strncmp(reason_for_change, "ringtone-call", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) || - !strncmp(reason_for_change, "voip", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN) || - !strncmp(reason_for_change, "call-voice", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN)) { - hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_CALL_START; - } else if (!strncmp(reason_for_change, "alarm", __MMCAMCORDER_FOCUS_CHANGE_REASON_LEN)) { - hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_ALARM_START; - } else { - hcamcorder->interrupt_code = MM_MSG_CODE_INTERRUPTED_BY_MEDIA; - } - - if (focus_state == FOCUS_IS_RELEASED) { - _MMCamcorderMsgItem msg; - - _mmcam_dbg_warn("other process's FOCUS is released"); - - msg.id = MM_MESSAGE_READY_TO_RESUME; - _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); - - _mmcam_dbg_warn("Finish opeartion"); - } else if (focus_state == FOCUS_IS_ACQUIRED) { - _mmcam_dbg_warn("other process's FOCUS is acquired : Stop pipeline[state:%d]", current_state); - - __mmcamcorder_force_stop(hcamcorder, _MMCAMCORDER_STATE_CHANGE_BY_FOCUS); - - _mmcam_dbg_warn("Finish opeartion. Pipeline is released"); - } else { - _mmcam_dbg_warn("unknown focus state %d", focus_state); - } - - _MMCAMCORDER_UNLOCK_ASM(hcamcorder); - - _mmcam_dbg_warn("done"); - - return; -} - - void _mmcamcorder_dpm_camera_policy_changed_cb(const char *name, const char *value, void *user_data) { mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(user_data); @@ -3469,11 +3127,11 @@ void _mmcamcorder_dpm_camera_policy_changed_cb(const char *name, const char *val _mmcam_dbg_warn("camera policy [%s], current state [%d]", value, current_state); if (!strcmp(value, "disallowed")) { - _MMCAMCORDER_LOCK_ASM(hcamcorder); + _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder); __mmcamcorder_force_stop(hcamcorder, _MMCAMCORDER_STATE_CHANGE_BY_DPM); - _MMCAMCORDER_UNLOCK_ASM(hcamcorder); + _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder); _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "camera"); } @@ -3491,7 +3149,7 @@ int _mmcamcorder_create_pipeline(MMHandleType handle, int type) _MMCamcorderSubContext *sc = NULL; GstElement *pipeline = NULL; - _mmcam_dbg_log("handle : %x, type : %d", handle, type); + _mmcam_dbg_log("handle : %p, type : %d", handle, type); mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); @@ -3765,6 +3423,7 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s int result = MM_ERROR_NONE; int cmd_try_count = 0; int current_state = MM_CAMCORDER_STATE_NONE; + _MMCamcorderMsgItem msg; mmf_return_if_fail(hcamcorder); @@ -3791,6 +3450,30 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s /* set state_change_by_system for state change message */ hcamcorder->state_change_by_system = state_change_by_system; + if (current_state >= MM_CAMCORDER_STATE_READY) { + _mmcam_dbg_warn("send state change started message to notify"); + + memset(&msg, 0x0, sizeof(_MMCamcorderMsgItem)); + + switch (state_change_by_system) { + case _MMCAMCORDER_STATE_CHANGE_BY_RM: + msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_RM; + break; + case _MMCAMCORDER_STATE_CHANGE_BY_DPM: + msg.id = MM_MESSAGE_CAMCORDER_STATE_CHANGE_STARTED_BY_SECURITY; + break; + default: + break; + } + + if (msg.id != 0) { + msg.param.state.code = hcamcorder->interrupt_code; + _mmcamcorder_send_message((MMHandleType)hcamcorder, &msg); + } else { + _mmcam_dbg_err("should not be reached here %d", state_change_by_system); + } + } + for (loop = 0 ; current_state > MM_CAMCORDER_STATE_NULL && loop < __MMCAMCORDER_CMD_ITERATE_MAX * 3 ; loop++) { itr_cnt = __MMCAMCORDER_CMD_ITERATE_MAX; switch (current_state) { @@ -3836,9 +3519,8 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s { _mmcam_dbg_warn("Stop preview."); - while ((itr_cnt--) && ((result = _mmcamcorder_stop((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) { + while ((itr_cnt--) && ((result = _mmcamcorder_stop((MMHandleType)hcamcorder)) != MM_ERROR_NONE)) _mmcam_dbg_warn("Can't stop preview.(%x)", result); - } break; } @@ -3846,13 +3528,11 @@ void __mmcamcorder_force_stop(mmf_camcorder_t *hcamcorder, int state_change_by_s { _mmcam_dbg_warn("unrealize"); - if ((result = _mmcamcorder_unrealize((MMHandleType)hcamcorder)) != MM_ERROR_NONE) { + if ((result = _mmcamcorder_unrealize((MMHandleType)hcamcorder)) != MM_ERROR_NONE) _mmcam_dbg_warn("Can't unrealize.(%x)", result); - } break; } - case MM_CAMCORDER_STATE_NULL: default: _mmcam_dbg_warn("Already stopped."); break; @@ -3877,8 +3557,8 @@ static gboolean __mmcamcorder_handle_gst_error(MMHandleType handle, GstMessage * gchar *msg_src_element = NULL; _MMCamcorderSubContext *sc = NULL; - return_val_if_fail(hcamcorder, FALSE); - return_val_if_fail(error, FALSE); + mmf_return_val_if_fail(hcamcorder, FALSE); + mmf_return_val_if_fail(error, FALSE); sc = MMF_CAMCORDER_SUBCONTEXT(handle); mmf_return_val_if_fail(sc, FALSE); @@ -3990,7 +3670,7 @@ static gint __mmcamcorder_gst_handle_core_error(MMHandleType handle, int code, G static gint __mmcamcorder_gst_handle_library_error(MMHandleType handle, int code, GstMessage *message) { mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); - return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); + mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED); _mmcam_dbg_log(""); @@ -4045,7 +3725,7 @@ static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int cod _mmcam_dbg_err("DPM mic DISALLOWED - current state %d", current_state); - _MMCAMCORDER_LOCK_ASM(hcamcorder); + _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder); current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder); if (current_state >= MM_CAMCORDER_STATE_RECORDING) { @@ -4064,7 +3744,7 @@ static gint __mmcamcorder_gst_handle_resource_error(MMHandleType handle, int cod /* restore value */ hcamcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL; - _MMCAMCORDER_UNLOCK_ASM(hcamcorder); + _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder); _mmcamcorder_request_dpm_popup(hcamcorder->gdbus_conn, "microphone"); @@ -4180,8 +3860,8 @@ static gboolean __mmcamcorder_handle_gst_warning(MMHandleType handle, GstMessage gchar *debug = NULL; GError *err = NULL; - return_val_if_fail(hcamcorder, FALSE); - return_val_if_fail(error, FALSE); + mmf_return_val_if_fail(hcamcorder, FALSE); + mmf_return_val_if_fail(error, FALSE); _mmcam_dbg_log(""); @@ -4281,6 +3961,59 @@ void _mmcamcorder_emit_signal(MMHandleType handle, const char *object_name, } +#ifdef _MMCAMCORDER_MM_RM_SUPPORT +static int __mmcamcorder_resource_release_cb(mm_resource_manager_h rm, + mm_resource_manager_res_h res, void *user_data) +{ + mmf_camcorder_t *hcamcorder = (mmf_camcorder_t *) user_data; + + mmf_return_val_if_fail(hcamcorder, FALSE); + + _mmcam_dbg_warn("enter"); + + _MMCAMCORDER_LOCK_RESOURCE(hcamcorder); + + /* set flag for resource release callback */ + hcamcorder->is_release_cb_calling = TRUE; + + _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); + + _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder); + + if (res == hcamcorder->video_encoder_resource) { + /* Stop video recording */ + if (_mmcamcorder_commit((MMHandleType)hcamcorder) != MM_ERROR_NONE) { + _mmcam_dbg_err("commit failed, cancel it"); + _mmcamcorder_cancel((MMHandleType)hcamcorder); + } + } else { + /* Stop camera */ + __mmcamcorder_force_stop(hcamcorder, _MMCAMCORDER_STATE_CHANGE_BY_RM); + } + + _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder); + + _MMCAMCORDER_LOCK_RESOURCE(hcamcorder); + + if (res == hcamcorder->camera_resource) + hcamcorder->camera_resource = NULL; + else if (res == hcamcorder->video_overlay_resource) + hcamcorder->video_overlay_resource = NULL; + else if (res == hcamcorder->video_encoder_resource) + hcamcorder->video_encoder_resource = NULL; + + /* restore flag for resource release callback */ + hcamcorder->is_release_cb_calling = FALSE; + + _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder); + + _mmcam_dbg_warn("leave"); + + return FALSE; +} +#endif /* _MMCAMCORDER_MM_RM_SUPPORT */ + + #ifdef _MMCAMCORDER_RM_SUPPORT rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src, rm_device_request_s *info, void* cb_data) @@ -4292,11 +4025,10 @@ rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src, mmf_return_val_if_fail((MMHandleType)hcamcorder, RM_CB_RESULT_OK); current_state = _mmcamcorder_get_state((MMHandleType)hcamcorder); - if (current_state <= MM_CAMCORDER_STATE_NONE || current_state >= MM_CAMCORDER_STATE_NUM) { - _mmcam_dbg_err("Abnormal state. Or null handle. (%p, %d)", hcamcorder, current_state); - } - _MMCAMCORDER_LOCK_ASM(hcamcorder); + _mmcam_dbg_warn("current state %d (handle %p)", current_state, hcamcorder); + + _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder); /* set RM event code for sending it to application */ hcamcorder->interrupt_code = event_src; @@ -4311,8 +4043,62 @@ rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src, break; } - _MMCAMCORDER_UNLOCK_ASM(hcamcorder); + _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder); return cb_res; } #endif /* _MMCAMCORDER_RM_SUPPORT */ + + +int _mmcamcorder_manage_external_storage_state(MMHandleType handle, int storage_state) +{ + int ret = MM_ERROR_NONE; + int current_state = MM_CAMCORDER_STATE_NONE; + mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle); + _MMCamcorderMsgItem msg; + + mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT); + + _mmcam_dbg_warn("storage state %d", storage_state); + + /* check storage state */ + if (storage_state != STORAGE_STATE_UNMOUNTABLE && + storage_state != STORAGE_STATE_REMOVED) { + _mmcam_dbg_warn("nothing to do"); + return MM_ERROR_NONE; + } + + _MMCAMCORDER_LOCK_INTERRUPT(hcamcorder); + + /* check recording state */ + current_state = _mmcamcorder_get_state(handle); + + _mmcam_dbg_warn("current_state %d", current_state); + + if (current_state < MM_CAMCORDER_STATE_RECORDING) { + _mmcam_dbg_warn("no recording now"); + goto _MANAGE_DONE; + } + + /* check storage type */ + if (hcamcorder->storage_info.type != STORAGE_TYPE_EXTERNAL) { + _mmcam_dbg_warn("external storage is not used"); + goto _MANAGE_DONE; + } + + /* cancel recording */ + ret = _mmcamcorder_cancel(handle); + + /* send error message */ + msg.id = MM_MESSAGE_CAMCORDER_ERROR; + msg.param.code = MM_ERROR_OUT_OF_STORAGE; + + _mmcamcorder_send_message(handle, &msg); + +_MANAGE_DONE: + _MMCAMCORDER_UNLOCK_INTERRUPT(hcamcorder); + + _mmcam_dbg_warn("done - ret 0x%x", ret); + + return ret; +}