Remove face_error_e and use common Error values in libmm-utility

Change-Id: I2450a4ae723b79357580de53d6b9f80962caef76

diff --git a/libdcm-face/dcm-face.c b/libdcm-face/dcm-face.c
index 39b22f42ac60173007c29c382e9d72abd8cb16c3..1e7855029ee1e39b72c2ac23368186dad899c204 100755 (executable)
--- a/libdcm-face/dcm-face.c
+++ b/libdcm-face/dcm-face.c
@@ -27,15 +27,15 @@
 
 EXPORT_API int dcm_face_create(__inout dcm_face_h *handle)
 {
-       int ret = FACE_ERROR_NONE;
+       int ret = MS_MEDIA_ERR_NONE;
 
-       dcm_retvm_if(handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle");
+       dcm_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid handle");
 
        FaceHandleT *pFaceHandle = (FaceHandleT *)calloc(1, sizeof(FaceHandleT));
-       dcm_retvm_if(pFaceHandle == NULL, FACE_ERROR_OUT_OF_MEMORY, "malloc fail");
+       dcm_retvm_if(pFaceHandle == NULL, MS_MEDIA_ERR_OUT_OF_MEMORY, "malloc fail");
 
        ret = _face_handle_create(&(pFaceHandle->fengine));
-       if (ret != FACE_ERROR_NONE) {
+       if (ret != MS_MEDIA_ERR_NONE) {
                dcm_error("fail to _face_handle_create");
                dcm_face_destroy((dcm_face_h)pFaceHandle);
                return ret;
@@ -52,13 +52,13 @@ EXPORT_API int dcm_face_create(__inout dcm_face_h *handle)
 
 EXPORT_API int dcm_face_destroy(__in dcm_face_h handle)
 {
-       int ret = FACE_ERROR_NONE;
+       int ret = MS_MEDIA_ERR_NONE;
        dcm_info("face destroy. handle=0x%08x", handle);
 
-       dcm_retvm_if(handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle");
+       dcm_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid handle");
 
        ret = _face_handle_destroy(handle->fengine);
-       if (ret != FACE_ERROR_NONE) {
+       if (ret != MS_MEDIA_ERR_NONE) {
                dcm_error("fail to _face_handle_destroy");
                return ret;
        }
@@ -80,8 +80,8 @@ EXPORT_API int dcm_face_set_image_info(dcm_face_h handle, face_image_colorspace_
 
        dcm_debug_fenter();
 
-       dcm_retvm_if(handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle");
-       dcm_retvm_if(buffer == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid buffer");
+       dcm_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid handle");
+       dcm_retvm_if(buffer == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid buffer");
 
        switch (colorspace) {
        case FACE_IMAGE_COLORSPACE_YUV420:
@@ -90,13 +90,13 @@ EXPORT_API int dcm_face_set_image_info(dcm_face_h handle, face_image_colorspace_
                data = (unsigned char *)calloc(1, size);
                if (data == NULL) {
                        dcm_error("Not allocate memory");
-                       return FACE_ERROR_OUT_OF_MEMORY;
+                       return MS_MEDIA_ERR_OUT_OF_MEMORY;
                }
                memcpy(data, buffer, size);
                break;
        default:
                dcm_error("Invalid colorspace : [%d]", colorspace);
-               return FACE_ERROR_INVALID_PARAMTER;
+               return MS_MEDIA_ERR_INVALID_PARAMETER;
        }
 
        if (_handle->image_info != NULL)
@@ -108,7 +108,7 @@ EXPORT_API int dcm_face_set_image_info(dcm_face_h handle, face_image_colorspace_
        if (_handle->image_info == NULL) {
                dcm_error("Out of memory");
                DCM_SAFE_FREE(data);
-               return FACE_ERROR_OUT_OF_MEMORY;
+               return MS_MEDIA_ERR_OUT_OF_MEMORY;
        }
 
        _handle->image_info->data = data;
@@ -120,20 +120,20 @@ EXPORT_API int dcm_face_set_image_info(dcm_face_h handle, face_image_colorspace_
 
        dcm_debug_fleave();
 
-       return FACE_ERROR_NONE;
+       return MS_MEDIA_ERR_NONE;
 }
 
 EXPORT_API int dcm_face_get_face_info(__in dcm_face_h handle, __out face_info_s *face_info)
 {
-       int ret = FACE_ERROR_NONE;
+       int ret = MS_MEDIA_ERR_NONE;
 
        dcm_debug_fenter();
 
-       dcm_retvm_if(handle == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid handle");
-       dcm_retvm_if(face_info == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid face_info");
+       dcm_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid handle");
+       dcm_retvm_if(face_info == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid face_info");
 
        ret = _face_detect_faces(handle, &(face_info->rects), &(face_info->count));
-       if (ret != FACE_ERROR_NONE)
+       if (ret != MS_MEDIA_ERR_NONE)
                dcm_error("fail to _face_detect_faces");
 
        dcm_debug_fleave();
@@ -143,10 +143,10 @@ EXPORT_API int dcm_face_get_face_info(__in dcm_face_h handle, __out face_info_s
 
 EXPORT_API int dcm_face_destroy_face_info(face_info_s *face_info)
 {
-       dcm_retvm_if(face_info == NULL, FACE_ERROR_INVALID_PARAMTER, "Invalid face_info");
+       dcm_retvm_if(face_info == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "Invalid face_info");
 
        DCM_SAFE_FREE(face_info->rects);
        DCM_SAFE_FREE(face_info);
 
-       return FACE_ERROR_NONE;
+       return MS_MEDIA_ERR_NONE;
 }

diff --git a/libdcm-face/dcm-face_mediavision.c b/libdcm-face/dcm-face_mediavision.c
index c096bd4eb8bdf5e696731b55c93ca1b4eedc7957..0422f1282715c5d6677e6df575f1e40a3cbdefee 100755 (executable)
--- a/libdcm-face/dcm-face_mediavision.c
+++ b/libdcm-face/dcm-face_mediavision.c
@@ -23,51 +23,51 @@
 #include "dcm-face.h"
 #include "dcm-face_priv.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-
 typedef struct media_vision_h {
        mv_engine_config_h cfg;
        mv_source_h source;
 } mv_handle;
 
 typedef struct media_vision_result_s {
-       face_error_e error;
+       int error;
        face_rect_s *face_rect;
        int count;
 } mv_faceInfo;
 
-static face_error_e __convert_to_mv_error_e(mv_error_e err)
+static int __convert_to_mv_error_e(mv_error_e err)
 {
-       if (err != MEDIA_VISION_ERROR_NONE)
-               dcm_error("Error from media vision : %d", err);
 
        switch (err) {
        case MEDIA_VISION_ERROR_NONE:
-               return FACE_ERROR_NONE;
+               return MS_MEDIA_ERR_NONE;
 
-       case MEDIA_VISION_ERROR_NOT_SUPPORTED:
-               return FACE_ERROR_INVALID_PARAMTER;
+       case MEDIA_VISION_ERROR_NOT_SUPPORTED:  /*vision feature not supported*/
+               dcm_error("MEDIA_VISION_ERROR_NOT_SUPPORTED");
+               return MS_MEDIA_ERR_NOT_SUPPORTED_FEATURE;
 
        case MEDIA_VISION_ERROR_INVALID_PARAMETER:
-               return FACE_ERROR_INVALID_PARAMTER;
+               dcm_error("MEDIA_VISION_ERROR_INVALID_PARAMETER");
+               return MS_MEDIA_ERR_INVALID_PARAMETER;
 
        case MEDIA_VISION_ERROR_NOT_SUPPORTED_FORMAT:
-               return FACE_ERROR_INVALID_PARAMTER;
+               dcm_error("MEDIA_VISION_ERROR_NOT_SUPPORTED_FORMAT");
+               return MS_MEDIA_ERR_UNSUPPORTED_CONTENT;
 
        case MEDIA_VISION_ERROR_OUT_OF_MEMORY:
-               return FACE_ERROR_OUT_OF_MEMORY;
+               dcm_error("MEDIA_VISION_ERROR_OUT_OF_MEMORY");
+               return MS_MEDIA_ERR_OUT_OF_MEMORY;
 
        default:
+               dcm_error("Error from media vision : %d", err);
                break;
        }
 
-       return FACE_ERROR_OPERATION_FAILED;
+       return MS_MEDIA_ERR_INTERNAL;
 }
 
 static int __convert_to_mv_colorspace_e(face_image_colorspace_e src, mv_colorspace_e *dst)
 {
-       int ret = FACE_ERROR_NONE;
+       int ret = MS_MEDIA_ERR_NONE;
 
        switch (src) {
        case FACE_IMAGE_COLORSPACE_YUV420:
@@ -82,7 +82,7 @@ static int __convert_to_mv_colorspace_e(face_image_colorspace_e src, mv_colorspa
        default:
                *dst = MEDIA_VISION_COLORSPACE_INVALID;
                dcm_error("Unknown colorspace : %d", src);
-               ret = FACE_ERROR_INVALID_PARAMTER;
+               ret = MS_MEDIA_ERR_UNSUPPORTED_CONTENT;
                break;
        }
 
@@ -100,7 +100,7 @@ void __face_detected_cb(mv_source_h source, mv_engine_config_h cfg, mv_rectangle
        if (number_of_faces == 0) {
                _data->face_rect = NULL;
                _data->count = 0;
-               _data->error = FACE_ERROR_NONE;
+               _data->error = MS_MEDIA_ERR_NONE;
                return;
        }
 
@@ -109,7 +109,7 @@ void __face_detected_cb(mv_source_h source, mv_engine_config_h cfg, mv_rectangle
                dcm_error("Cannout allocate face_rect_s");
                _data->face_rect = NULL;
                _data->count = 0;
-               _data->error = FACE_ERROR_OUT_OF_MEMORY;
+               _data->error = MS_MEDIA_ERR_OUT_OF_MEMORY;
                return;
        }
 
@@ -124,7 +124,7 @@ void __face_detected_cb(mv_source_h source, mv_engine_config_h cfg, mv_rectangle
        }
 
        _data->count = number_of_faces;
-       _data->error = FACE_ERROR_NONE;
+       _data->error = MS_MEDIA_ERR_NONE;
 
        return;
 }
@@ -136,7 +136,7 @@ int _face_handle_create(__inout void **handle)
 
        dcm_debug_fenter();
 
-       dcm_retvm_if(_handle == NULL, FACE_ERROR_OUT_OF_MEMORY, "handle create fail");
+       dcm_retvm_if(_handle == NULL, MS_MEDIA_ERR_OUT_OF_MEMORY, "handle create fail");
 
        err = mv_create_engine_config(&(_handle->cfg));
        if (err != MEDIA_VISION_ERROR_NONE) {
@@ -157,7 +157,7 @@ int _face_handle_create(__inout void **handle)
 
        dcm_info("dcm_face_engine was created. handle=0x%08x", *handle);
 
-       return FACE_ERROR_NONE;
+       return MS_MEDIA_ERR_NONE;
 }
 
 int _face_handle_destroy(__in void *handle)
@@ -166,7 +166,7 @@ int _face_handle_destroy(__in void *handle)
 
        mv_handle* _handle = (mv_handle*)handle;
 
-       dcm_retvm_if(_handle == NULL, FACE_ERROR_INVALID_PARAMTER, "invalid handle");
+       dcm_retvm_if(_handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "invalid handle");
 
        dcm_info("dcm_face_engine destroy. handle=0x%08x", handle);
 
@@ -186,19 +186,19 @@ int _face_handle_destroy(__in void *handle)
                }
        }
 
-       return FACE_ERROR_NONE;
+       return MS_MEDIA_ERR_NONE;
 }
 
 int _face_detect_faces(__in dcm_face_h handle, __out face_rect_s *face_rect[], __out int *count)
 {
-       int err = FACE_ERROR_NONE;
+       int err = MS_MEDIA_ERR_NONE;
        mv_colorspace_e colorspace = MEDIA_VISION_COLORSPACE_INVALID;
        mv_faceInfo result;
 
-       dcm_retvm_if(handle == NULL, FACE_ERROR_OUT_OF_MEMORY, "invalid handle");
-       dcm_retvm_if(handle->fengine == NULL, FACE_ERROR_OUT_OF_MEMORY, "invalid handle");
-       dcm_retvm_if(face_rect == NULL, FACE_ERROR_OUT_OF_MEMORY, "invalid face_rect");
-       dcm_retvm_if(count == NULL, FACE_ERROR_OUT_OF_MEMORY, "invalid count");
+       dcm_retvm_if(handle == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "invalid handle");
+       dcm_retvm_if(handle->fengine == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "invalid handle");
+       dcm_retvm_if(face_rect == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "invalid face_rect");
+       dcm_retvm_if(count == NULL, MS_MEDIA_ERR_INVALID_PARAMETER, "invalid count");
 
        mv_handle *_fengine = (mv_handle *)handle->fengine;
        memset(&result, 0x00, sizeof(result));
@@ -219,7 +219,7 @@ int _face_detect_faces(__in dcm_face_h handle, __out face_rect_s *face_rect[], _
                return __convert_to_mv_error_e(err);
        }
 
-       if (result.error == FACE_ERROR_NONE) {
+       if (result.error == MS_MEDIA_ERR_NONE) {
                *face_rect = result.face_rect;
                *count = result.count;
        } else {
@@ -228,5 +228,5 @@ int _face_detect_faces(__in dcm_face_h handle, __out face_rect_s *face_rect[], _
                return result.error;
        }
 
-       return FACE_ERROR_NONE;
+       return MS_MEDIA_ERR_NONE;
 }

diff --git a/libdcm-face/dcm-face_priv.h b/libdcm-face/dcm-face_priv.h
index 2be87750ae979d08999b5f43ebaa0e31e99db1d1..1e5bb81cc684bc266fe00c6ad2fbba9a0c2c214b 100755 (executable)
--- a/libdcm-face/dcm-face_priv.h
+++ b/libdcm-face/dcm-face_priv.h
@@ -54,9 +54,8 @@ int _face_handle_create(void **handle);
  * @brief Destroys the handle to the face engine and releases all its resources.
  * @param[in] face The face engine handle
  * @return 0 on success, otherwise a negative error value.
- * @retval #FACE_ERROR_NONE Successful
- * @retval #FACE_ERROR_INVALID_PARAMTER Invalid parameter
- * @retval #FACE_ERROR_ENGINE_NOT_FOUND face engine not found
+ * @retval #MS_MEDIA_ERR_NONE Successful
+ * @retval #MS_MEDIA_ERR_INVALID_PARAMETER Invalid parameter
  * @see _face_handle_create()
  */
 int _face_handle_destroy(void *handle);
@@ -69,10 +68,9 @@ int _face_handle_destroy(void *handle);
  * @param[out] face_rect The array of the detected face positions
  * @param[out] count The number of the detected face positions
  * @return 0 on success, otherwise a negative error value.
- * @retval #FACE_ERROR_NONE Successful
- * @retval #FACE_ERROR_INVALID_PARAMTER Invalid parameter
- * @retval #FACE_ERROR_OUT_OF_MEMORY   Out of memory
- * @retval #FACE_ERROR_ENGINE_NOT_FOUND Facial engine not found
+ * @retval #MS_MEDIA_ERR_NONE Successful
+ * @retval #MS_MEDIA_ERR_INVALID_PARAMETER Invalid parameter
+ * @retval #MS_MEDIA_ERR_OUT_OF_MEMORY Out of memory
  */
 int _face_detect_faces(dcm_face_h handle, face_rect_s *face_rect[], int *count);
 

diff --git a/libdcm-face/include/dcm-face.h b/libdcm-face/include/dcm-face.h
index 177e96001e37444a6e5d729aa192b12c757c3010..2a250e689c5ddf95a1634352dc14c6b493789505 100755 (executable)
--- a/libdcm-face/include/dcm-face.h
+++ b/libdcm-face/include/dcm-face.h
@@ -18,6 +18,7 @@
 
 #include <tizen.h>
 #include "dcm-face_type.h"
+#include <media-util.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -33,10 +34,9 @@ extern "C" {
  * @remarks The @a face must be released with face_destroy() by you.
  * @param[out] handle A face engine handle to be newly created on success
  * @return 0 on success, otherwise a negative error value.
- * @retval #FACE_ERROR_NONE    Successful
- * @retval #FACE_ERROR_INVALID_PARAMTER Invalid parameter
- * @retval #FACE_ERROR_OUT_OF_MEMORY   Out of memory
- * @retval #FACE_ERROR_ENGINE_NOT_FOUND Facial engine not found
+ * @retval #MS_MEDIA_ERR_NONE  Successful
+ * @retval #MS_MEDIA_ERR_INVALID_PARAMETER Invalid parameter
+ * @retval #MS_MEDIA_ERR_OUT_OF_MEMORY Out of memory
  * @see dcm_face_destroy()
  */
 int dcm_face_create(dcm_face_h *handle);
@@ -45,9 +45,8 @@ int dcm_face_create(dcm_face_h *handle);
  * @brief Destroys the handle to the facial engine and releases all its resources.
  * @param[in] handle The face engine handle
  * @return 0 on success, otherwise a negative error value.
- * @retval #FACE_ERROR_NONE Successful
- * @retval #FACE_ERROR_INVALID_PARAMTER Invalid parameter
- * @retval #FACE_ERROR_ENGINE_NOT_FOUND Facial engine not found
+ * @retval #MS_MEDIA_ERR_NONE Successful
+ * @retval #MS_MEDIA_ERR_INVALID_PARAMETER Invalid parameter
  * @see dcm_face_create()
  */
 int dcm_face_destroy(dcm_face_h handle);
@@ -58,8 +57,8 @@ int dcm_face_destroy(dcm_face_h handle);
  * @param[in] handle The facial engine handle
  * @param[out] colorspace The preferred color space
  * @return 0 on success, otherwise a negative error value.
- * @retval #FACE_ERROR_NONE Successful
- * @retval #FACE_ERROR_INVALID_PARAMTER Invalid parameter
+ * @retval #MS_MEDIA_ERR_NONE Successful
+ * @retval #MS_MEDIA_ERR_INVALID_PARAMETER Invalid parameter
  * @see dcm_face_create()
  */
 int dcm_face_get_prefered_colorspace(dcm_face_h handle, face_image_colorspace_e *colorspace);
@@ -75,9 +74,9 @@ int dcm_face_get_prefered_colorspace(dcm_face_h handle, face_image_colorspace_e
  * @param[in] height The height of the image
  * @param[in] size The size of the buffer
  * @return 0 on success, otherwise a negative error value.
- * @retval #FACE_ERROR_NONE    Successful
- * @retval #FACE_ERROR_INVALID_PARAMTER Invalid parameter
- * @retval #FACE_ERROR_OUT_OF_MEMORY   Out of memory
+ * @retval #MS_MEDIA_ERR_NONE  Successful
+ * @retval #MS_MEDIA_ERR_INVALID_PARAMETER Invalid parameter
+ * @retval #MS_MEDIA_ERR_OUT_OF_MEMORY Out of memory
  * @see dcm_face_create()
  */
 int dcm_face_set_image_info(dcm_face_h handle, face_image_colorspace_e colorspace, unsigned char *buffer, unsigned int width, unsigned int height, unsigned long long size);
@@ -88,8 +87,8 @@ int dcm_face_set_image_info(dcm_face_h handle, face_image_colorspace_e colorspac
  * @param[in] handle The facial engine handle
  * @param[out] face info The face information with rect, count and so on
  * @return 0 on success, otherwise a negative error value.
- * @retval #FACE_ERROR_NONE Successful
- * @retval #FACE_ERROR_INVALID_PARAMTER Invalid parameter
+ * @retval #MS_MEDIA_ERR_NONE Successful
+ * @retval #MS_MEDIA_ERR_INVALID_PARAMETER Invalid parameter
  * @see dcm_face_destroy_face_info()
  */
 int dcm_face_get_face_info(dcm_face_h handle, face_info_s *face_info);
@@ -98,8 +97,8 @@ int dcm_face_get_face_info(dcm_face_h handle, face_info_s *face_info);
  * @brief Release the face information memory.
  * @param[in] face_info The face information memory
  * @return 0 on success, otherwise a negative error value.
- * @retval #FACE_ERROR_NONE Successful
- * @retval #FACE_ERROR_INVALID_PARAMTER Invalid parameter
+ * @retval #MS_MEDIA_ERR_NONE Successful
+ * @retval #MS_MEDIA_ERR_INVALID_PARAMETER Invalid parameter
  * @see dcm_face_get_face_info()
  */
 int dcm_face_destroy_face_info(face_info_s *face_info);

diff --git a/libdcm-face/include/dcm-face_type.h b/libdcm-face/include/dcm-face_type.h
index b05e4709986052584132094e9b3f87c63fe5e91a..93ef9af3273f344113a4dc3aac099abe8470afbd 100755 (executable)
--- a/libdcm-face/include/dcm-face_type.h
+++ b/libdcm-face/include/dcm-face_type.h
@@ -16,7 +16,6 @@
 #ifndef __TIZEN_DCM_FACE_TYPE_H__
 #define __TIZEN_DCM_FACE_TYPE_H__
 
-#include <tizen.h>
 
 #ifdef __cplusplus
 extern "C" {
@@ -32,17 +31,6 @@ extern "C" {
  */
 typedef struct face_handle_s *dcm_face_h;
 
-/**
- * @brief Enumerations of error codes for the Facial Engine API.
- */
-typedef enum {
-       FACE_ERROR_NONE = TIZEN_ERROR_NONE, /**< Successful */
-       FACE_ERROR_INVALID_PARAMTER = TIZEN_ERROR_INVALID_PARAMETER, /**< Invalid parameter */
-       FACE_ERROR_OUT_OF_MEMORY = TIZEN_ERROR_OUT_OF_MEMORY, /**< Out of memory */
-       FACE_ERROR_ENGINE_NOT_FOUND = TIZEN_ERROR_UIX_CLASS | 0x41, /**< Facial engine not found */
-       FACE_ERROR_OPERATION_FAILED = TIZEN_ERROR_UIX_CLASS | 0x42, /**< Operation failed */
-} face_error_e;
-
 /**
  * @brief Enumerations of color spaces
  * @see face_image_create()

diff --git a/src/DcmDbUtils.cpp b/src/DcmDbUtils.cpp
index 92d14b08d617f6a6aca56bc5de04581b1118a37c..9929faf2ae18aee18297bcbc68b284e104959961 100755 (executable)
--- a/src/DcmDbUtils.cpp
+++ b/src/DcmDbUtils.cpp
@@ -20,7 +20,6 @@
 #include <glib.h>
 #include <string.h>
 #include <unistd.h>
-#include <media-util.h>
 #include <DcmDbUtils.h>
 #include <DcmTypes.h>
 #include <DcmDebugUtils.h>

diff --git a/src/DcmFaceUtils.cpp b/src/DcmFaceUtils.cpp
index 5c03c8cf1a79e9814521d11a23b07241e2165256..785bb0721a877b3e2db9ecb89a70128eed8852e5 100755 (executable)
--- a/src/DcmFaceUtils.cpp
+++ b/src/DcmFaceUtils.cpp
@@ -42,40 +42,32 @@ static dcm_face_h dcm_face_handle = NULL;
 
 int DcmFaceUtils::initialize()
 {
-       int ret = FACE_ERROR_NONE;
+       int ret = MS_MEDIA_ERR_NONE;
 
        dcm_debug_fenter();
 
        ret = dcm_face_create(&dcm_face_handle);
-       if (ret != FACE_ERROR_NONE) {
-               dcm_error("Failed to dcm_face_create err: %d", ret);
-               return MS_MEDIA_ERR_INTERNAL;
-       }
 
        dcm_debug_fleave();
 
-       return MS_MEDIA_ERR_NONE;
+       return ret;
 }
 
 int DcmFaceUtils::finalize()
 {
-       int ret = FACE_ERROR_NONE;
+       int ret = MS_MEDIA_ERR_NONE;
 
        dcm_debug_fenter();
 
        DCM_CHECK_VAL(dcm_face_handle, MS_MEDIA_ERR_INVALID_PARAMETER);
 
        ret = dcm_face_destroy(dcm_face_handle);
-       if (ret != FACE_ERROR_NONE) {
-               dcm_error("Failed to dcm_face_destroy ret: %d", ret);
-               return MS_MEDIA_ERR_INTERNAL;
-       }
 
        dcm_face_handle = NULL;
 
        dcm_debug_fleave();
 
-       return MS_MEDIA_ERR_NONE;
+       return ret;
 }
 
 int DcmFaceUtils::runFaceRecognizeProcess(DcmScanItem *scan_item, DcmImageInfo *image_info)
@@ -85,7 +77,7 @@ int DcmFaceUtils::runFaceRecognizeProcess(DcmScanItem *scan_item, DcmImageInfo *
        int face_area = 0;
        int i = 0;
        double scale_factor = 0.0;
-       int err = FACE_ERROR_NONE;
+       int err = MS_MEDIA_ERR_NONE;
        int ret = MS_MEDIA_ERR_NONE;
        face_info_s *face_info = NULL;
 
@@ -99,10 +91,9 @@ int DcmFaceUtils::runFaceRecognizeProcess(DcmScanItem *scan_item, DcmImageInfo *
 
        dcm_debug("colorspce: [%d], w: [%d], h: [%d]", image_info->decode_type, image_info->buffer_width, image_info->buffer_height);
 
-       err = dcm_face_set_image_info(dcm_face_handle, (face_image_colorspace_e)image_info->decode_type, image_info->pixel, image_info->buffer_width, image_info->buffer_height, image_info->size);
-       if (err != FACE_ERROR_NONE) {
+       ret = dcm_face_set_image_info(dcm_face_handle, (face_image_colorspace_e)image_info->decode_type, image_info->pixel, image_info->buffer_width, image_info->buffer_height, image_info->size);
+       if (ret != MS_MEDIA_ERR_NONE) {
                dcm_error("Failed to dcm_face_set_image_info! err: %d", err);
-               ret = MS_MEDIA_ERR_INTERNAL;
                goto DCM_SVC_FACE_RECOGNIZE_BUFFER_FAILED;
        }
 
@@ -113,10 +104,9 @@ int DcmFaceUtils::runFaceRecognizeProcess(DcmScanItem *scan_item, DcmImageInfo *
                goto DCM_SVC_FACE_RECOGNIZE_BUFFER_FAILED;
        }
 
-       err = dcm_face_get_face_info(dcm_face_handle, face_info);
-       if (err != FACE_ERROR_NONE) {
+       ret = dcm_face_get_face_info(dcm_face_handle, face_info);
+       if (ret != MS_MEDIA_ERR_NONE) {
                dcm_error("Failed to get face info! err: %d", err);
-               ret = MS_MEDIA_ERR_INTERNAL;
                goto DCM_SVC_FACE_RECOGNIZE_BUFFER_FAILED;
        }
 
@@ -125,6 +115,7 @@ int DcmFaceUtils::runFaceRecognizeProcess(DcmScanItem *scan_item, DcmImageInfo *
                scan_item->face_count = 0;
                goto DCM_SVC_FACE_RECOGNIZE_BUFFER_FAILED;
        }
+
        scan_item->face_count = face_info->count;
 
        /* Compute scale factor between decode size and original size */
@@ -134,10 +125,9 @@ int DcmFaceUtils::runFaceRecognizeProcess(DcmScanItem *scan_item, DcmImageInfo *
        for (i = 0; i < face_info->count; i++) {
                face = NULL;
 
-               err = DcmFaceApi::createFaceItem(&face);
-               if (err != MS_MEDIA_ERR_NONE) {
-                       dcm_error("Failed to create face items! err: %d", err);
-                       ret = err;
+               ret = DcmFaceApi::createFaceItem(&face);
+               if (ret != MS_MEDIA_ERR_NONE) {
+                       dcm_error("Failed to create face items! ret: %d", ret);
                        goto DCM_SVC_FACE_RECOGNIZE_BUFFER_FAILED;
                }
 
@@ -161,14 +151,14 @@ int DcmFaceUtils::runFaceRecognizeProcess(DcmScanItem *scan_item, DcmImageInfo *
                face->media_uuid = strdup(scan_item->media_uuid);
 
                /* Insert face rectangle into database */
-               err = dcmDbUtils->_dcm_svc_db_generate_uuid(&face);
-               if (err != MS_MEDIA_ERR_NONE) {
-                       dcm_error("Failed to set uuid! err: %d", err);
+               ret = dcmDbUtils->_dcm_svc_db_generate_uuid(&face);
+               if (ret != MS_MEDIA_ERR_NONE) {
+                       dcm_error("Failed to set uuid! ret: %d", ret);
                        goto DCM_SVC_FACE_RECOGNIZE_BUFFER_FAILED;
                }
-               err = dcmDbUtils->_dcm_svc_db_insert_face_to_db(face);
-               if (err != MS_MEDIA_ERR_NONE) {
-                       dcm_error("Failed to insert face item into db! err: %d", err);
+               ret = dcmDbUtils->_dcm_svc_db_insert_face_to_db(face);
+               if (ret != MS_MEDIA_ERR_NONE) {
+                       dcm_error("Failed to insert face item into db! ret: %d", ret);
                        goto DCM_SVC_FACE_RECOGNIZE_BUFFER_FAILED;
                }