Changed restrictions for OpenVX HAL calls on small images

terfendail · terfendail · commit 0f1a56da7cbc · 2017-04-09T01:17:57.000+03:00
diff --git a/3rdparty/openvx/hal/openvx_hal.cpp b/3rdparty/openvx/hal/openvx_hal.cpp
@@ -82,9 +82,10 @@ inline bool dimTooBig(int size)
 }
 
 //OpenVX calls have essential overhead so it make sense to skip them for small images
-template <int kernel_id> inline bool             skipSmallImages(int w, int h) { return w*h < 7680 * 4320; }
-template <> inline bool      skipSmallImages<VX_KERNEL_MULTIPLY>(int w, int h) { return w*h <  640 *  480; }
-template <> inline bool skipSmallImages<VX_KERNEL_COLOR_CONVERT>(int w, int h) { return w*h < 2048 * 1536; }
+template <int kernel_id> inline bool              skipSmallImages(int w, int h) { return w*h < 7680 * 4320; }
+template <> inline bool       skipSmallImages<VX_KERNEL_MULTIPLY>(int w, int h) { return w*h <  640 *  480; }
+template <> inline bool  skipSmallImages<VX_KERNEL_COLOR_CONVERT>(int w, int h) { return w*h < 2048 * 1536; }
+template <> inline bool skipSmallImages<VX_KERNEL_INTEGRAL_IMAGE>(int w, int h) { return w*h <  640 *  480; }
 
 inline void setConstantBorder(ivx::border_t &border, vx_uint8 val)
 {
diff --git a/modules/core/include/opencv2/core/openvx/ovx_defs.hpp b/modules/core/include/opencv2/core/openvx/ovx_defs.hpp
@@ -28,11 +28,11 @@ CV_EXPORTS_W ivx::Context& getOpenVXContext();
 template <int kernel_id> inline bool skipSmallImages(int w, int h)     { return w*h < 3840 * 2160; }
 template <> inline bool skipSmallImages<VX_KERNEL_MINMAXLOC>(int w, int h) { return w*h < 3840 * 2160; }
 template <> inline bool skipSmallImages<VX_KERNEL_MEDIAN_3x3>(int w, int h) { return w*h < 1280 * 720; }
-template <> inline bool skipSmallImages<VX_KERNEL_GAUSSIAN_3x3>(int w, int h) { return w*h < 1280 * 720; }
-template <> inline bool skipSmallImages<VX_KERNEL_BOX_3x3>(int w, int h) { return w*h < 1920 * 1080; }
+template <> inline bool skipSmallImages<VX_KERNEL_GAUSSIAN_3x3>(int w, int h) { return w*h < 320 * 240; }
+template <> inline bool skipSmallImages<VX_KERNEL_BOX_3x3>(int w, int h) { return w*h < 640 * 480; }
 template <> inline bool skipSmallImages<VX_KERNEL_HISTOGRAM>(int w, int h) { return w*h < 2048 * 1536; }
-template <> inline bool skipSmallImages<VX_KERNEL_SOBEL_3x3>(int w, int h) { return w*h < 1280 * 720; }
-template <> inline bool skipSmallImages<VX_KERNEL_CUSTOM_CONVOLUTION>(int w, int h) { return w*h < 1280 * 720; }
+template <> inline bool skipSmallImages<VX_KERNEL_SOBEL_3x3>(int w, int h) { return w*h < 320 * 240; }
+template <> inline bool skipSmallImages<VX_KERNEL_CUSTOM_CONVOLUTION>(int w, int h) { return w*h < 640 * 480; }
 
 }}
 
diff --git a/modules/imgproc/src/deriv.cpp b/modules/imgproc/src/deriv.cpp
@@ -234,8 +234,8 @@ namespace cv
             border = VX_BORDER_CONSTANT;
             break;
         case BORDER_REPLICATE:
-            border = VX_BORDER_REPLICATE;
-            break;
+//            border = VX_BORDER_REPLICATE;
+//            break;
         default:
             return false;
         }

Original file line number	Diff line number	Diff line change
`@@ -82,9 +82,10 @@ inline bool dimTooBig(int size)`
`82`	`82`	`}`
`83`	`83`
`84`	`84`	`//OpenVX calls have essential overhead so it make sense to skip them for small images`
`85`		`-template <int kernel_id> inline bool skipSmallImages(int w, int h) { return wh < 7680 4320; }`
`86`		`-template <> inline bool skipSmallImages<VX_KERNEL_MULTIPLY>(int w, int h) { return wh < 640 480; }`
`87`		`-template <> inline bool skipSmallImages<VX_KERNEL_COLOR_CONVERT>(int w, int h) { return wh < 2048 1536; }`
	`85`	`+template <int kernel_id> inline bool skipSmallImages(int w, int h) { return wh < 7680 4320; }`
	`86`	`+template <> inline bool skipSmallImages<VX_KERNEL_MULTIPLY>(int w, int h) { return wh < 640 480; }`
	`87`	`+template <> inline bool skipSmallImages<VX_KERNEL_COLOR_CONVERT>(int w, int h) { return wh < 2048 1536; }`
	`88`	`+template <> inline bool skipSmallImages<VX_KERNEL_INTEGRAL_IMAGE>(int w, int h) { return wh < 640 480; }`
`88`	`89`
`89`	`90`	`inline void setConstantBorder(ivx::border_t &border, vx_uint8 val)`
`90`	`91`	`{`