From: hjkim Date: Tue, 9 Jan 2024 02:42:04 +0000 (+0900) Subject: face detection related processing is not performed X-Git-Tag: accepted/tizen/unified/20240118.114141^0 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fapi%2Fmedia-content.git;a=commitdiff_plain;h=da62428d3a78313d454eacf3c9810e3303b9a669 face detection related processing is not performed because, all dcm related codes have been removed due to memory usage issues in the media-server. so, media-content only returns MEDIA_CONTENT_ERROR_NONE until these APIs completely removed. Change-Id: Ia3f2dbf88a4260a75c2596c88023668275be3db3 --- diff --git a/include/media_info_private.h b/include/media_info_private.h index e5e7a79..7c5e071 100644 --- a/include/media_info_private.h +++ b/include/media_info_private.h @@ -309,11 +309,6 @@ typedef struct { } media_face_s; typedef struct { - void *user_data; - media_face_detection_completed_cb face_completed_cb; -} media_face_cb_s; - -typedef struct { media_insert_completed_cb insert_completed_cb; char *insert_list_path; void *user_data; diff --git a/include_product/media_info_private.h b/include_product/media_info_private.h index 36e3cb6..31f8b3a 100644 --- a/include_product/media_info_private.h +++ b/include_product/media_info_private.h @@ -392,11 +392,6 @@ typedef struct { } media_uhd_s; typedef struct { - void *user_data; - media_face_detection_completed_cb face_completed_cb; -} media_face_cb_s; - -typedef struct { media_insert_completed_cb insert_completed_cb; char *insert_list_path; void *user_data; diff --git a/packaging/capi-content-media-content.spec b/packaging/capi-content-media-content.spec index 44a7f40..ad95ed0 100644 --- a/packaging/capi-content-media-content.spec +++ b/packaging/capi-content-media-content.spec @@ -1,6 +1,6 @@ Name: capi-content-media-content Summary: A Media content library in Tizen Native API -Version: 0.4.23 +Version: 0.4.24 Release: 0 Group: Multimedia/API License: Apache-2.0 diff --git a/src/media_info.c b/src/media_info.c index 56c3cf5..e593c17 100644 --- a/src/media_info.c +++ b/src/media_info.c @@ -15,7 +15,6 @@ */ #include -#include #include #include #include @@ -64,23 +63,6 @@ static bool __media_info_isFaceRecognition_feature_supported(void) return isFaceRecognitionSupported; } -static void __media_info_face_completed_cb(int error, const int face_count, void *user_data) -{ - int error_value = MEDIA_CONTENT_ERROR_NONE; - - media_face_cb_s *_face_cb = (media_face_cb_s *)user_data; - - if (_face_cb != NULL) { - content_debug("error [%d], face_count [%d]", error, face_count); - error_value = _content_error_capi(error); - if (_face_cb->face_completed_cb) - _face_cb->face_completed_cb(error_value, face_count, _face_cb->user_data); - } - - g_free(_face_cb); - - return; -} // LCOV_EXCL_STOP static int __media_info_insert_batch(const char **path_array, unsigned int array_length, @@ -1451,8 +1433,6 @@ int media_info_generate_thumbnail(media_info_h media) int media_info_start_face_detection(media_info_h media, media_face_detection_completed_cb callback, void *user_data) { content_warn("DEPRECATION WARNING: media_info_start_face_detection() is deprecated and will be removed from next release."); - int ret = MEDIA_CONTENT_ERROR_NONE; - static unsigned int req_id = 0; media_info_s *_media = (media_info_s*)media; if (!__media_info_isFaceRecognition_feature_supported()) { @@ -1470,24 +1450,12 @@ int media_info_start_face_detection(media_info_h media, media_face_detection_com return MEDIA_CONTENT_ERROR_INVALID_PARAMETER; } - media_face_cb_s *_face_cb = g_new0(media_face_cb_s, 1); - - req_id++; - _media->face_request_id = req_id; - - _face_cb->user_data = user_data; - _face_cb->face_completed_cb = callback; - - ret = dcm_request_extract_face_async(_media->face_request_id, _media->file_path, (FaceFunc)__media_info_face_completed_cb, (void *)_face_cb, _content_get_uid()); - ret = _content_error_capi(ret); - - return ret; + return MEDIA_CONTENT_ERROR_NONE; } int media_info_cancel_face_detection(media_info_h media) { content_warn("DEPRECATION WARNING: media_info_cancel_face_detection() is deprecated and will be removed from next release."); - int ret = MEDIA_CONTENT_ERROR_NONE; media_info_s *_media = (media_info_s*)media; if (!__media_info_isFaceRecognition_feature_supported()) { @@ -1499,7 +1467,6 @@ int media_info_cancel_face_detection(media_info_h media) content_retip_if_fail(STRING_VALID(_media->media_id)); content_retip_if_fail(_media->face_request_id > 0); - ret = dcm_request_cancel_face(_media->face_request_id); - return _content_error_capi(ret); + return MEDIA_CONTENT_ERROR_NONE; } // LCOV_EXCL_STOP \ No newline at end of file