summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTae-Young Chung <ty83.chung@samsung.com>2022-12-06 14:05:15 +0900
committerTae-Young Chung <ty83.chung@samsung.com>2022-12-06 14:05:55 +0900
commitee57ff8978f96bf8479c290dd02048d15bec6428 (patch)
tree93b77a7de7c601b74367c16e54652d1a8e300f04
parentd0f9f520c8dd27667d687b667354942a47e54a9a (diff)
downloadmediavision-ee57ff8978f96bf8479c290dd02048d15bec6428.tar.gz
mediavision-ee57ff8978f96bf8479c290dd02048d15bec6428.tar.bz2
mediavision-ee57ff8978f96bf8479c290dd02048d15bec6428.zip
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>
-rw-r--r--mv_3d/3d/src/Mv3d.cpp20
1 files changed, 11 insertions, 9 deletions
diff --git a/mv_3d/3d/src/Mv3d.cpp b/mv_3d/3d/src/Mv3d.cpp
index e98eee09..bbc8f419 100644
--- 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;