X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmm_camcorder.c;h=34bad5e6241a4d29b5a5b2f449f4be6b71c258ea;hb=82c2496f7c00323b5b781d558447bd9d977e31a9;hp=25143553d7c7be78f41a7924ec64bc82525463e0;hpb=235c811494b7fcc70c9575df92cc69990352f888;p=platform%2Fcore%2Fmultimedia%2Flibmm-camcorder.git

diff --git a/src/mm_camcorder.c b/src/mm_camcorder.c
index 2514355..34bad5e 100644
--- a/src/mm_camcorder.c
+++ b/src/mm_camcorder.c
@@ -25,11 +25,9 @@
 #include <stdio.h>
 #include <string.h>
 
-
 #include <mm_error.h>
-#include <mm_ta.h>
-
 #include <mm_attrs_private.h>
+
 #include "mm_camcorder.h"
 #include "mm_camcorder_internal.h"
 
@@ -49,11 +47,11 @@ int mm_camcorder_create(MMHandleType *camcorder, MMCamPreset *info)
 
 	_mmcam_dbg_err("");
 
-	MMTA_INIT() ;
+	traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:CREATE");
 
-	__ta__("_mmcamcorder_create",
 	error = _mmcamcorder_create(camcorder, info);
-	);
+
+	traceEnd(TTRACE_TAG_CAMERA);
 
 	_mmcam_dbg_err("END");
 
@@ -69,12 +67,11 @@ int mm_camcorder_destroy(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	__ta__("_mmcamcorder_destroy",
+	traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:DESTROY");
+
 	error = _mmcamcorder_destroy(camcorder);
-	);
 
-	MMTA_ACUM_ITEM_SHOW_RESULT_TO(MMTA_SHOW_FILE);
-	MMTA_RELEASE();
+	traceEnd(TTRACE_TAG_CAMERA);
 
 	_mmcam_dbg_err("END!!!");
 
@@ -90,14 +87,15 @@ int mm_camcorder_realize(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	if(((mmf_camcorder_t *)camcorder)->sync_state_change) {
-		__ta__("_mmcamcorder_realize",
-		error = _mmcamcorder_realize(camcorder);
-		);
-	} else {
-		/* After sending command, this function just return immediately. */
-		error = _mmcamcorder_append_simple_command(camcorder, _MMCAMCORDER_CMD_REALIZE);
-	}
+	_MMCAMCORDER_LOCK_ASM(camcorder);
+
+	traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:REALIZE");
+
+	error = _mmcamcorder_realize(camcorder);
+
+	traceEnd(TTRACE_TAG_CAMERA);
+
+	_MMCAMCORDER_UNLOCK_ASM(camcorder);
 
 	_mmcam_dbg_err("END");
 
@@ -113,14 +111,15 @@ int mm_camcorder_unrealize(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	if(((mmf_camcorder_t *)camcorder)->sync_state_change) {
-		__ta__("_mmcamcorder_unrealize",
-		error = _mmcamcorder_unrealize(camcorder);
-		);
-	} else {
-		/* After sending command, this function just return immediately. */
-		error = _mmcamcorder_append_simple_command(camcorder, _MMCAMCORDER_CMD_UNREALIZE);
-	}
+	_MMCAMCORDER_LOCK_ASM(camcorder);
+
+	traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:UNREALIZE");
+
+	error = _mmcamcorder_unrealize(camcorder);
+
+	traceEnd(TTRACE_TAG_CAMERA);
+
+	_MMCAMCORDER_UNLOCK_ASM(camcorder);
 
 	_mmcam_dbg_err("END");
 
@@ -136,14 +135,15 @@ int mm_camcorder_start(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	if(((mmf_camcorder_t *)camcorder)->sync_state_change) {
-		__ta__("_mmcamcorder_start",
-		error = _mmcamcorder_start(camcorder);
-		);
-	} else {
-		/* After sending command, this function just return immediately. */
-		error = _mmcamcorder_append_simple_command(camcorder, _MMCAMCORDER_CMD_START);
-	}
+	_MMCAMCORDER_LOCK_ASM(camcorder);
+
+	traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:START");
+
+	error = _mmcamcorder_start(camcorder);
+
+	traceEnd(TTRACE_TAG_CAMERA);
+
+	_MMCAMCORDER_UNLOCK_ASM(camcorder);
 
 	_mmcam_dbg_err("END");
 
@@ -159,14 +159,15 @@ int mm_camcorder_stop(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	if(((mmf_camcorder_t *)camcorder)->sync_state_change) {
-		__ta__("_mmcamcorder_stop",
-		error = _mmcamcorder_stop(camcorder);
-		);
-	} else {
-		/* After sending command, this function just return immediately. */
-		error = _mmcamcorder_append_simple_command(camcorder, _MMCAMCORDER_CMD_STOP);
-	}
+	_MMCAMCORDER_LOCK_ASM(camcorder);
+
+	traceBegin(TTRACE_TAG_CAMERA, "MMCAMCORDER:STOP");
+
+	error = _mmcamcorder_stop(camcorder);
+
+	traceEnd(TTRACE_TAG_CAMERA);
+
+	_MMCAMCORDER_UNLOCK_ASM(camcorder);
 
 	_mmcam_dbg_err("END");
 
@@ -182,9 +183,11 @@ int mm_camcorder_capture_start(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	__ta__("_mmcamcorder_capture_start",
+	_MMCAMCORDER_LOCK_ASM(camcorder);
+
 	error = _mmcamcorder_capture_start(camcorder);
-	);
+
+	_MMCAMCORDER_UNLOCK_ASM(camcorder);
 
 	_mmcam_dbg_err("END");
 
@@ -200,9 +203,11 @@ int mm_camcorder_capture_stop(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	__ta__("_mmcamcorder_capture_stop",
+	_MMCAMCORDER_LOCK_ASM(camcorder);
+
 	error = _mmcamcorder_capture_stop(camcorder);
-	);
+
+	_MMCAMCORDER_UNLOCK_ASM(camcorder);
 
 	_mmcam_dbg_err("END");
 
@@ -218,9 +223,11 @@ int mm_camcorder_record(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	__ta__("_mmcamcorder_record",
+	_MMCAMCORDER_LOCK_ASM(camcorder);
+
 	error = _mmcamcorder_record(camcorder);
-	);
+
+	_MMCAMCORDER_UNLOCK_ASM(camcorder);
 
 	_mmcam_dbg_err("END");
 
@@ -236,9 +243,11 @@ int mm_camcorder_pause(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	__ta__("_mmcamcorder_pause",
+	_MMCAMCORDER_LOCK_ASM(camcorder);
+
 	error = _mmcamcorder_pause(camcorder);
-	);
+
+	_MMCAMCORDER_UNLOCK_ASM(camcorder);
 
 	_mmcam_dbg_err("END");
 
@@ -254,16 +263,11 @@ int mm_camcorder_commit(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	MMTA_ACUM_ITEM_BEGIN("Real Commit Time", 0);
+	_MMCAMCORDER_LOCK_ASM(camcorder);
 
-	if(((mmf_camcorder_t *)camcorder)->sync_state_change) {
-		__ta__("_mmcamcorder_stop",
-		error = _mmcamcorder_commit(camcorder);
-		);
-	} else {
-		/* After sending command, this function just return immediately. */
-		error = _mmcamcorder_append_simple_command(camcorder, _MMCAMCORDER_CMD_COMMIT);
-	}
+	error = _mmcamcorder_commit(camcorder);
+
+	_MMCAMCORDER_UNLOCK_ASM(camcorder);
 
 	_mmcam_dbg_err("END");
 
@@ -279,9 +283,11 @@ int mm_camcorder_cancel(MMHandleType camcorder)
 
 	_mmcam_dbg_err("");
 
-	__ta__("_mmcamcorder_cancel",
+	_MMCAMCORDER_LOCK_ASM(camcorder);
+
 	error = _mmcamcorder_cancel(camcorder);
-	);
+
+	_MMCAMCORDER_UNLOCK_ASM(camcorder);
 
 	_mmcam_dbg_err("END");
 
@@ -291,49 +297,33 @@ int mm_camcorder_cancel(MMHandleType camcorder)
 
 int mm_camcorder_set_message_callback(MMHandleType  camcorder, MMMessageCallback callback, void *user_data)
 {
-	int error = MM_ERROR_NONE;
-
 	mmf_return_val_if_fail((void *)camcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
-	error = _mmcamcorder_set_message_callback(camcorder, callback, user_data);
-
-	return error;
+	return _mmcamcorder_set_message_callback(camcorder, callback, user_data);
 }
 
 
 int mm_camcorder_set_video_stream_callback(MMHandleType camcorder, mm_camcorder_video_stream_callback callback, void* user_data)
 {
-	int error = MM_ERROR_NONE;
-
 	mmf_return_val_if_fail((void *)camcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
-	error = _mmcamcorder_set_video_stream_callback(camcorder, callback, user_data);
-
-	return error;
+	return _mmcamcorder_set_video_stream_callback(camcorder, callback, user_data);
 }
 
 
 int mm_camcorder_set_audio_stream_callback(MMHandleType camcorder, mm_camcorder_audio_stream_callback callback, void* user_data)
 {
-	int error = MM_ERROR_NONE;
-
 	mmf_return_val_if_fail((void *)camcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT);
 
-	error = _mmcamcorder_set_audio_stream_callback(camcorder, callback, user_data);
-
-	return error;
+	return _mmcamcorder_set_audio_stream_callback(camcorder, callback, user_data);
 }
 
 
 int mm_camcorder_set_video_capture_callback(MMHandleType camcorder, mm_camcorder_video_capture_callback callback, void* user_data)
 {
-	int error = MM_ERROR_NONE;
-
 	mmf_return_val_if_fail((void *)camcorder, MM_ERROR_CAMCORDER_INVALID_ARGUMENT );
 
-	error = _mmcamcorder_set_video_capture_callback(camcorder, callback, user_data);
-
-	return error;
+	return _mmcamcorder_set_video_capture_callback(camcorder, callback, user_data);
 }
 
 
@@ -378,7 +368,7 @@ int mm_camcorder_set_attributes(MMHandleType camcorder,  char **err_attr_name, c
 	va_start (var_args, attribute_name);
 	ret = _mmcamcorder_set_attributes(camcorder, err_attr_name, attribute_name, var_args);
 	va_end (var_args);
-	
+
 	return ret;
 }
 
@@ -388,6 +378,11 @@ int mm_camcorder_get_attribute_info(MMHandleType camcorder, const char *attribut
 	return _mmcamcorder_get_attribute_info(camcorder, attribute_name, info);
 }
 
+int mm_camcorder_get_fps_list_by_resolution(MMHandleType camcorder, int width, int height, MMCamAttrsInfo *fps_info)
+{
+	return _mmcamcorder_get_fps_array_by_resolution(camcorder, width, height, fps_info);
+}
+
 
 int mm_camcorder_init_focusing(MMHandleType camcorder)
 {
@@ -426,3 +421,7 @@ int mm_camcorder_stop_focusing(MMHandleType camcorder)
 	return error;
 }
 
+int mm_camcorder_get_video_caps(MMHandleType handle, char **caps)
+{
+	return _mmcamcorder_get_video_caps(handle, caps);
+}