Zihao Mu [Thu, 8 Dec 2022 12:57:13 +0000 (20:57 +0800)]
Merge pull request #22840 from zihaomu:optimze_conv_memory_usage
DNN: reduce the memory used in convolution layer
* reduce the memory in winograd and disabel the test when usage memory is larger than 2gb.
* remove VERY_LOG tag
Alexander Smorkalov [Wed, 7 Dec 2022 11:25:31 +0000 (14:25 +0300)]
Merge pull request #22885 from asmorkalov:as/new_qt_icons
Switch QT UI to icons with Google Material Design
Zihao Mu [Tue, 6 Dec 2022 05:54:32 +0000 (13:54 +0800)]
Merge pull request #22808 from zihaomu:nanotrack
[teset data in opencv_extra](https://github.com/opencv/opencv_extra/pull/1016)
NanoTrack is an extremely lightweight and fast object-tracking model.
The total size is **1.1 MB**.
And the FPS on M1 chip is **150**, on Raspberry Pi 4 is about **30**. (Float32 CPU only)
With this model, many users can run object tracking on the edge device.
The author of NanoTrack is @HonglinChu.
The original repo is https://github.com/HonglinChu/NanoTrack.
### Pull Request Readiness Checklist
See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request
- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [x] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
Alexander Alekhin [Sat, 3 Dec 2022 05:46:23 +0000 (05:46 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Christine Poerschke [Sat, 3 Dec 2022 05:29:04 +0000 (05:29 +0000)]
Merge pull request #22865 from cpoerschke:3.4-issue-22860
ocl_minMaxIdx to call minmaxloc.cl for OpenCL 1.2+ only
Alexander Alekhin [Sat, 3 Dec 2022 05:24:28 +0000 (05:24 +0000)]
Merge pull request #22888 from alalek:dnn_ov_fix_custom_layers
Alexander Alekhin [Sat, 3 Dec 2022 05:22:04 +0000 (05:22 +0000)]
Merge pull request #22910 from alalek:cmake_pkg_config_ignore_atomic
Alexander Alekhin [Fri, 2 Dec 2022 23:55:16 +0000 (23:55 +0000)]
dnn(test): restore openvino tests with 'Cannot get memory' message
Alexander Alekhin [Wed, 30 Nov 2022 01:26:09 +0000 (01:26 +0000)]
dnn(openvino): fix custom layers BlockingDesc
Alexander Alekhin [Fri, 2 Dec 2022 22:48:40 +0000 (22:48 +0000)]
cmake: ocv_check_modules: ignore -latomic and -lstdc++
Alexander Smorkalov [Tue, 29 Nov 2022 13:41:01 +0000 (16:41 +0300)]
Switch QT UI to icons with Google Material Design.
Alexander Alekhin [Thu, 1 Dec 2022 21:39:15 +0000 (21:39 +0000)]
Merge pull request #22899 from mshabunin:fix-videoio-plugin
Maksim Shabunin [Thu, 1 Dec 2022 12:13:52 +0000 (15:13 +0300)]
videoio: fixed FFmpeg plugin build
Alexander Smorkalov [Thu, 1 Dec 2022 10:47:32 +0000 (13:47 +0300)]
Merge pull request #22594 from ZhaoChuyang:pr_test_for_22253
add test for PR #22253
Vadim Levin [Wed, 30 Nov 2022 14:40:38 +0000 (17:40 +0300)]
refactor: rework test to be more specific
赵楚洋 [Sun, 2 Oct 2022 09:06:07 +0000 (17:06 +0800)]
add test
Alexander Smorkalov [Wed, 30 Nov 2022 11:26:07 +0000 (14:26 +0300)]
Merge pull request #22796 from ClayXrex:patch-1
fix: typo in opencv-python tutorials
Alexander Smorkalov [Wed, 30 Nov 2022 11:25:09 +0000 (14:25 +0300)]
Merge pull request #22792 from tailsu:sd/avfoundation-orientation-meta
Add support for CAP_PROP_ORIENTATION_AUTO to AVFoundation backend
ClayXrex [Sat, 12 Nov 2022 11:31:57 +0000 (12:31 +0100)]
fix: typo
Alexander Smorkalov [Wed, 30 Nov 2022 09:37:49 +0000 (12:37 +0300)]
Merge pull request #22857 from fengyuentau:batched_nms
dnn: add batched nms
Alexander Smorkalov [Tue, 29 Nov 2022 11:42:28 +0000 (14:42 +0300)]
Merge pull request #22809 from fengyuentau:tile
dnn: support ONNX Tile
fengyuentau [Thu, 24 Nov 2022 02:20:04 +0000 (10:20 +0800)]
batched nms impl
fengyuentau [Tue, 15 Nov 2022 06:29:30 +0000 (14:29 +0800)]
tile impl
Alexander Alekhin [Mon, 28 Nov 2022 19:10:51 +0000 (19:10 +0000)]
Merge pull request #22873 from WanliZhong:issue22859
Alexander Alekhin [Mon, 28 Nov 2022 19:05:59 +0000 (19:05 +0000)]
Merge pull request #22875 from asmorkalov:as/cl_error_code_fix
HAN Liutong [Mon, 28 Nov 2022 18:28:14 +0000 (02:28 +0800)]
Merge pull request #22520 from hanliutong:hsv
Modify the SIMD loop in color_hsv.
* Modify the SIMD loops in color_hsv.
* Add FP supporting in bit logic.
* Add temporary compatibility code.
* Use max_nlanes instead of vlanes for array declaration.
* Use "CV_SIMD || CV_SIMD_SCALABLE".
* Revert the modify of the Universal Intrinsic API
* Fix warnings.
* Use v_select instead of bits manipulation.
Alexander Smorkalov [Mon, 28 Nov 2022 16:50:02 +0000 (19:50 +0300)]
Merge pull request #22695 from AleksandrPanov:qr_improve_version_detect
Improve QR code version estimation
AleksandrPanov [Mon, 28 Nov 2022 14:45:09 +0000 (17:45 +0300)]
add getNumModules(), add decode version
Alexander Smorkalov [Mon, 28 Nov 2022 06:47:51 +0000 (09:47 +0300)]
More fixes for OpenCL error reporting.
zoom [Sun, 27 Nov 2022 09:32:41 +0000 (17:32 +0800)]
let MatMul can work when both two inputs are const
Alexander Alekhin [Fri, 25 Nov 2022 22:47:19 +0000 (22:47 +0000)]
Merge pull request #22866 from asmorkalov:as/error_formatting
Stefan Dragnev [Thu, 10 Nov 2022 17:08:59 +0000 (18:08 +0100)]
add support for CAP_PROP_ORIENTATION_AUTO to AVFoundation backend
* extract rotateFrame as free function, rename to applyMetadataRotation
* LegacyCapture::get() always return 0, if cap is null
Alexander Smorkalov [Fri, 25 Nov 2022 13:46:12 +0000 (16:46 +0300)]
Fixed OpenGL errors formatting.
Amir Hassan [Fri, 25 Nov 2022 06:13:57 +0000 (07:13 +0100)]
Merge pull request #22855 from kallaballa:print_cl_status_on_fail
Print CL status code on error in opengl interop functions
Alexander Smorkalov [Tue, 22 Nov 2022 13:15:50 +0000 (16:15 +0300)]
Merge pull request #22478 from WanliZhong:nary_eltwise_cuda
DNN: Let part of the operators in nary_eltwise support CUDA
Dan Mašek [Tue, 22 Nov 2022 10:47:27 +0000 (11:47 +0100)]
Merge pull request #22838 from dan-masek:fix_issue_22837
Fix issue 22837: No more blank buttons on toolbar after resizing the window
Alexander Smorkalov [Tue, 22 Nov 2022 09:50:02 +0000 (12:50 +0300)]
Merge pull request #22830 from alalek:issue_22752
imgcodecs: ensure parameters are key-value pairs, fix HDR encoder
Alexander Alekhin [Mon, 21 Nov 2022 19:55:47 +0000 (19:55 +0000)]
Merge pull request #22775 from WanliZhong:issue22713
Alexander Alekhin [Mon, 21 Nov 2022 19:53:34 +0000 (19:53 +0000)]
Merge pull request #22806 from dan-masek:fix_issue_22767
Alexander Smorkalov [Mon, 21 Nov 2022 10:41:44 +0000 (13:41 +0300)]
Merge pull request #22842 from asmorkalov:as/pr_22737_backport
backport #22737: Cocoa/highgui: Set [NSApp activateIgnoringOtherApps] to spawn window on top
fwcd [Tue, 1 Nov 2022 17:24:10 +0000 (18:24 +0100)]
Cocoa/highgui: Set activateIgnoringOtherApps
Alexander Smorkalov [Mon, 21 Nov 2022 09:28:00 +0000 (12:28 +0300)]
Merge pull request #22737 from fwcd:activate-cocoa-window-on-top
Cocoa/highgui: Set `[NSApp activateIgnoringOtherApps]` to spawn window on top
Alexander Alekhin [Mon, 21 Nov 2022 07:48:03 +0000 (07:48 +0000)]
Merge pull request #22839 from zchrissirhcz:fix-typo-3.4
Alexander Alekhin [Mon, 21 Nov 2022 07:33:54 +0000 (07:33 +0000)]
Merge pull request #22831 from mshabunin:fix-gapi-test-crash
Zhuo Zhang [Mon, 21 Nov 2022 02:44:12 +0000 (10:44 +0800)]
fix typo: Gausssian to Gaussian
Alexander Alekhin [Sun, 20 Nov 2022 22:28:24 +0000 (22:28 +0000)]
Merge pull request #22805 from dan-masek:fix_issue_22766
Dan Mašek [Tue, 15 Nov 2022 00:04:03 +0000 (01:04 +0100)]
Fix #22766: Corrected off-by one error causing inconsistent row spacing. (rebased to 3.4)
Dan Mašek [Tue, 15 Nov 2022 00:18:46 +0000 (01:18 +0100)]
Fix #22767: Ensure that the buttons are spaced to the size of the toolbar window, which is always visible. (rebased to 3.x)
Alexander Alekhin [Fri, 18 Nov 2022 18:09:26 +0000 (18:09 +0000)]
imgcodecs: ensure parameters are key-value pairs, fix HDR encoder
Maksim Shabunin [Fri, 18 Nov 2022 22:56:45 +0000 (01:56 +0300)]
gapi: fix InferWithReshape test crash when data is not found
Anatoliy Talamanov [Fri, 18 Nov 2022 15:25:51 +0000 (15:25 +0000)]
Merge pull request #22735 from TolyaTalamanov:at/expose-all-imgproc-to-python
G-API Expose all imgproc operations to python
* Expose imgproc operations
* Fix alignment
Alexander Smorkalov [Thu, 17 Nov 2022 10:36:18 +0000 (13:36 +0300)]
Merge pull request #22771 from kallaballa:opencl_hls_and_hsv_conversions_bug
define the number of dstChannels for HLS and HSV conversion as well
Alexander Smorkalov [Thu, 17 Nov 2022 08:02:11 +0000 (11:02 +0300)]
Merge pull request #22814 from AleksandrPanov:log_qr_version
log QR version and corners
su77ungr [Thu, 17 Nov 2022 06:54:25 +0000 (07:54 +0100)]
Merge pull request #22727 from su77ungr:patch-1
Rename file name to correct spelling
Alexander Smorkalov [Thu, 17 Nov 2022 06:17:18 +0000 (09:17 +0300)]
Merge pull request #22816 from cudawarped/remove_windows_cuda_dll_warning
Suppress CUDA nvcc generated warnings #1394-D and #1388-D on windows
Alexander Alekhin [Wed, 16 Nov 2022 16:47:15 +0000 (16:47 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 16 Nov 2022 16:24:48 +0000 (19:24 +0300)]
Merge pull request #22559 from smirnov-alexey:as/vpl_ocl
G-API: Connect OneVPL source and OpenCL backend
Alexey Smirnov [Fri, 23 Sep 2022 11:08:29 +0000 (12:08 +0100)]
Copy mpashchenkov's changes
Minor refactoring
Partially address review comments
Move DX-related stuff from the sample to a default source
Simplify the default OneVPL config
Address minor review comments
Add class for the default VPL source
WIP: Add initial stub for tests with description
Removing default vpl source and minor refactoring
Refactor default files
Fix build and application crash
Address review comments
Add test on VPL + OCL interaction compared to CPU behavior
Fix test
cudawarped [Wed, 16 Nov 2022 09:14:17 +0000 (11:14 +0200)]
Suppress
warning #1394-D: field of class type without a DLL interface used in a class with a DLL interface
from windows CUDA builds.
AleksandrPanov [Wed, 16 Nov 2022 07:41:13 +0000 (10:41 +0300)]
log QR version and corners
Alexander Alekhin [Wed, 16 Nov 2022 04:06:23 +0000 (04:06 +0000)]
Merge pull request #22811 from alalek:core_check_bool
Alexander Alekhin [Wed, 16 Nov 2022 04:05:08 +0000 (07:05 +0300)]
Merge pull request #22801 from alalek:update_zlib
* 3rdparty: zlib 1.2.12 => 1.2.13
https://github.com/madler/zlib/releases/tag/v1.2.13
- replace README -> LICENSE in install distribution
* 3rdparty(zlib): re-apply patch
20190330-ununitialized-use-state-check.diff
Alexander Smorkalov [Tue, 15 Nov 2022 12:02:23 +0000 (15:02 +0300)]
Merge pull request #22804 from dan-masek:fix_issue_22765
Fix #22765
Alexander Alekhin [Tue, 15 Nov 2022 09:55:22 +0000 (09:55 +0000)]
core: support CV_Check*() macros with 'bool' parameters
Alexander Smorkalov [Tue, 15 Nov 2022 08:45:14 +0000 (11:45 +0300)]
Merge pull request #22802 from zihaomu:fix_infinit_loop_in_tf_34
Fix infinit loop in tf 3.4 branch
zihaomu [Tue, 15 Nov 2022 03:42:10 +0000 (11:42 +0800)]
fix the infinite loop in tf importer of 3.4 branch
Dan Mašek [Mon, 14 Nov 2022 23:44:51 +0000 (00:44 +0100)]
Fix #22765: Remove unnecessary function resulting in infinite recursion. Since In all four places it was used, we already check the shared pointer, the extra assert that the function provided was redundand, so I removed it, and I added a dereference to the `window` parameters.
Amir Hassan [Fri, 11 Nov 2022 22:28:02 +0000 (23:28 +0100)]
Merge pull request #22706 from kallaballa:libavdevice_for_ffmpeg_v4l2
Introduce libavdevice to make v4l2 available to the ffmpeg backend
* introduce libavdevice to make v4l2 available to the ffmpeg backend
* downgrade the min required libavdevice version to 53.2.0
* make libavdevice optional
* create OCV_OPTION OPENCV_FFMPEG_ENABLE_LIBAVDEVICE and add definition through ocv_add_external_target
* move OCV_OPTION 'OPENCV_FFMPEG_ENABLE_LIBAVDEVICE' to detect_ffmpeg.cmake
Juha Reunanen [Fri, 11 Nov 2022 08:40:53 +0000 (10:40 +0200)]
Merge pull request #22790 from reunanen:add-capability-to-set-DWA-compression-level-in-OpenEXR-encoding
OpenEXR encoder: add capability to set the DWA compression level
* OpenEXR encoder: add capability to set the DWA compression level from outside
* Do not try to call `header.dwaCompressionLevel()` if OpenEXR is not version 3 or later
* Minor cleanup
kallaballa [Wed, 9 Nov 2022 00:32:07 +0000 (01:32 +0100)]
define the number of dstChannels for HLS and HSV conversion as well
zoom [Wed, 9 Nov 2022 08:23:42 +0000 (16:23 +0800)]
Make MatMul layer support 3d or 4d operation with const input
Anatoliy Talamanov [Tue, 8 Nov 2022 11:43:38 +0000 (11:43 +0000)]
Merge pull request #22494 from TolyaTalamanov:at/expose-all-core-to-python
G-API Expose all core operations to python
* Expose all G-API core operations to python
* Fix typo in python gapi types test
Alexander Alekhin [Mon, 7 Nov 2022 20:51:38 +0000 (20:51 +0000)]
Merge pull request #22761 from reunanen:fix-floodFill-for-very-large-images
Juha Reunanen [Mon, 7 Nov 2022 11:40:02 +0000 (13:40 +0200)]
Fix floodFill for very large images
Alexander Alekhin [Thu, 3 Nov 2022 16:14:28 +0000 (16:14 +0000)]
Merge pull request #22744 from WanliZhong:fix_gitcode_mirror
zoom [Thu, 3 Nov 2022 08:54:08 +0000 (16:54 +0800)]
Fix the problem that "ADE" downloaded from GitCode doesn't work.
Alexander Alekhin [Thu, 3 Nov 2022 04:41:56 +0000 (04:41 +0000)]
Merge pull request #22739 from zihaomu:remove_never_used_code
zoom [Fri, 21 Oct 2022 05:11:22 +0000 (13:11 +0800)]
Let part of the operators in nary_eltwise support cuda
Zihao Mu [Wed, 2 Nov 2022 02:45:16 +0000 (10:45 +0800)]
remove never used code in onnximporter
fwcd [Tue, 1 Nov 2022 17:24:10 +0000 (18:24 +0100)]
Cocoa/highgui: Set activateIgnoringOtherApps
Alexander Alekhin [Mon, 31 Oct 2022 17:03:43 +0000 (17:03 +0000)]
Merge pull request #22717 from alalek:issue_22716
Alexander Alekhin [Mon, 31 Oct 2022 17:03:03 +0000 (17:03 +0000)]
Merge pull request #22725 from zihaomu:fix_infinit_loop_in_tf
Zihao Mu [Mon, 31 Oct 2022 16:06:31 +0000 (00:06 +0800)]
Merge pull request #22666 from zihaomu:support_onnx_qdq_model
DNN: let Quant and Dequant of ONNX_importer support the Constant input.
* let Quant and Dequant support the Constant input.
* fix negative value of axis.
Alexander Alekhin [Mon, 31 Oct 2022 15:54:53 +0000 (15:54 +0000)]
Merge pull request #22718 from zihaomu:improve_stackblur
Alexander Alekhin [Mon, 31 Oct 2022 15:52:29 +0000 (15:52 +0000)]
Merge pull request #22726 from JopKnoppers:master
Zihao Mu [Mon, 31 Oct 2022 12:10:25 +0000 (20:10 +0800)]
fix the infinite loop in tf importer.
JopKnoppers [Mon, 31 Oct 2022 11:19:04 +0000 (12:19 +0100)]
Included thread in gapi_async_test.cpp
Preventing: gapi_async_test.cpp:448:26: error: ‘sleep_for’ is not a member of ‘std::this_thread’
Alexander Alekhin [Sun, 30 Oct 2022 16:49:01 +0000 (16:49 +0000)]
Merge pull request #22601 from cpoerschke:4.x-issue-22595
Zihao Mu [Sat, 29 Oct 2022 09:34:28 +0000 (17:34 +0800)]
improve code style and Doc of stackblur.
Alexander Alekhin [Fri, 28 Oct 2022 20:47:53 +0000 (20:47 +0000)]
Merge pull request #22712 from dmatveev:dm/fix_va_headers
Alexander Alekhin [Fri, 28 Oct 2022 17:03:43 +0000 (17:03 +0000)]
imgproc: sigma2=sigma1 in top-level function of GaussianBlur
cudawarped [Fri, 28 Oct 2022 08:03:51 +0000 (11:03 +0300)]
Merge pull request #22615 from cudawarped:nvcuvenc
Update CMake rules to include Nvidia Video Codec SDK encoding libs
Dmitry Matveev [Thu, 27 Oct 2022 18:25:36 +0000 (18:25 +0000)]
Fix issues with VA_INCLUDE_HEADERS when building with CUDA support
...and not only?
Alexander Smorkalov [Thu, 27 Oct 2022 11:16:03 +0000 (14:16 +0300)]
Merge pull request #22463 from hanliutong:rvv
Redesign the SIMD macro.
Alexander Smorkalov [Thu, 27 Oct 2022 09:18:52 +0000 (12:18 +0300)]
Merge pull request #22702 from kallaballa:ffmpeg_environment_variables
Dump the values of OPENCV_FFMPEG_CAPTURE_OPTIONS and OPENCV_FFMPEG_WRITER_OPTIONS to debug log
kallaballa [Wed, 26 Oct 2022 22:27:17 +0000 (00:27 +0200)]
print a debug message if the environment variables OPENCV_FFMPEG_CAPTURE_OPTIONS and OPENCV_FFMPEG_WRITER_OPTIONS are set
HAN Liutong [Wed, 26 Oct 2022 13:02:03 +0000 (13:02 +0000)]
Update SIMD macro for RVV backend.
Alexander Smorkalov [Wed, 26 Oct 2022 12:48:06 +0000 (15:48 +0300)]
Merge pull request #22633 from cudawarped:fix_3361
Reset cuda runtime error code to cudasuccess on runtime failure.
Alexander Smorkalov [Wed, 26 Oct 2022 09:00:51 +0000 (12:00 +0300)]
Merge pull request #22692 from asmorkalov:as/arm_debug_4x
4.x: Added ARM64 debug configuration to CI.
Alexander Smorkalov [Tue, 25 Oct 2022 11:40:17 +0000 (14:40 +0300)]
Merge pull request #22690 from alalek:android_config_ndk25
android: add configuration for NDK 25 and Android API 32 (12L)