X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=src%2Fmedia_face.c;h=b1981264691e74bca9c4c89bb97897134e4004f0;hb=6b7f771c6778c71081c959fc8f2d3375a8d29a63;hp=bc02e48ec2008811fad6a5ecf0fa4aa874bf217c;hpb=8c04b0e91fdecd1d3d529ea6db1cedaee33e9b08;p=platform%2Fcore%2Fapi%2Fmedia-content.git

diff --git a/src/media_face.c b/src/media_face.c
index bc02e48..b198126 100755
--- a/src/media_face.c
+++ b/src/media_face.c
@@ -26,20 +26,20 @@ static int __media_face_check_media_id(const char *media_id)
 	sqlite3_stmt *stmt = NULL;
 	int item_count = 0;
 
-	media_content_retvm_if(!STRING_VALID(media_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid media_id");
+	content_retvm_if(!STRING_VALID(media_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid media_id");
 
 	/* Get image count */
 	query_str = sqlite3_mprintf(SELECT_IMAGE_COUNT_FROM_MEDIA_BY_ID, media_id);
 	ret = _content_get_result(query_str, &stmt);
 	SQLITE3_SAFE_FREE(query_str);
-	media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
+	content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
 	if (sqlite3_step(stmt) == SQLITE_ROW)
 		item_count = (int)sqlite3_column_int(stmt, 0);
 
 	SQLITE3_FINALIZE(stmt);
 
-	media_content_retvm_if(item_count == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_id");
+	content_retvm_if(item_count == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_id");
 
 	return MEDIA_CONTENT_ERROR_NONE;
 }
@@ -48,7 +48,7 @@ int media_face_destroy(media_face_h face)
 {
 	media_face_s *_face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
 
 	SAFE_FREE(_face->media_id);
 	SAFE_FREE(_face->face_tag);
@@ -61,16 +61,16 @@ int media_face_clone(media_face_h *dst, media_face_h src)
 {
 	media_face_s *_src = (media_face_s*)src;
 
-	media_content_retvm_if(src == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid src handle");
+	content_retvm_if(src == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid src handle");
 
 	media_face_s *_dst = (media_face_s *)calloc(1, sizeof(media_face_s));
-	media_content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
+	content_retvm_if(_dst == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "OUT_OF_MEMORY");
 
 	if (STRING_VALID(_src->media_id)) {
 		_dst->media_id = strdup(_src->media_id);
 		if (_dst->media_id == NULL) {
 			media_face_destroy((media_face_h)_dst);
-			media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+			content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
 			return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
 		}
 	}
@@ -86,7 +86,7 @@ int media_face_clone(media_face_h *dst, media_face_h src)
 		_dst->face_tag = strdup(_src->face_tag);
 		if (_dst->face_tag == NULL) {
 			media_face_destroy((media_face_h)_dst);
-			media_content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
+			content_error("OUT_OF_MEMORY(0x%08x)", MEDIA_CONTENT_ERROR_OUT_OF_MEMORY);
 			return MEDIA_CONTENT_ERROR_OUT_OF_MEMORY;
 		}
 	}
@@ -108,11 +108,11 @@ int media_face_get_face_id(media_face_h face, char **face_id)
 {
 	media_face_s* _face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
 
 	if (_face->face_id > 0) {
 		__media_face_convert_itoa(_face->face_id, face_id);
-		media_content_retvm_if(*face_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Out of memory");
+		content_retvm_if(*face_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Out of memory");
 	} else {
 		*face_id = NULL;
 	}
@@ -124,11 +124,11 @@ int media_face_get_media_id(media_face_h face, char **media_id)
 {
 	media_face_s* _face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
 
 	if (STRING_VALID(_face->media_id)) {
 		*media_id = strdup(_face->media_id);
-		media_content_retvm_if(*media_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Out of memory");
+		content_retvm_if(*media_id == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Out of memory");
 	} else {
 		*media_id = NULL;
 	}
@@ -140,8 +140,8 @@ int media_face_get_face_rect(media_face_h face, unsigned int *rect_x, unsigned i
 {
 	media_face_s* _face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
-	media_content_retvm_if(!(rect_x && rect_y && rect_w && rect_h), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(!(rect_x && rect_y && rect_w && rect_h), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect");
 
 	*rect_x = _face->face_rect_x;
 	*rect_y = _face->face_rect_y;
@@ -155,8 +155,8 @@ int media_face_get_orientation(media_face_h face, media_content_orientation_e *o
 {
 	media_face_s* _face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
-	media_content_retvm_if(orientation == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid orientation");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(orientation == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid orientation");
 
 	*orientation = _face->orientation;
 
@@ -167,11 +167,11 @@ int media_face_get_tag(media_face_h face, char **tag)
 {
 	media_face_s* _face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
 
 	if (STRING_VALID(_face->face_tag)) {
 		*tag = strdup(_face->face_tag);
-		media_content_retvm_if(*tag == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Out of memory");
+		content_retvm_if(*tag == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Out of memory");
 	} else {
 		*tag = NULL;
 	}
@@ -183,14 +183,14 @@ int media_face_create(const char *media_id, media_face_h *face)
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 
-	media_content_retvm_if(!STRING_VALID(media_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid media_id");
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(!STRING_VALID(media_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid media_id");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
 
 	ret = __media_face_check_media_id(media_id);
-	media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "media_id does not exist or is not an image");
+	content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "media_id does not exist or is not an image");
 
 	media_face_s* _face = calloc(1, sizeof(media_face_s));
-	media_content_retvm_if(_face == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Out of memory");
+	content_retvm_if(_face == NULL, MEDIA_CONTENT_ERROR_OUT_OF_MEMORY, "Out of memory");
 
 	_face->media_id = strdup(media_id);
 
@@ -203,9 +203,9 @@ int media_face_set_face_rect(media_face_h face, unsigned int rect_x, unsigned in
 {
 	media_face_s* _face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
-	media_content_retvm_if(rect_w == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_w");
-	media_content_retvm_if(rect_h == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_h");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(rect_w == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_w");
+	content_retvm_if(rect_h == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_h");
 
 	_face->face_rect_x = rect_x;
 	_face->face_rect_y = rect_y;
@@ -219,7 +219,7 @@ int media_face_set_orientation(media_face_h face, media_content_orientation_e or
 {
 	media_face_s* _face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
 
 	_face->orientation = orientation;
 
@@ -230,7 +230,7 @@ int media_face_set_tag(media_face_h face, const char *tag)
 {
 	media_face_s* _face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
 
 	if (STRING_VALID(tag))
 		_face->face_tag = strdup(tag);
@@ -248,10 +248,10 @@ int media_face_insert_to_db(media_face_h face)
 
 	media_face_s* _face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
-	media_content_retvm_if(_face->media_id == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_id");
-	media_content_retvm_if(_face->face_rect_w == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_w");
-	media_content_retvm_if(_face->face_rect_h == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_h");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(_face->media_id == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_id");
+	content_retvm_if(_face->face_rect_w == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_w");
+	content_retvm_if(_face->face_rect_h == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_h");
 
 	query_str = sqlite3_mprintf(INSERT_FACE_TO_FACE, _face->media_id, _face->face_rect_x, _face->face_rect_y, _face->face_rect_w, _face->face_rect_h, _face->orientation, _face->face_tag);
 
@@ -261,7 +261,7 @@ int media_face_insert_to_db(media_face_h face)
 	query_str = sqlite3_mprintf(SELECT_FACE_ID, _face->media_id, _face->face_rect_x, _face->face_rect_y, _face->face_rect_w, _face->face_rect_h, _face->orientation);
 	ret = _content_get_result(query_str, &stmt);
 	SQLITE3_SAFE_FREE(query_str);
-	media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
+	content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
 	if (sqlite3_step(stmt) == SQLITE_ROW)
 		_face->face_id = (int)sqlite3_column_int(stmt, 0);
@@ -279,11 +279,11 @@ int media_face_update_to_db(media_face_h face)
 
 	media_face_s* _face = (media_face_s*)face;
 
-	media_content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
-	media_content_retvm_if(_face->face_id == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid face_id");
-	media_content_retvm_if(_face->media_id == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_id");
-	media_content_retvm_if(_face->face_rect_w == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_w");
-	media_content_retvm_if(_face->face_rect_h == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_h");
+	content_retvm_if(face == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid handle");
+	content_retvm_if(_face->face_id == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid face_id");
+	content_retvm_if(_face->media_id == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid media_id");
+	content_retvm_if(_face->face_rect_w == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_w");
+	content_retvm_if(_face->face_rect_h == 0, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "Invalid rect_h");
 
 	query_str = sqlite3_mprintf(UPDATE_FACE_TO_FACE, _face->face_rect_x, _face->face_rect_y, _face->face_rect_w, _face->face_rect_h, _face->orientation, _face->face_tag, _face->face_id);
 
@@ -297,15 +297,15 @@ static int __media_face_safe_atoi(const char *buffer, int *si)
 {
 	char *end = NULL;
 	errno = 0;
-	media_content_retvm_if(buffer == NULL || si == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid parameter");
+	content_retvm_if(buffer == NULL || si == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid parameter");
 
 	const long sl = strtol(buffer, &end, 10);
 
-	media_content_retvm_if(end == buffer, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "not a decimal number");
-	media_content_retvm_if('\0' != *end, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "extra characters at end of input: %s", end);
-	media_content_retvm_if((LONG_MIN == sl || LONG_MAX == sl) && (ERANGE == errno), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "out of range of type long");
-	media_content_retvm_if(sl > INT_MAX, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "greater than INT_MAX");
-	media_content_retvm_if(sl < INT_MIN, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "less than INT_MIN");
+	content_retvm_if(end == buffer, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "not a decimal number");
+	content_retvm_if('\0' != *end, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "extra characters at end of input: %s", end);
+	content_retvm_if((LONG_MIN == sl || LONG_MAX == sl) && (ERANGE == errno), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "out of range of type long");
+	content_retvm_if(sl > INT_MAX, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "greater than INT_MAX");
+	content_retvm_if(sl < INT_MIN, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "less than INT_MIN");
 
 	*si = (int)sl;
 
@@ -317,16 +317,16 @@ int media_face_delete_from_db(const char *face_id)
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 	char *query_str = NULL;
 	int query_face_id = 0;
-	media_content_retvm_if(!STRING_VALID(face_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid face_id");
+	content_retvm_if(!STRING_VALID(face_id), MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid face_id");
 
 	ret = __media_face_safe_atoi(face_id, &query_face_id);
-	media_content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid face_id");
+	content_retvm_if(ret != MEDIA_CONTENT_ERROR_NONE, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid face_id");
 
 	/*Update modified_time to 0.. It will restore the deleted face when media_info_start_face_detection() is called */
 	query_str = sqlite3_mprintf(UPDATE_MEDIA_INFO_IN_FACE_SCAN_LIST, query_face_id);
 	ret = _content_query_sql(query_str);
 	SQLITE3_SAFE_FREE(query_str);
-	media_content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
+	content_retv_if(ret != MEDIA_CONTENT_ERROR_NONE, ret);
 
 	query_str = sqlite3_mprintf(DELETE_FACE_FROM_FACE, query_face_id);
 	ret = _content_query_sql(query_str);
@@ -340,7 +340,7 @@ int media_face_get_face_count_from_db(filter_h filter, int *face_count)
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 
 	if (face_count == NULL) {
-		media_content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
+		content_error("INVALID_PARAMETER(0x%08x)", MEDIA_CONTENT_ERROR_INVALID_PARAMETER);
 		return MEDIA_CONTENT_ERROR_INVALID_PARAMETER;
 	}
 
@@ -353,7 +353,7 @@ int media_face_foreach_face_from_db(filter_h filter, media_face_cb callback, voi
 {
 	int ret = MEDIA_CONTENT_ERROR_NONE;
 
-	media_content_retvm_if(callback == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid paramter");
+	content_retvm_if(callback == NULL, MEDIA_CONTENT_ERROR_INVALID_PARAMETER, "invalid paramter");
 
 	ret = _media_db_get_face(NULL, filter, callback, user_data);