[Version] 0.10.159
[Profile] Common
[Issue Type] Bug fix
[Dependency module] N/A
Change-Id: I2eb97dcbffd3490dac0df2f833df1f5fa0037357
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
&hcamcorder->camera_resource);
if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
_mmcam_dbg_err("could not prepare for camera resource");
&hcamcorder->camera_resource);
if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
_mmcam_dbg_err("could not prepare for camera resource");
- ret = MM_ERROR_CAMCORDER_INTERNAL;
+ ret = MM_ERROR_RESOURCE_INTERNAL;
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
}
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
}
&hcamcorder->video_overlay_resource);
if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
_mmcam_dbg_err("could not prepare for overlay resource");
&hcamcorder->video_overlay_resource);
if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
_mmcam_dbg_err("could not prepare for overlay resource");
- ret = MM_ERROR_CAMCORDER_INTERNAL;
+ ret = MM_ERROR_RESOURCE_INTERNAL;
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
}
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
}
/* acquire resources */
ret = mm_resource_manager_commit(hcamcorder->resource_manager);
if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
/* acquire resources */
ret = mm_resource_manager_commit(hcamcorder->resource_manager);
if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
- _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
-
_mmcam_dbg_err("could not acquire resources");
_mmcam_dbg_err("could not acquire resources");
+ ret = MM_ERROR_RESOURCE_INTERNAL;
+ _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
}
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
}
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
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");
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;
}
}
goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
}
}
iret = rm_allocate_resources(hcamcorder->rm_handle, &(hcamcorder->request_resources), &hcamcorder->returned_devices);
if (iret != RM_OK) {
_mmcam_dbg_err("Resource allocation request failed");
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 */
goto _ERR_CAMCORDER_CMD_PRECON_AFTER_LOCK;
}
#endif /* _MMCAMCORDER_RM_SUPPORT */
&hcamcorder->video_encoder_resource);
if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
_mmcam_dbg_err("could not prepare for encoder resource");
&hcamcorder->video_encoder_resource);
if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
_mmcam_dbg_err("could not prepare for encoder resource");
- ret = MM_ERROR_CAMCORDER_INTERNAL;
+ ret = MM_ERROR_RESOURCE_INTERNAL;
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
goto _ERR_CAMCORDER_VIDEO_COMMAND;
}
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
goto _ERR_CAMCORDER_VIDEO_COMMAND;
}
/* acquire resources */
ret = mm_resource_manager_commit(hcamcorder->resource_manager);
if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
/* acquire resources */
ret = mm_resource_manager_commit(hcamcorder->resource_manager);
if (ret != MM_RESOURCE_MANAGER_ERROR_NONE) {
- _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
-
_mmcam_dbg_err("could not acquire resources");
_mmcam_dbg_err("could not acquire resources");
+ ret = MM_ERROR_RESOURCE_INTERNAL;
+ _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
goto _ERR_CAMCORDER_VIDEO_COMMAND;
}
goto _ERR_CAMCORDER_VIDEO_COMMAND;
}