From 8e43fa4b9c486fa346091deb50b814dc0ce5adff Mon Sep 17 00:00:00 2001 From: Jeongmo Yang Date: Fri, 17 Mar 2017 17:43:33 +0900 Subject: [PATCH] Add new function to manager external storage state for recording [Version] 0.10.115 [Profile] Common [Issue Type] Update [Dependency module] N/A [Test] [M(T) - Boot=(OK), sdb=(OK), Home=(OK), Touch=(OK), Version=tizen-3.0-mobile_20170315.2] Change-Id: I434ce9c4f4a6f8ea311fa101ac0bc5279e61c526 Signed-off-by: Jeongmo Yang --- packaging/libmm-camcorder.spec | 2 +- src/include/mm_camcorder.h | 3 +++ src/include/mm_camcorder_internal.h | 6 ++++- src/mm_camcorder.c | 7 +++++ src/mm_camcorder_internal.c | 54 +++++++++++++++++++++++++++++++++++++ 5 files changed, 70 insertions(+), 2 deletions(-) diff --git a/packaging/libmm-camcorder.spec b/packaging/libmm-camcorder.spec index 90843ec..47ee49e 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.114 +Version: 0.10.115 Release: 0 Group: Multimedia/Libraries License: Apache-2.0 diff --git a/src/include/mm_camcorder.h b/src/include/mm_camcorder.h index fe5164d..55f2249 100644 --- a/src/include/mm_camcorder.h +++ b/src/include/mm_camcorder.h @@ -3348,6 +3348,9 @@ void mm_camcorder_emit_signal(MMHandleType camcorder, const char *object_name, /* check compatability between codec and file format */ int mm_camcorder_check_codec_fileformat_compatibility(const char *codec_type, int codec, int file_format); +/* external storage state management */ +int mm_camcorder_manage_external_storage_state(MMHandleType camcorder, int storage_state); + /** @} */ diff --git a/src/include/mm_camcorder_internal.h b/src/include/mm_camcorder_internal.h index 1dac082..9406224 100644 --- a/src/include/mm_camcorder_internal.h +++ b/src/include/mm_camcorder_internal.h @@ -591,7 +591,8 @@ typedef enum { _MMCAMCORDER_STATE_CHANGE_NORMAL = 0, _MMCAMCORDER_STATE_CHANGE_BY_FOCUS, _MMCAMCORDER_STATE_CHANGE_BY_RM, - _MMCAMCORDER_STATE_CHANGE_BY_DPM + _MMCAMCORDER_STATE_CHANGE_BY_DPM, + _MMCAMCORDER_STATE_CHANGE_BY_STORAGE } _MMCamcorderStateChange; @@ -1273,6 +1274,9 @@ void _mmcamcorder_dpm_camera_policy_changed_cb(const char *name, const char *val void _mmcamcorder_emit_signal(MMHandleType handle, const char *object_name, const char *interface_name, const char *signal_name, int value); +/* external storage state management */ +int _mmcamcorder_manage_external_storage_state(MMHandleType handle, int storage_state); + #ifdef __cplusplus } #endif diff --git a/src/mm_camcorder.c b/src/mm_camcorder.c index 7dafb33..d218e25 100644 --- a/src/mm_camcorder.c +++ b/src/mm_camcorder.c @@ -455,3 +455,10 @@ int mm_camcorder_check_codec_fileformat_compatibility(const char *codec_type, in return _mmcamcorder_check_codec_fileformat_compatibility(codec_type, codec, file_format); } + +int mm_camcorder_manage_external_storage_state(MMHandleType camcorder, int storage_state) +{ + mmf_return_val_if_fail((void *)camcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT); + + return _mmcamcorder_manage_external_storage_state(camcorder, storage_state); +} diff --git a/src/mm_camcorder_internal.c b/src/mm_camcorder_internal.c index 76193cf..a4e13d9 100644 --- a/src/mm_camcorder_internal.c +++ b/src/mm_camcorder_internal.c @@ -4316,3 +4316,57 @@ rm_cb_result _mmcamcorder_rm_callback(int handle, rm_callback_type event_src, 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_ASM(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_ASM(hcamcorder); + + _mmcam_dbg_warn("done - ret 0x%x", ret); + + return ret; +} -- 2.7.4