Merge branch 4.x

Author: asmorkalov

.github/workflows/PR-5.x.yaml

@@ -11,10 +11,10 @@ jobs:
     with:
       workflow_branch: main
 
-  Ubuntu2004-ARM64:
+  Ubuntu2404-ARM64:
     uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-5.x-ARM64.yaml@main
 
-  Ubuntu2004-ARM64-FastCV:
+  Ubuntu2404-ARM64-FastCV:
     uses: opencv/ci-gha-workflow/.github/workflows/OCV-Contrib-PR-5.x-ARM64-FastCV.yaml@main
 
   Ubuntu2004-x64-CUDA:

modules/bgsegm/include/opencv2/bgsegm.hpp

@@ -147,7 +147,7 @@ class CV_EXPORTS_W BackgroundSubtractorGMG : public BackgroundSubtractor
     rate. 0 means that the background model is not updated at all, 1 means that the background model
     is completely reinitialized from the last frame.
 
-    @note This method has a default virtual implementation that throws a "not impemented" error.
+    @note This method has a default virtual implementation that throws a "not implemented" error.
     Foreground masking may not be supported by all background subtractors.
     */
     CV_WRAP virtual void apply(InputArray image, InputArray knownForegroundMask, OutputArray fgmask, double learningRate=-1) CV_OVERRIDE = 0;

modules/cudacodec/CMakeLists.txt

@@ -30,25 +30,23 @@ if(WITH_NVCUVENC AND NOT HAVE_NVCUVENC)
   message(WARNING "cudacodec::VideoWriter requires Nvidia Video Codec SDK. Please resolve dependency or disable WITH_NVCUVENC=OFF")
 endif()
 
-if(HAVE_NVCUVID OR HAVE_NVCUVENC)
-  if(ENABLE_CUDA_FIRST_CLASS_LANGUAGE)
-      list(APPEND extra_libs CUDA::cuda_driver CUDA::cudart${CUDA_LIB_EXT})
-  else()
-    list(APPEND extra_libs ${CUDA_CUDA_LIBRARY})
-  endif()
-  if(HAVE_NVCUVID)
-    list(APPEND extra_libs ${CUDA_nvcuvid_LIBRARY})
-  endif()
-  if(HAVE_NVCUVENC)
-      if(WIN32)
-        list(APPEND extra_libs ${CUDA_nvencodeapi_LIBRARY})
-      else()
-        list(APPEND extra_libs ${CUDA_nvidia-encode_LIBRARY})
-      endif()
-  endif()
+if(ENABLE_CUDA_FIRST_CLASS_LANGUAGE)
+    list(APPEND extra_libs CUDA::cuda_driver CUDA::cudart${CUDA_LIB_EXT})
+else()
+  list(APPEND extra_libs ${CUDA_CUDA_LIBRARY})
+endif()
+if(HAVE_NVCUVID)
+  list(APPEND extra_libs ${CUDA_nvcuvid_LIBRARY})
+endif()
+if(HAVE_NVCUVENC)
+    if(WIN32)
+      list(APPEND extra_libs ${CUDA_nvencodeapi_LIBRARY})
+    else()
+      list(APPEND extra_libs ${CUDA_nvidia-encode_LIBRARY})
+    endif()
 endif()
 
 ocv_create_module(${extra_libs})
 
 ocv_add_accuracy_tests()
-ocv_add_perf_tests()
+ocv_add_perf_tests()

modules/cudaimgproc/src/cuda/corners.cu

@@ -154,7 +154,9 @@ namespace cv { namespace cuda { namespace device
             cudaSafeCall( cudaGetLastError() );
 
             if (stream == 0)
-                cudaSafeCall( cudaDeviceSynchronize() );
+                cudaSafeCall(cudaDeviceSynchronize());
+            else
+                cudaSafeCall(cudaStreamSynchronize(stream));
         }
 
         /////////////////////////////////////////// Corner Min Eigen Val /////////////////////////////////////////////////
@@ -262,6 +264,8 @@ namespace cv { namespace cuda { namespace device
 
             if (stream == 0)
                 cudaSafeCall(cudaDeviceSynchronize());
+            else
+                cudaSafeCall(cudaStreamSynchronize(stream));
         }
     }
 }}}

modules/cudawarping/perf/perf_warping.cpp

@@ -180,6 +180,57 @@ PERF_TEST_P(Sz_Depth_Cn_Inter_Scale, Resize,
     }
 }
 
+//////////////////////////////////////////////////////////////////////
+// ResizeLanczos
+
+PERF_TEST_P(Sz_Depth_Cn_Inter_Scale, ResizeLanczos,
+            Combine(CUDA_TYPICAL_MAT_SIZES,
+                    Values(CV_8U, CV_32F),
+                    CUDA_CHANNELS_1_3_4,
+                    Values(Interpolation(cv::INTER_LANCZOS4)),
+                    Values(0.5, 1.5, 2.0)))
+{
+    declare.time(20.0);
+
+    const cv::Size size = GET_PARAM(0);
+    const int depth = GET_PARAM(1);
+    const int channels = GET_PARAM(2);
+    const int interpolation = GET_PARAM(3);
+    const double f = GET_PARAM(4);
+
+    const int type = CV_MAKE_TYPE(depth, channels);
+
+    cv::Mat src(size, type);
+    declare.in(src, WARMUP_RNG);
+
+    if (PERF_RUN_CUDA())
+    {
+        const cv::cuda::GpuMat d_src(src);
+        cv::cuda::GpuMat dst;
+        cv::Size dsize(cv::saturate_cast<int>(src.cols * f), cv::saturate_cast<int>(src.rows * f));
+        cv::Mat host_dst(dsize, type);
+
+        declare.out(host_dst);
+
+        TEST_CYCLE() cv::cuda::resize(d_src, dst, cv::Size(), f, f, interpolation);
+
+        dst.download(host_dst);
+
+        CUDA_SANITY_CHECK(dst, 1e-3, ERROR_RELATIVE);
+    }
+    else
+    {
+        cv::Size dsize(cv::saturate_cast<int>(src.cols * f), cv::saturate_cast<int>(src.rows * f));
+        cv::Mat dst(dsize, type);
+
+        declare.out(dst);
+
+        TEST_CYCLE() cv::resize(src, dst, cv::Size(), f, f, interpolation);
+
+        CPU_SANITY_CHECK(dst);
+    }
+}
+
 //////////////////////////////////////////////////////////////////////
 // ResizeArea