#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: |
---------------------------------------------------------------------------------------*/
g_mutex_init(&(hcamcorder->mtsafe).vcapture_cb_lock);
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);
g_mutex_init(&(hcamcorder->mtsafe).resource_lock);
_mmcam_dbg_log("DPM camera changed cb id %d", hcamcorder->dpm_camera_cb_id);
}
+
+#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+ /* initialize resource manager */
+ 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_DEFAULT_VALUE_INIT;
+ }
+#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
} else {
_mmcamcorder_conf_get_value_int((MMHandleType)hcamcorder, hcamcorder->conf_main,
CONFIGURE_CATEGORY_MAIN_VIDEO_INPUT,
}
}
-#ifdef _MMCAMCORDER_MURPHY_SUPPORT
- /* initialize resource manager */
- 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_DEFAULT_VALUE_INIT;
- }
-#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
-
traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:CREATE:INIT_GSTREAMER");
ret = __mmcamcorder_gstreamer_init(hcamcorder->conf_main);
}
#ifdef _MMCAMCORDER_MURPHY_SUPPORT
- _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;
+ 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;
}
}
-
- _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
/* Set initial state */
g_mutex_clear(&(hcamcorder->mtsafe).vcapture_cb_lock);
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);
g_mutex_clear(&(hcamcorder->mtsafe).resource_lock);
g_mutex_clear(&(hcamcorder->mtsafe).vcapture_cb_lock);
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);
g_mutex_clear(&(hcamcorder->mtsafe).resource_lock);
}
#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;
/* acquire resources */
_MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
- if (hcamcorder->resource_manager.rset && _mmcamcorder_resource_manager_acquire(&hcamcorder->resource_manager)) {
+ ret = _mmcamcorder_resource_manager_acquire(&hcamcorder->resource_manager);
+ if (ret != MM_ERROR_NONE) {
_MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
_mmcam_dbg_err("could not acquire resources");
}
#ifdef _MMCAMCORDER_MURPHY_SUPPORT
+ _mmcam_dbg_warn("lock resource - cb calling %d", hcamcorder->resource_release_cb_calling);
+
+ _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
+
if (hcamcorder->type == MM_CAMCORDER_MODE_VIDEO_CAPTURE &&
- hcamcorder->state_change_by_system != _MMCAMCORDER_STATE_CHANGE_BY_RM) {
+ hcamcorder->state_change_by_system != _MMCAMCORDER_STATE_CHANGE_BY_RM &&
+ hcamcorder->resource_release_cb_calling == FALSE) {
gint64 end_time = 0;
- _mmcam_dbg_log("lock resource");
- _MMCAMCORDER_LOCK_RESOURCE(hcamcorder);
-
/* release resource */
ret = _mmcamcorder_resource_manager_release(&hcamcorder->resource_manager);
if (ret == MM_ERROR_RESOURCE_INVALID_STATE) {
_MMCAMCORDER_RESOURCE_WAIT_UNTIL(hcamcorder, end_time);
}
-
- _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
- _mmcam_dbg_log("unlock resource");
}
+
+ _MMCAMCORDER_UNLOCK_RESOURCE(hcamcorder);
+
+ _mmcam_dbg_warn("unlock resource");
#endif /* _MMCAMCORDER_MURPHY_SUPPORT */
#ifdef _MMCAMCORDER_RM_SUPPORT
_mmcamcorder_set_state(handle, MM_CAMCORDER_STATE_PREPARE);
+ /* set attributes related sensor - after start preview */
+ if (hcamcorder->type != MM_CAMCORDER_MODE_AUDIO)
+ _mmcamcorder_set_attribute_to_camsensor2(handle);
+
_MMCAMCORDER_UNLOCK_CMD(hcamcorder);
return MM_ERROR_NONE;
}
+int _mmcamcorder_set_muxed_stream_callback(MMHandleType handle, mm_camcorder_muxed_stream_callback callback, void *user_data)
+{
+ mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
+
+ _mmcam_dbg_log("");
+
+ mmf_return_val_if_fail(hcamcorder, MM_ERROR_CAMCORDER_NOT_INITIALIZED);
+
+ if (callback == NULL)
+ _mmcam_dbg_warn("Muxed Stream Callback is disabled, because application sets it to NULL");
+
+ if (!_MMCAMCORDER_TRYLOCK_MSTREAM_CALLBACK(hcamcorder)) {
+ _mmcam_dbg_warn("Application's muxed stream callback is running now");
+ return MM_ERROR_CAMCORDER_INVALID_CONDITION;
+ }
+
+ hcamcorder->mstream_cb = callback;
+ hcamcorder->mstream_cb_param = user_data;
+
+ _MMCAMCORDER_UNLOCK_MSTREAM_CALLBACK(hcamcorder);
+
+ return MM_ERROR_NONE;
+}
+
+
int _mmcamcorder_set_video_capture_callback(MMHandleType handle, mm_camcorder_video_capture_callback callback, void *user_data)
{
mmf_camcorder_t *hcamcorder = MMF_CAMCORDER(handle);
pipeline = sc->element[_MMCAMCORDER_MAIN_PIPE].gst;
if (message->src == (GstObject*)pipeline) {
vnewstate = gst_structure_get_value(gst_message_get_structure(message), "new-state");
- newstate = (GstState)vnewstate->data[0].v_int;
- _mmcam_dbg_log("GST_MESSAGE_STATE_CHANGED[%s]", gst_element_state_get_name(newstate));
+ if (vnewstate) {
+ newstate = (GstState)vnewstate->data[0].v_int;
+ _mmcam_dbg_log("GST_MESSAGE_STATE_CHANGED[%s]", gst_element_state_get_name(newstate));
+ } else {
+ _mmcam_dbg_warn("get new state failed from msg");
+ }
}
}
}
return;
}
- _mmcam_dbg_log("sound focus callback : focus state %d, reason %s",
+ _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) {
if (focus_state == FOCUS_IS_RELEASED) {
hcamcorder->acquired_focus &= ~focus_type;
- _mmcam_dbg_log("FOCUS is released [type %d, remained focus %d] : Stop pipeline[state:%d]",
+ _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);
- _mmcam_dbg_log("Finish opeartion. Pipeline is released");
+ _mmcam_dbg_warn("Finish opeartion. Pipeline is released");
} else if (focus_state == FOCUS_IS_ACQUIRED) {
_MMCamcorderMsgItem msg;
hcamcorder->acquired_focus |= focus_type;
- _mmcam_dbg_log("FOCUS is acquired [type %d, new focus %d]",
+ _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_log("Finish opeartion");
+ _mmcam_dbg_warn("Finish opeartion");
} else {
- _mmcam_dbg_log("unknown focus state %d", focus_state);
+ _mmcam_dbg_warn("unknown focus state %d", focus_state);
}
/* restore value */
_MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+ _mmcam_dbg_warn("done");
+
return;
}
mmf_return_if_fail(hcamcorder);
- _mmcam_dbg_log("sound signal %d - value %d", signal, value);
+ _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_log("watch cb id %d", hcamcorder->sound_focus_watch_id);
+ _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;
+ }
- /* unregister watch callback */
if (hcamcorder->sound_focus_watch_id > 0) {
mm_sound_unset_focus_watch_callback(hcamcorder->sound_focus_watch_id);
- _mmcam_dbg_log("unset watch cb done");
+ _mmcam_dbg_warn("unset watch cb done");
hcamcorder->sound_focus_watch_id = 0;
}
}
return;
}
- _mmcam_dbg_log("sound focus watch callback : id %d, focus state %d, reason %s",
+ _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) {
if (focus_state == FOCUS_IS_RELEASED) {
_MMCamcorderMsgItem msg;
- _mmcam_dbg_log("other process's FOCUS is released");
+ _mmcam_dbg_warn("other process's FOCUS is released");
msg.id = MM_MESSAGE_READY_TO_RESUME;
_mmcamcorder_send_message((MMHandleType)hcamcorder, &msg);
- _mmcam_dbg_log("Finish opeartion");
+ _mmcam_dbg_warn("Finish opeartion");
} else if (focus_state == FOCUS_IS_ACQUIRED) {
- _mmcam_dbg_log("other process's FOCUS is acquired : Stop pipeline[state:%d]", current_state);
+ _mmcam_dbg_warn("other process's FOCUS is acquired : Stop pipeline[state:%d]", current_state);
__mmcamcorder_force_stop(hcamcorder);
- _mmcam_dbg_log("Finish opeartion. Pipeline is released");
+ _mmcam_dbg_warn("Finish opeartion. Pipeline is released");
} else {
- _mmcam_dbg_log("unknown focus state %d", focus_state);
+ _mmcam_dbg_warn("unknown focus state %d", focus_state);
}
/* restore value */
_MMCAMCORDER_UNLOCK_ASM(hcamcorder);
+ _mmcam_dbg_warn("done");
+
return;
}
projects / platform / core / multimedia / libmm-camcorder.git / blobdiff