extern "C" {
#endif
+#define __MMCAMCORDER_RESOURCE_WAIT_TIME 3
+
typedef enum {
MM_CAMCORDER_RESOURCE_TYPE_CAMERA,
MM_CAMCORDER_RESOURCE_TYPE_VIDEO_OVERLAY,
} MMCamcorderResourceManager;
int _mmcamcorder_resource_manager_init(MMCamcorderResourceManager *resource_manager, void *user_data);
+int _mmcamcorder_resource_wait_for_connection(MMCamcorderResourceManager *resource_manager, void *hcamcorder);
int _mmcamcorder_resource_create_resource_set(MMCamcorderResourceManager *resource_manager);
int _mmcamcorder_resource_manager_prepare(MMCamcorderResourceManager *resource_manager, MMCamcorderResourceType resource_type);
int _mmcamcorder_resource_manager_acquire(MMCamcorderResourceManager *resource_manager);
#define DPM_ALLOWED 1
#define DPM_DISALLOWED 0
-#ifdef _MMCAMCORDER_MURPHY_SUPPORT
-#define __MMCAMCORDER_RESOURCE_WAIT_TIME 3
-#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
-
-
/*---------------------------------------------------------------------------------------
| LOCAL FUNCTION PROTOTYPES: |
---------------------------------------------------------------------------------------*/
#ifdef _MMCAMCORDER_MURPHY_SUPPORT
if (info->videodev_type != MM_VIDEO_DEVICE_NONE) {
- _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
-
- if (hcamcorder->resource_manager.is_connected == FALSE) {
- gint64 end_time = 0;
-
- /* wait for resource manager connected */
- _mmcam_dbg_log("resource manager is not connected. wait for signal...");
-
- 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_DEFAULT_VALUE_INIT;
- }
+ 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;
}
-
- _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
}
#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
}
#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");
+ 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;
camcorder->resource_manager.is_connected = FALSE;
}
+ _MMCAMCORDER_UNLOCK_RESOURCE(camcorder);
+
_MMCAMCORDER_LOCK_ASM(camcorder);
/* set value to inform a status is changed by resource manaer */
camcorder->state_change_by_system = _MMCAMCORDER_STATE_CHANGE_NORMAL;
_MMCAMCORDER_UNLOCK_ASM(camcorder);
+
+ _MMCAMCORDER_LOCK_RESOURCE(camcorder);
break;
}
return MM_ERROR_NONE;
}
+
+int _mmcamcorder_resource_wait_for_connection(MMCamcorderResourceManager *resource_manager, void *hcamcorder)
+{
+ int ret = MM_ERROR_NONE;
+
+ mmf_return_val_if_fail(resource_manager && hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+
+ _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
+
+ if (resource_manager->is_connected == FALSE) {
+ gint64 end_time = 0;
+
+ /* wait for resource manager connected */
+ _mmcam_dbg_warn("not connected. wait for signal...");
+
+ 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");
+ ret = MM_ERROR_NONE;
+ } else {
+ _mmcam_dbg_err("connection timeout");
+ ret = MM_ERROR_RESOURCE_INTERNAL;
+ }
+ } else {
+ _mmcam_dbg_warn("already connected");
+ }
+
+ _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+
+ return ret;
+}
+
+
int _mmcamcorder_resource_manager_prepare(MMCamcorderResourceManager *resource_manager, MMCamcorderResourceType resource_type)
{
MMCAMCORDER_CHECK_RESOURCE_MANAGER_INSTANCE(resource_manager);