mv3d: create DfsAdaptor and call bind() when mDfsAdaptor is nullptr

[Issue type] bug fix

This commit is manually patched from https://review.tizen.org/gerrit/#/c/platform/core/api/mediavision/+/285093/
to avoid conflict.

Change-Id: Icca5dfce80771641a7d0fce8e7b317247a8d1db7
Signed-off-by: Tae-Young Chung <ty83.chung@samsung.com>

diff --git a/mv_3d/3d/src/Mv3d.cpp b/mv_3d/3d/src/Mv3d.cpp
index e98eee0..bbc8f41 100644 (file)
--- a/mv_3d/3d/src/Mv3d.cpp
+++ b/mv_3d/3d/src/Mv3d.cpp
@@ -124,15 +124,17 @@ namespace mv3d
                mIntrinsicPath = stereoConfigPath.substr(0, found) + std::string(".json");
                mPointcloudOutputPath = pointcloudOutputPath;
 
-               try {
-                       mDfsAdaptor = new DfsAdaptor();
-                       mDfsAdaptor->bind();
-               } catch (const std::bad_alloc &e) {
-                       LOGE("Failed to create dfs adaptation : %s", e.what());
-                       return MEDIA_VISION_ERROR_OUT_OF_MEMORY;
-               } catch (const std::runtime_error &e) {
-                       LOGE("Failed to bind %s adpator", e.what());
-                       return MEDIA_VISION_ERROR_INVALID_OPERATION;
+               if (!mDfsAdaptor) {
+                       try {
+                               mDfsAdaptor = new DfsAdaptor();
+                               mDfsAdaptor->bind();
+                       } catch (const std::bad_alloc &e) {
+                               LOGE("Failed to create dfs adaptation : %s", e.what());
+                               return MEDIA_VISION_ERROR_OUT_OF_MEMORY;
+                       } catch (const std::runtime_error &e) {
+                               LOGE("Failed to bind %s adpator", e.what());
+                               return MEDIA_VISION_ERROR_INVALID_OPERATION;
+                       }
                }
 
                return MEDIA_VISION_ERROR_NONE;