summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
ab5f2b9)
Change-Id: Ie726b3b60fb65e2ce2d5c3df65f278b387676891
Signed-off-by: Jeongmo Yang <jm80.yang@samsung.com>
Name: libmm-camcorder
Summary: Camera and recorder library
Name: libmm-camcorder
Summary: Camera and recorder library
Release: 0
Group: Multimedia/Libraries
License: Apache-2.0
Release: 0
Group: Multimedia/Libraries
License: Apache-2.0
- ret = _mmcamcorder_resource_create_resource_set(&hcamcorder->resource_manager);
- if (ret != MM_ERROR_NONE) {
- goto _ERR_DEFAULT_VALUE_INIT;
- }
-
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
_mmcam_dbg_warn("NULL dpm_policy");
}
#ifdef _MMCAMCORDER_MURPHY_SUPPORT
_mmcam_dbg_warn("NULL dpm_policy");
}
#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+ 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 */
hcamcorder->resource_manager.acquire_count = 0;
/* prepare resource manager for camera */
int _mmcamcorder_resource_create_resource_set(MMCamcorderResourceManager *resource_manager)
{
if (resource_manager->rset) {
int _mmcamcorder_resource_create_resource_set(MMCamcorderResourceManager *resource_manager)
{
if (resource_manager->rset) {
- _mmcam_dbg_err(" - resource set was already created");
- return MM_ERROR_RESOURCE_INVALID_STATE;
+ _mmcam_dbg_warn(" - resource set was already created, delete it");
+ mrp_res_delete_resource_set(resource_manager->rset);
+ resource_manager->rset = NULL;
}
resource_manager->rset = mrp_res_create_resource_set(resource_manager->context,
}
resource_manager->rset = mrp_res_create_resource_set(resource_manager->context,