Squashed 'vision' changes from 2e145e5..1092f08 (#756)

1092f08 2022.2_update1 release 76f2dd0 Merge pull request #510 from FaaSApps/next 2e79665 Update Jenkinsfile a774553 2022.2_update1 docs 4c864e3 Update README.md ff60d29 2022.2_update1 docs a47f08a Merge pull request #506 from maitreya/next 74aca26 Merge branch 'next' into next 0608a73 Merge pull request #509 from swarnapr/aio_adas 1467f27 Merge pull request #507 from swarnapr/multi_strm e73778e Corrected config file a93021c Makefile c625e9f Makefile 5b138be Re-order all_in_one_adas 9096dd9 isp_mutlistream partition in kernel e12eaa3 Changed default xfcvdepth values to 2 b0b27fb Merge pull request #505 from maitreya/next ee2e2d2 Fixed isppipeline-rgbir tb for multiple bitdepths for SIGSEGV 4d6aed4 Merge pull request #498 from swarnapr/aio_adas b6b31d0 Merge pull request #494 from srujanam/next be11b18 discarded json changes 2f8289e updated Makefile and JSON 4947f6e Merge pull request #497 from nvunnam/next ae0b517 rename all-in-one as all-in-one_adas 7bf9692 changes in stitcher 558935c xf_structs.hpp updated 06fdaa4 Stride support Added d0fecc7 change 2022.2_stable_latest to 2023.1_stable_latest d8d38ed create main branch from next branch Co-authored-by: sdausr <[email protected]>
Xilinx · Jan 16, 2023 · 18e5885 · 18e5885
1 parent deba72c
commit 18e5885
Show file tree

Hide file tree

Showing 1,058 changed files with 5,053 additions and 3,057 deletions.
diff --git a/vision/Jenkinsfile b/vision/Jenkinsfile
@@ -1,4 +1,4 @@
 @Library('pipeline-library')_
 
-VitisLibPipeline (branch: 'next', libname: 'xf_opencv', TARGETS: 'hls_csim:hls_csynth:hls_cosim:vitis_sw_emu:vitis_hw_emu',
-                  devtest: 'RunDeploy.sh', TOOLVERSION: '2022.2_stable_latest')
+VitisLibPipeline (branch: 'main', libname: 'xf_opencv', TARGETS: 'hls_csim:hls_csynth:hls_cosim:vitis_sw_emu:vitis_hw_emu',
+                  devtest: 'RunDeploy.sh', TOOLVERSION: '2022.2_released')
diff --git a/vision/L1/examples/3dlut/build/xf_config_params.h b/vision/L1/examples/3dlut/build/xf_config_params.h
@@ -22,6 +22,6 @@
 
 #define XF_USE_URAM 0
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 #define XF_CV_DEPTH_IN_2 2
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/accumulate/build/xf_config_params.h b/vision/L1/examples/accumulate/build/xf_config_params.h
@@ -22,6 +22,6 @@
 #define RGB 0
 #define GRAY 1
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 #define XF_CV_DEPTH_IN_2 2
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/accumulatesquared/build/xf_config_params.h b/vision/L1/examples/accumulatesquared/build/xf_config_params.h
@@ -19,6 +19,6 @@
 
 #define GRAY 1
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 #define XF_CV_DEPTH_IN_2 2
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/accumulateweighted/build/xf_config_params.h b/vision/L1/examples/accumulateweighted/build/xf_config_params.h
@@ -19,6 +19,6 @@
 
 #define GRAY 1
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 #define XF_CV_DEPTH_IN_2 2
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/addweighted/build/xf_config_params.h b/vision/L1/examples/addweighted/build/xf_config_params.h
@@ -19,6 +19,6 @@
 
 #define GRAY 1
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 #define XF_CV_DEPTH_IN_2 2
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/aec/build/xf_config_params.h b/vision/L1/examples/aec/build/xf_config_params.h
@@ -19,5 +19,5 @@
 
 #define T_8U 1
 
-#define XF_CV_DEPTH_IN 1
-#define XF_CV_DEPTH_OUT 3
+#define XF_CV_DEPTH_IN 2
+#define XF_CV_DEPTH_OUT 2
diff --git a/vision/L1/examples/arithm/build/xf_config_params.h b/vision/L1/examples/arithm/build/xf_config_params.h
@@ -34,7 +34,7 @@
 #define CV_FUNCT_NAME absdiff
 // //#define CV_EXTRA_ARG  0.05
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 #define XF_CV_DEPTH_IN_2 2
 
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/autowhitebalance/build/xf_config_params.h b/vision/L1/examples/autowhitebalance/build/xf_config_params.h
@@ -23,6 +23,6 @@
 #define T_12U 0
 #define T_10U 0
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 #define XF_CV_DEPTH_IN_2 2
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/axiconv/build/xf_config_params.h b/vision/L1/examples/axiconv/build/xf_config_params.h
@@ -20,4 +20,4 @@
 #define GRAY 1
 #define RGB 0
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
diff --git a/vision/L1/examples/badpixelcorrection/build/xf_config_params.h b/vision/L1/examples/badpixelcorrection/build/xf_config_params.h
@@ -22,5 +22,5 @@
 #define T_8U 1
 #define T_16U 0
 
-#define XF_CV_DEPTH_IN_1 4
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/bilateralfilter/build/xf_config_params.h b/vision/L1/examples/bilateralfilter/build/xf_config_params.h
@@ -26,6 +26,6 @@
 #define GRAY 0
 #define RGB 1
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/boxfilter/build/xf_config_params.h b/vision/L1/examples/boxfilter/build/xf_config_params.h
@@ -35,6 +35,6 @@
 
 #define XF_USE_URAM false
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/channelcombine/build/xf_config_params.h b/vision/L1/examples/channelcombine/build/xf_config_params.h
@@ -23,9 +23,9 @@
 
 #define NPC XF_NPPC1
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 #define XF_CV_DEPTH_IN_2 2
-#define XF_CV_DEPTH_IN_3 1
+#define XF_CV_DEPTH_IN_3 2
 #define XF_CV_DEPTH_IN_4 2
 
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/clahe/build/xf_config_params.h b/vision/L1/examples/clahe/build/xf_config_params.h
@@ -14,5 +14,5 @@
  * limitations under the License.
  */
 
-#define XF_CV_DEPTH_IN_1 3
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/colorcorrectionmatrix/build/xf_config_params.h b/vision/L1/examples/colorcorrectionmatrix/build/xf_config_params.h
@@ -22,5 +22,5 @@
 #define T_8U 1
 #define T_16U 0
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/colordetect/build/xf_config_params.h b/vision/L1/examples/colordetect/build/xf_config_params.h
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_1 2
 #define XF_CV_DEPTH_RGB2HSV 2
-#define XF_CV_DEPTH_HELP_1 3
-#define XF_CV_DEPTH_HELP_2 4
-#define XF_CV_DEPTH_HELP_3 5
-#define XF_CV_DEPTH_HELP_4 6
-#define XF_CV_DEPTH_OUT_1 7
+#define XF_CV_DEPTH_HELP_1 2
+#define XF_CV_DEPTH_HELP_2 2
+#define XF_CV_DEPTH_HELP_3 2
+#define XF_CV_DEPTH_HELP_4 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/convertbitdepth/build/xf_config_params.h b/vision/L1/examples/convertbitdepth/build/xf_config_params.h
@@ -30,5 +30,5 @@
 #define XF_CONVERT16UTO32S 0 // set to convert bit depth from unsigned 16-bit to 32-bit signed
 #define XF_CONVERT16STO32S 1 // set to convert bit depth from signed   16-bit to 32-bit signed
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/convertscaleabs/build/xf_config_params.h b/vision/L1/examples/convertscaleabs/build/xf_config_params.h
@@ -17,5 +17,5 @@
 #define SPC 1 // Single Pixel per Clock operation
 #define MPC 0 // Multiple Pixels per Clock operation
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/custom_bgr2y8/build/xf_config_params.h b/vision/L1/examples/custom_bgr2y8/build/xf_config_params.h
@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
 
 /* Set the optimisation type */
 #define SPC 1 // Single Pixel per Clock operation

diff --git a/vision/L1/examples/customconv/build/xf_config_params.h b/vision/L1/examples/customconv/build/xf_config_params.h
@@ -30,5 +30,5 @@
 #define GRAY 0
 #define RGBA 1
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/cvtcolor/build/xf_config_params.h b/vision/L1/examples/cvtcolor/build/xf_config_params.h
@@ -308,13 +308,13 @@
 
 #endif
 
-#define XF_CV_DEPTH_IN 3
-#define XF_CV_DEPTH_OUT 4
+#define XF_CV_DEPTH_IN 2
+#define XF_CV_DEPTH_OUT 2
 
-#define XF_CV_DEPTH_IN_0 3
-#define XF_CV_DEPTH_OUT_0 4
+#define XF_CV_DEPTH_IN_0 2
+#define XF_CV_DEPTH_OUT_0 2
 
-#define XF_CV_DEPTH_IN_1 3
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
 #define XF_CV_DEPTH_IN_2 2
-#define XF_CV_DEPTH_OUT_2 4
+#define XF_CV_DEPTH_OUT_2 2
diff --git a/vision/L1/examples/demosaicing/build/xf_config_params.h b/vision/L1/examples/demosaicing/build/xf_config_params.h
@@ -25,5 +25,5 @@
 
 #define XF_USE_URAM 0
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/dilation/build/xf_config_params.h b/vision/L1/examples/dilation/build/xf_config_params.h
@@ -25,5 +25,5 @@
 
 #define ITERATIONS 1
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/erosion/build/xf_config_params.h b/vision/L1/examples/erosion/build/xf_config_params.h
@@ -25,5 +25,5 @@
 
 #define ITERATIONS 1
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/fast/build/xf_config_params.h b/vision/L1/examples/fast/build/xf_config_params.h
@@ -24,5 +24,5 @@
 
 #define MAXCORNERS 1024
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/gaincontrol/build/xf_config_params.h b/vision/L1/examples/gaincontrol/build/xf_config_params.h
@@ -22,5 +22,5 @@
 #define T_8U 1
 #define T_16U 0
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/gammacorrection/build/xf_config_params.h b/vision/L1/examples/gammacorrection/build/xf_config_params.h
@@ -19,5 +19,5 @@
 
 #define GRAY 1
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/gaussiandifference/build/xf_config_params.h b/vision/L1/examples/gaussiandifference/build/xf_config_params.h
@@ -28,10 +28,10 @@
 #define MPC 0
 #define SPC 1
 
-#define XF_CV_DEPTH_IN_0 1
-#define XF_CV_DEPTH_IN_1 1
+#define XF_CV_DEPTH_IN_0 2
+#define XF_CV_DEPTH_IN_1 2
 #define XF_CV_DEPTH_IN_2 2
 #define XF_CV_DEPTH_IN_3 15360
-#define XF_CV_DEPTH_IN_4 4
+#define XF_CV_DEPTH_IN_4 2
 
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/gaussianfilter/build/xf_config_params.h b/vision/L1/examples/gaussianfilter/build/xf_config_params.h
@@ -24,5 +24,5 @@
 #define GRAY 1
 #define RGBA 0
 
-#define XF_CV_DEPTH_IN_1 1
-#define XF_CV_DEPTH_OUT_1 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT_1 2
diff --git a/vision/L1/examples/globaltonemapping/build/xf_config_params.h b/vision/L1/examples/globaltonemapping/build/xf_config_params.h
@@ -20,5 +20,5 @@
 
 /* Image type */
 #define T_16U 1
-#define XF_CV_DEPTH_IN 3
-#define XF_CV_DEPTH_OUT 3
+#define XF_CV_DEPTH_IN 2
+#define XF_CV_DEPTH_OUT 2
diff --git a/vision/L1/examples/harris/build/xf_config_params.h b/vision/L1/examples/harris/build/xf_config_params.h
@@ -25,5 +25,5 @@
 
 #define XF_USE_URAM false
 
-#define XF_CV_DEPTH_IN 3
-#define XF_CV_DEPTH_OUT 3
+#define XF_CV_DEPTH_IN 2
+#define XF_CV_DEPTH_OUT 2
diff --git a/vision/L1/examples/hdrextractfrms/build/xf_config_params.h b/vision/L1/examples/hdrextractfrms/build/xf_config_params.h
@@ -31,6 +31,6 @@
 
 #define XF_USE_URAM 0
 
-#define XF_CV_DEPTH_IN 3
-#define XF_CV_DEPTH_LEF 3
-#define XF_CV_DEPTH_SEF 3
+#define XF_CV_DEPTH_IN 2
+#define XF_CV_DEPTH_LEF 2
+#define XF_CV_DEPTH_SEF 2
diff --git a/vision/L1/examples/hdrmerge/build/xf_config_params.h b/vision/L1/examples/hdrmerge/build/xf_config_params.h
@@ -56,6 +56,6 @@
 #define NO_EXPS 2
 
 #define NPIX XF_NPPC2
-#define XF_CV_DEPTH_IN_1 3
-#define XF_CV_DEPTH_IN_2 3
-#define XF_CV_DEPTH_OUT 3
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_IN_2 2
+#define XF_CV_DEPTH_OUT 2
diff --git a/vision/L1/examples/histequalize/build/xf_config_params.h b/vision/L1/examples/histequalize/build/xf_config_params.h
@@ -16,6 +16,6 @@
 
 #define MPC 0 // Multiple Pixels per Clock operation
 #define SPC 1 // Single Pixel per Clock operation
-#define XF_CV_DEPTH_IN 3
-#define XF_CV_DEPTH_IN_1 3
-#define XF_CV_DEPTH_OUT 3
+#define XF_CV_DEPTH_IN 2
+#define XF_CV_DEPTH_IN_1 2
+#define XF_CV_DEPTH_OUT 2
diff --git a/vision/L1/examples/histogram/build/xf_config_params.h b/vision/L1/examples/histogram/build/xf_config_params.h
@@ -19,4 +19,4 @@
 
 #define GRAY 1
 #define RGBA 0
-#define XF_CV_DEPTH_IN 3
+#define XF_CV_DEPTH_IN 2
diff --git a/vision/L1/examples/hog/build/xf_config_params.h b/vision/L1/examples/hog/build/xf_config_params.h
@@ -29,5 +29,5 @@
 #define XF_WIN_HEIGHT 128
 #define XF_WIN_WIDTH 64
 #define XF_USE_URAM false
-#define XF_CV_DEPTH_IN 3
-#define XF_CV_DEPTH_OUT 3
+#define XF_CV_DEPTH_IN 2
+#define XF_CV_DEPTH_OUT 2