From: Tae-Young Chung <ty83.chung@samsung.com>
Date: Tue, 19 Oct 2021 04:21:09 +0000 (+0900)
Subject: Add width and height parameters to Initialized()'s input parameters
X-Git-Tag: submit/tizen/20220701.002357~1^2~23
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=cf522559f2b29d7fab6e913304d2964ddae22d89;p=platform%2Fcore%2Fmultimedia%2Fdfs-opencv.git

Add width and height parameters to Initialized()'s input parameters

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

diff --git a/src/dfs_opencv.cpp b/src/dfs_opencv.cpp
index c3299fb..9fb7397 100644
--- a/src/dfs_opencv.cpp
+++ b/src/dfs_opencv.cpp
@@ -37,7 +37,7 @@ namespace DfsAdaptationImpl
 		mStereoParam(),
 		mIsStereoCalibrated(false),
 		mUpdateStereoCalibration(false),
-		mImageSize(640, 480)
+		mImageSize(cv::Size(0,0))
 	{
 		LOGI("ENTER");
 		mCalibFilePath += std::string(DEFAULT_STEREO_CALIB_FILE_NAME);
@@ -145,12 +145,12 @@ namespace DfsAdaptationImpl
 		LOGI("LEAVE");
 
 	}
-	void DfsOCV::Initialize(DfsParameter& param)
+	void DfsOCV::Initialize(DfsParameter& param, size_t width, size_t height)
 	{
 		LOGI("ENTER");
 
 		mDfsParam = param;
-
+		mImageSize = cv::Size(width, height);
 		mDfsOcv = cv::StereoSGBM::create(1, mNumDisparities, mBlockSize);
 
 		this->SetParameters();
@@ -194,6 +194,7 @@ namespace DfsAdaptationImpl
 
 		LOGI("ENTER");
 	}
+
 	void DfsOCV::Run(DfsData& base, DfsData& extra)
 	{
 		LOGI("ENTER");
@@ -202,6 +203,11 @@ namespace DfsAdaptationImpl
 			throw std::runtime_error("invalid data pointer");
 		}
 
+		if (cv::Size(base.width, base.height) != mImageSize ||
+			cv::Size(extra.width, extra.height) != mImageSize) {
+			throw std::runtime_error("invalid size");
+		}
+
 		int baseCvType = ConvertDfsDataTypeToCV(base.type);
 		int extraCvType = ConvertDfsDataTypeToCV(extra.type);
 		if (baseCvType < 0 || extraCvType < 0) {
diff --git a/src/dfs_opencv_private.h b/src/dfs_opencv_private.h
index 7cce5d5..3e71d87 100644
--- a/src/dfs_opencv_private.h
+++ b/src/dfs_opencv_private.h
@@ -99,7 +99,7 @@ namespace DfsAdaptationImpl
 		DfsOCV();
 		~DfsOCV();
 
-		void Initialize(DfsParameter& param) override;
+		void Initialize(DfsParameter& param, size_t width, size_t height) override;
 		void Run(DfsData& base, DfsData& extra) override;
 
 		DfsData& GetDepthData() override;