Add memory allocator check and renamed files

Author: qc-apreetam

modules/fastcv/include/opencv2/fastcv.hpp

@@ -32,7 +32,7 @@
 #include "opencv2/fastcv/warp.hpp"
 #include "opencv2/fastcv/allocator.hpp"
 #include "opencv2/fastcv/dsp_init.hpp"
-#include "opencv2/fastcv/sad.hpp"
+#include "opencv2/fastcv/sad_dsp.hpp"
 
 /**
  * @defgroup fastcv Module-wrapper for FastCV hardware accelerated functions

modules/fastcv/include/opencv2/fastcv/allocator.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
 */
 

modules/fastcv/include/opencv2/fastcv/sad.hpp renamed to modules/fastcv/include/opencv2/fastcv/sad_dsp.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
 */
 

modules/fastcv/perf/perf_sad.cpp renamed to modules/fastcv/perf/perf_sad_dsp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
 */
 

modules/fastcv/src/allocator.cpp

@@ -49,13 +49,14 @@ cv::UMatData* FastCVAllocator::allocate(int dims, const int* sizes, int type,
         }
         total *= sizes[i];
     }
-    uchar* data = data0 ? (uchar*)data0 : (uchar*)fcvMemAlloc(total, 16);
+    uchar* data = data0 ? (uchar*)data0 : (uchar*)fcvHwMemAlloc(total, 16);
     cv::UMatData* u = new cv::UMatData(this);
     u->data = u->origdata = data;
     u->size = total;
     if(data0)
         u->flags |= cv::UMatData::USER_ALLOCATED;
-
+    
+    u->userdata = new std::string("QCOM");
     return u;
 }
 
@@ -76,9 +77,16 @@ void FastCVAllocator::deallocate(cv::UMatData* u) const
     CV_Assert(u->refcount == 0);
     if( !(u->flags & cv::UMatData::USER_ALLOCATED) )
     {
-        fcvMemFree(u->origdata);
+        fcvHwMemFree(u->origdata);
         u->origdata = 0;
     }
+
+    if (u->userdata)
+    {
+        delete static_cast<std::string*>(u->userdata);
+        u->userdata = nullptr;
+    }
+
     delete u;
 }
 

modules/fastcv/src/precomp.hpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
 */
 
@@ -76,6 +76,13 @@ struct FastCvContext
 
 namespace dsp {
 
+    #define IS_FASTCV_ALLOCATED(mat) \
+    ((mat.u && mat.u->userdata && \
+      *static_cast<std::string*>(mat.u->userdata) == "QCOM") ? true : \
+     (std::cerr << "Allocation check failed for " #mat \
+                << ". Please ensure that cv::fastcv::dsp::fastcvq6init() has been called." \
+                << std::endl, false))
+    
     struct FastCvDspContext
     {
     public:

modules/fastcv/src/sad.cpp

@@ -0,0 +1,42 @@
+/*
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
+ * SPDX-License-Identifier: Apache-2.0
+*/
+
+#include "precomp.hpp"
+
+namespace cv {
+namespace fastcv {
+namespace dsp {
+
+void sumOfAbsoluteDiffs(cv::InputArray _patch, cv::InputArray _src, cv::OutputArray _dst) {
+    cv::Mat patch = _patch.getMat();
+    cv::Mat src = _src.getMat();
+    
+    // Check if matrices are allocated by the fastcv allocator
+    CV_Assert(IS_FASTCV_ALLOCATED(patch));
+    CV_Assert(IS_FASTCV_ALLOCATED(src));
+    
+    CV_Assert(!_src.empty() && "src is empty");
+    CV_Assert(_src.type() == CV_8UC1 && "src type is not CV_8UC1");
+    CV_Assert(_src.step() * _src.rows() > MIN_REMOTE_BUF_SIZE && "src buffer size is too small");
+    CV_Assert(!_patch.empty() && "patch is empty");
+    CV_Assert(_patch.type() == CV_8UC1 && "patch type is not CV_8UC1");
+    CV_Assert(_patch.size() == cv::Size(8, 8) && "patch size is not 8x8");
+
+    cv::Size size = _src.size();
+    _dst.create(size, CV_16UC1);
+    cv::Mat dst = _dst.getMat();
+
+    CV_Assert(((intptr_t)src.data & 0x7) == 0 && "src data is not 8-byte aligned");
+    CV_Assert(((intptr_t)dst.data & 0x7) == 0 && "dst data is not 8-byte aligned");
+    
+    // Check if dst is allocated by the fastcv allocator
+    CV_Assert(IS_FASTCV_ALLOCATED(dst));
+
+    fcvSumOfAbsoluteDiffs8x8u8_v2Q((uint8_t*)patch.data, patch.step, (uint8_t*)src.data, src.cols, src.rows, src.step, (uint16_t*)dst.data, dst.step);
+}
+
+} // dsp::
+} // fastcv::
+} // cv::

modules/fastcv/src/sad_dsp.cpp

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2024 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2025 Qualcomm Innovation Center, Inc. All rights reserved.
  * SPDX-License-Identifier: Apache-2.0
 */