mv_machine_learning: cleanup mv_face_recognition_open.cpp

[Issue type] code cleanup

Cleaned up mv_face_recognition_open.cpp file by doing,
		- rename itask -> task.
		- use forward declarationn with "using" keyword.

Change-Id: I9a80f014efc83b6161cc09b561c1ca4e5183e453
Signed-off-by: Inki Dae <inki.dae@samsung.com>

diff --git a/mv_machine_learning/common/include/context.h b/mv_machine_learning/common/include/context.h
index 518fbe4..77932ec 100644 (file)
--- a/mv_machine_learning/common/include/context.h
+++ b/mv_machine_learning/common/include/context.h
@@ -29,7 +29,7 @@ public:
        Context() { }
        ~Context() { }
 
-       std::map<std::string, void *> __itasks;
+       std::map<std::string, void *> __tasks;
 };
 } // namespace
 } // namespace

diff --git a/mv_machine_learning/face_recognition/src/mv_face_recognition_open.cpp b/mv_machine_learning/face_recognition/src/mv_face_recognition_open.cpp
index 3dbbb67..598aaae 100644 (file)
--- a/mv_machine_learning/face_recognition/src/mv_face_recognition_open.cpp
+++ b/mv_machine_learning/face_recognition/src/mv_face_recognition_open.cpp
@@ -28,6 +28,7 @@ using namespace mediavision::common;
 using namespace mediavision::machine_learning;
 using namespace mediavision::machine_learning::face_recognition;
 using namespace mediavision::machine_learning::exception;
+using FaceRecognitionTask = ITask<mv_face_recognition_input_s, mv_face_recognition_result_s>;
 
 int mv_face_recognition_create_open(mv_face_recognition_h *handle)
 {
@@ -42,17 +43,17 @@ int mv_face_recognition_create_open(mv_face_recognition_h *handle)
                return MEDIA_VISION_ERROR_OUT_OF_MEMORY;
        }
 
-       ITask<mv_face_recognition_input_s, mv_face_recognition_result_s> *itask =
+       FaceRecognitionTask *task =
                new (nothrow)FaceRecognitionAdapter<mv_face_recognition_input_s, mv_face_recognition_result_s>();
-       if (!itask) {
+       if (!task) {
                delete context;
-               LOGE("Fail to allocate a itask.");
+               LOGE("Fail to allocate a task.");
                return MEDIA_VISION_ERROR_OUT_OF_MEMORY;
        }
 
        pair<map<string, void *>::iterator, bool> result;
 
-       result = context->__itasks.insert(pair<string, void *>("face_recognition", itask));
+       result = context->__tasks.insert(pair<string, void *>("face_recognition", task));
        if (!result.second) {
                delete context;
                LOGE("Fail to register a new task. Same task already exists.");
@@ -76,9 +77,9 @@ int mv_face_recognition_destroy_open(mv_face_recognition_h handle)
        Context *context = static_cast<Context *>(handle);
        map<string, void *>::iterator iter;
 
-       for (iter = context->__itasks.begin(); iter != context->__itasks.end(); ++iter) {
-               auto itask = static_cast<ITask<mv_face_recognition_input_s, mv_face_recognition_result_s> *>(iter->second);
-               delete itask;
+       for (iter = context->__tasks.begin(); iter != context->__tasks.end(); ++iter) {
+               auto task = static_cast<FaceRecognitionTask *>(iter->second);
+               delete task;
        }
 
        delete context;
@@ -98,10 +99,10 @@ int mv_face_recognition_prepare_open(mv_face_recognition_h handle)
        }
 
        Context *context = static_cast<Context *>(handle);
-       auto itask = static_cast<ITask<mv_face_recognition_input_s, mv_face_recognition_result_s> *>(context->__itasks["face_recognition"]);
+       auto task = static_cast<FaceRecognitionTask *>(context->__tasks["face_recognition"]);
 
-       itask->configure();
-       itask->prepare();
+       task->configure();
+       task->prepare();
 
        LOGD("LEAVE");
 
@@ -119,14 +120,14 @@ int mv_face_recognition_register_open(mv_face_recognition_h handle, mv_source_h
 
        try {
                Context *context = static_cast<Context *>(handle);
-               auto itask = static_cast<ITask<mv_face_recognition_input_s, mv_face_recognition_result_s> *>(context->__itasks["face_recognition"]);
+               auto task = static_cast<FaceRecognitionTask *>(context->__tasks["face_recognition"]);
 
                mv_face_recognition_input_s input = { mode::REGISTER };
 
                input.register_src.clear();
                input.register_src.insert(make_pair(source, string(label)));
-               itask->setInput(input);
-               itask->perform();
+               task->setInput(input);
+               task->perform();
        } catch (const BaseException& e) {
                LOGE("Fail to register new face.");
                return e.getError();
@@ -148,14 +149,14 @@ int mv_face_recognition_unregister_open(mv_face_recognition_h handle, const char
 
        try {
                Context *context = static_cast<Context *>(handle);
-               auto itask = static_cast<ITask<mv_face_recognition_input_s, mv_face_recognition_result_s> *>(context->__itasks["face_recognition"]);
+               auto task = static_cast<FaceRecognitionTask *>(context->__tasks["face_recognition"]);
 
                mv_face_recognition_input_s input = { mode::DELETE };
 
                input.labels.clear();
                input.labels.push_back(string(label));
-               itask->setInput(input);
-               itask->perform();
+               task->setInput(input);
+               task->perform();
        } catch (const BaseException& e) {
                LOGE("Fail to unregister a given label.");
                return e.getError();
@@ -177,13 +178,13 @@ int mv_face_recognition_inference_open(mv_face_recognition_h handle, mv_source_h
 
        try {
                Context *context = static_cast<Context *>(handle);
-               auto itask = static_cast<ITask<mv_face_recognition_input_s, mv_face_recognition_result_s> *>(context->__itasks["face_recognition"]);
+               auto task = static_cast<FaceRecognitionTask *>(context->__tasks["face_recognition"]);
 
                mv_face_recognition_input_s input = { mode::INFERENCE };
 
                input.inference_src = source;
-               itask->setInput(input);
-               itask->perform();
+               task->setInput(input);
+               task->perform();
        } catch (const BaseException& e) {
                LOGE("Fail to recognize a face.");
                return e.getError();
@@ -205,9 +206,9 @@ int mv_face_recognition_get_label_open(mv_face_recognition_h handle, const char
 
        try {
                Context *context = static_cast<Context *>(handle);
-               auto itask = static_cast<ITask<mv_face_recognition_input_s, mv_face_recognition_result_s> *>(context->__itasks["face_recognition"]);
+               auto task = static_cast<FaceRecognitionTask *>(context->__tasks["face_recognition"]);
 
-               *out_label = itask->getOutput().label.c_str();
+               *out_label = task->getOutput().label.c_str();
        } catch (const BaseException& e) {
                LOGE("Fail to get label.");
                return e.getError();