opencv
diff --git a/‎hal/ipp/CMakeLists.txt
Lines changed: 3 additions & 0 deletions b/‎hal/ipp/CMakeLists.txt
Lines changed: 3 additions & 0 deletions
diff --git a/‎hal/ipp/include/ipp_hal_imgproc.hpp
Lines changed: 27 additions & 0 deletions b/‎hal/ipp/include/ipp_hal_imgproc.hpp
Lines changed: 27 additions & 0 deletions
diff --git a/‎hal/ipp/src/precomp_ipp.hpp
Lines changed: 71 additions & 0 deletions b/‎hal/ipp/src/precomp_ipp.hpp
Lines changed: 71 additions & 0 deletions
diff --git a/‎hal/ipp/src/transforms_ipp.cpp
Lines changed: 1 addition & 13 deletions b/‎hal/ipp/src/transforms_ipp.cpp
Lines changed: 1 addition & 13 deletions
@@ -5,6 +5,7 @@ set(IPP_HAL_LIBRARIES "ipphal" CACHE INTERNAL "")
 set(IPP_HAL_INCLUDE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include" CACHE INTERNAL "")
 set(IPP_HAL_HEADERS
   "${CMAKE_CURRENT_SOURCE_DIR}/include/ipp_hal_core.hpp"
+  "${CMAKE_CURRENT_SOURCE_DIR}/include/ipp_hal_imgproc.hpp"
   CACHE INTERNAL "")
 
 add_library(ipphal STATIC
@@ -13,6 +14,7 @@ add_library(ipphal STATIC
     "${CMAKE_CURRENT_SOURCE_DIR}/src/norm_ipp.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/cart_polar_ipp.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/transforms_ipp.cpp"
+    "${CMAKE_CURRENT_SOURCE_DIR}/src/warp_ipp.cpp"
     "${CMAKE_CURRENT_SOURCE_DIR}/src/sum_ipp.cpp"
 )
 
@@ -34,6 +36,7 @@ ocv_warnings_disable(CMAKE_CXX_FLAGS -Wno-suggest-override)
 target_include_directories(ipphal PRIVATE
   "${CMAKE_CURRENT_SOURCE_DIR}/src"
   ${CMAKE_SOURCE_DIR}/modules/core/include
+  ${CMAKE_SOURCE_DIR}/modules/imgproc/include
   ${IPP_INCLUDE_DIRS}
 )
 
 
@@ -0,0 +1,27 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+
+#ifndef __IPP_HAL_IMGPROC_HPP__
+#define __IPP_HAL_IMGPROC_HPP__
+
+#include <opencv2/core/base.hpp>
+#include "ipp_utils.hpp"
+
+#ifdef HAVE_IPP_IW
+
+int ipp_hal_warpAffine(int src_type, const uchar *src_data, size_t src_step, int src_width, int src_height, uchar *dst_data, size_t dst_step, int dst_width,
+                       int dst_height, const double M[6], int interpolation, int borderType, const double borderValue[4]);
+
+#undef cv_hal_warpAffine
+#define cv_hal_warpAffine ipp_hal_warpAffine
+#endif
+
+#if IPP_VERSION_X100 >= 810
+int ipp_hal_warpPerspective(int src_type, const uchar *src_data, size_t src_step, int src_width, int src_height, uchar *dst_data, size_t dst_step, int dst_width,
+                            int dst_height, const double M[9], int interpolation, int borderType, const double borderValue[4]);
+#undef cv_hal_warpPerspective
+#define cv_hal_warpPerspective ipp_hal_warpPerspective
+#endif
+
+#endif //__IPP_HAL_IMGPROC_HPP__
@@ -0,0 +1,71 @@
+// This file is part of OpenCV project.
+// It is subject to the license terms in the LICENSE file found in the top-level directory
+// of this distribution and at http://opencv.org/license.html
+
+#ifndef __PRECOMP_IPP_HPP__
+#define __PRECOMP_IPP_HPP__
+
+#include <opencv2/imgproc.hpp>
+
+#ifdef HAVE_IPP_IW
+#include "iw++/iw.hpp"
+#endif
+
+static inline IppDataType ippiGetDataType(int depth)
+{
+    depth = CV_MAT_DEPTH(depth);
+    return depth == CV_8U ? ipp8u :
+    depth == CV_8S ? ipp8s :
+    depth == CV_16U ? ipp16u :
+    depth == CV_16S ? ipp16s :
+    depth == CV_32S ? ipp32s :
+    depth == CV_32F ? ipp32f :
+    depth == CV_64F ? ipp64f :
+    (IppDataType)-1;
+}
+
+static inline IppiInterpolationType ippiGetInterpolation(int inter)
+{
+    inter &= cv::InterpolationFlags::INTER_MAX;
+    return inter == cv::InterpolationFlags::INTER_NEAREST ? ippNearest :
+        inter == cv::InterpolationFlags::INTER_LINEAR ? ippLinear :
+        inter == cv::InterpolationFlags::INTER_CUBIC ? ippCubic :
+        inter == cv::InterpolationFlags::INTER_LANCZOS4 ? ippLanczos :
+        inter == cv::InterpolationFlags::INTER_AREA ? ippSuper :
+        (IppiInterpolationType)-1;
+}
+
+static inline IppiBorderType ippiGetBorderType(int borderTypeNI)
+{
+    return borderTypeNI == cv::BorderTypes::BORDER_CONSTANT    ? ippBorderConst   :
+           borderTypeNI == cv::BorderTypes::BORDER_TRANSPARENT ? ippBorderTransp  :
+           borderTypeNI == cv::BorderTypes::BORDER_REPLICATE   ? ippBorderRepl    :
+           (IppiBorderType)-1;
+}
+
+static inline int ippiSuggestThreadsNum(size_t width, size_t height, size_t elemSize, double multiplier)
+{
+    int threads = cv::getNumThreads();
+    if(threads > 1 && height >= 64)
+    {
+        size_t opMemory = (int)(width*height*elemSize*multiplier);
+        int l2cache = 0;
+#if IPP_VERSION_X100 >= 201700
+        ippGetL2CacheSize(&l2cache);
+#endif
+        if(!l2cache)
+            l2cache = 1 << 18;
+
+        return IPP_MAX(1, (IPP_MIN((int)(opMemory/l2cache), threads)));
+    }
+    return 1;
+}
+
+#ifdef HAVE_IPP_IW
+static inline int ippiSuggestThreadsNum(const ::ipp::IwiImage &image, double multiplier)
+{
+    return ippiSuggestThreadsNum(image.m_size.width, image.m_size.height, image.m_typeSize*image.m_channels, multiplier);
+}
+#endif
+
+#endif //__PRECOMP_IPP_HPP__
@@ -3,6 +3,7 @@
 // of this distribution and at http://opencv.org/license.html
 
 #include "ipp_hal_core.hpp"
+#include "precomp_ipp.hpp"
 
 #include <opencv2/core.hpp>
 #include <opencv2/core/base.hpp>
@@ -72,19 +73,6 @@ int ipp_hal_transpose2d(const uchar* src_data, size_t src_step, uchar* dst_data,
 
 #ifdef HAVE_IPP_IW
 
-static inline IppDataType ippiGetDataType(int depth)
-{
-    depth = CV_MAT_DEPTH(depth);
-    return depth == CV_8U ? ipp8u :
-    depth == CV_8S ? ipp8s :
-    depth == CV_16U ? ipp16u :
-    depth == CV_16S ? ipp16s :
-    depth == CV_32S ? ipp32s :
-    depth == CV_32F ? ipp32f :
-    depth == CV_64F ? ipp64f :
-    (IppDataType)-1;
-}
-
 static inline ::ipp::IwiImage ippiGetImage(int src_type, const uchar* src_data, size_t src_step, int src_width, int src_height)
 {
     ::ipp::IwiImage dst;