Alexander Alekhin [Wed, 24 Mar 2021 18:55:24 +0000 (18:55 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 24 Mar 2021 18:50:47 +0000 (18:50 +0000)]
Merge pull request #19770 from alalek:dnn_openvino_2021.3.0
Alexander Alekhin [Wed, 24 Mar 2021 15:20:38 +0000 (15:20 +0000)]
Merge pull request #19731 from rgarnov:rg/basic_frame_drop
Lukas-Alexander Weber [Wed, 24 Mar 2021 15:02:20 +0000 (16:02 +0100)]
Merge pull request #19762 from lukasalexanderweber:master
* Error Message for SURF if not implemented
In OpenCV 4.5.1
import cv2 as cv
cv.xfeatures2d_SURF.create
will not create an AttributeError, even if the function is excluded (no nonfree option)
In Line 305 (now 306) however ´finder = FEATURES_FIND_CHOICES[args.features]()´ will raise an
error: OpenCV(4.5.1) ..\opencv_contrib\modules\xfeatures2d\src\surf.cpp:1029: error: (-213:The function/feature is not implemented) This algorithm is patented and is excluded in this configuration; Set OPENCV_ENABLE_NONFREE CMake option and rebuild the library in function 'cv::xfeatures2d::SURF::create'
So we should check with cv.xfeatures2d_SURF.create() correctly if SURF is available
Alexander Alekhin [Wed, 24 Mar 2021 09:28:05 +0000 (09:28 +0000)]
dnn(test): update tests for OpenVINO 2021.3
Alexander Alekhin [Wed, 24 Mar 2021 13:37:05 +0000 (16:37 +0300)]
Merge pull request #19325 from AsyaPronina:asyadev/extract_y
[G-API] Added Y, UV accessors for cv::MediaFrame
Alexander Alekhin [Wed, 3 Mar 2021 00:32:25 +0000 (03:32 +0300)]
dnn: use OpenVINO 2021.3 defines
original commit:
62915037939f13a55b973b84fea05218f73e15ae
Alexander Alekhin [Wed, 24 Mar 2021 09:43:27 +0000 (09:43 +0000)]
Merge pull request #19765 from LupusSanctus:am/mobilenetv3
Anastasiya Pronina [Mon, 15 Mar 2021 15:49:43 +0000 (18:49 +0300)]
Added Y, UV accessors to cv::MediaFrame
Anastasia Murzova [Tue, 23 Mar 2021 19:28:26 +0000 (22:28 +0300)]
Added reshape corrections
Anastasia Murzova [Mon, 22 Mar 2021 19:37:49 +0000 (22:37 +0300)]
Corrected DNN elementwise multiplication
Anastasia M [Tue, 23 Mar 2021 22:16:09 +0000 (01:16 +0300)]
Merge pull request #19477 from LupusSanctus:am/eltwice_vec
* Aligned OpenCV DNN and TF sum op behaviour
Support Mat (shape: [1, m, k, n] ) + Vec (shape: [1, 1, 1, n]) operation
by vec to mat expansion
* Added code corrections: backend, minor refactoring
Alexander Alekhin [Tue, 23 Mar 2021 13:39:57 +0000 (13:39 +0000)]
Merge pull request #19763 from TolyaTalamanov:at/blockingdesc-order-fix
Alexander Alekhin [Mon, 22 Mar 2021 12:05:23 +0000 (12:05 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Anatoliy Talamanov [Mon, 22 Mar 2021 10:57:57 +0000 (13:57 +0300)]
Blocking dims order fix
Alexander Alekhin [Sun, 21 Mar 2021 17:37:05 +0000 (17:37 +0000)]
Merge pull request #19757 from alalek:js_setLogLevel
Alexander Alekhin [Sat, 20 Mar 2021 12:38:12 +0000 (12:38 +0000)]
js: support setLogLevel() / getLogLevel() calls
Liubov Batanina [Sat, 20 Mar 2021 11:20:02 +0000 (14:20 +0300)]
Merge pull request #19632 from l-bat:lb/ie_arm_target
Added OpenVINO ARM target
* Added IE ARM target
* Added OpenVINO ARM target
* Delete ARM target
* Detect ARM platform
* Changed device name in ArmPlugin
* Change ARM detection
Alexander Alekhin [Fri, 19 Mar 2021 12:53:31 +0000 (12:53 +0000)]
Merge pull request #19747 from alalek:issue_19733
Alexander Alekhin [Fri, 19 Mar 2021 12:52:34 +0000 (12:52 +0000)]
Merge pull request #19745 from alalek:issue_19729
Anatoliy Talamanov [Fri, 19 Mar 2021 12:50:45 +0000 (15:50 +0300)]
Merge pull request #19310 from TolyaTalamanov:at/generic-infer-overloads
[G-API] Support generic infer overloads
* Overloads for generic infer
* Fix build
* Refactoring
* Fix docs
* Put extra stuff to detail namespace
* Add doc for usings
* Remove uneccessary template in Priv
Alexander Alekhin [Fri, 19 Mar 2021 11:54:43 +0000 (11:54 +0000)]
Merge pull request #19738 from TolyaTalamanov:at/giebackend-blockingdesc-fix
Ruslan Garnov [Mon, 15 Mar 2021 23:58:12 +0000 (02:58 +0300)]
Implemented basic frame drop functionality
Anatoliy Talamanov [Wed, 17 Mar 2021 09:42:45 +0000 (12:42 +0300)]
Fix blocking desc usage
Alexander Alekhin [Thu, 18 Mar 2021 22:58:05 +0000 (22:58 +0000)]
core(parallel): fix plugins handling if no filesystem available
Alexander Alekhin [Thu, 18 Mar 2021 21:30:12 +0000 (21:30 +0000)]
features2d(mser): chi_table.h notes
Alexander Alekhin [Thu, 18 Mar 2021 20:47:44 +0000 (20:47 +0000)]
Merge pull request #19741 from alalek:ml_logistic_regression_use_opencv_license_header
Anatoliy Talamanov [Thu, 18 Mar 2021 20:33:19 +0000 (23:33 +0300)]
Merge pull request #19709 from TolyaTalamanov:at/async-inferlist-infer2
G-API: Implement async version for InferList & Infer2
* Implement async version for InferList & Infer2
* Fix warning
* Fix bug with roi ordering
* Post input meta instead of empty
* Fix comments to review
Alexander Alekhin [Wed, 17 Mar 2021 20:29:52 +0000 (20:29 +0000)]
ml: use OpenCV license header for logistic regression
Alexander Alekhin [Wed, 17 Mar 2021 13:59:52 +0000 (13:59 +0000)]
Merge pull request #19739 from alalek:fix_valgrind_run
Alexander Alekhin [Wed, 17 Mar 2021 08:59:56 +0000 (08:59 +0000)]
valgrind: filter out hardware-accelerated videoio tests
Alexander Alekhin [Sat, 13 Mar 2021 13:02:18 +0000 (13:02 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Ziachnix [Sat, 13 Mar 2021 12:52:44 +0000 (13:52 +0100)]
Merge pull request #19284 from Ziachnix:feature/js-qr-code-detector
Add QRCodeDetector to JavaScript Build
* ADD: js support for qrCodeDetector
- cherry picked commit to solve rebase error
* CHG. Revert haarcascade path
* FIX: Tests without images
* ADD: decodeCurved
* js(docs): don't require OPENCV_TEST_DATA_PATH
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Sat, 13 Mar 2021 12:48:20 +0000 (12:48 +0000)]
Merge pull request #19720 from alalek:ocl_test_skip_spir_amd
Alexander Alekhin [Sat, 13 Mar 2021 12:46:24 +0000 (12:46 +0000)]
Merge pull request #19718 from alalek:backport_19683
Alexander Alekhin [Sat, 13 Mar 2021 12:45:55 +0000 (12:45 +0000)]
Merge pull request #19717 from danbey:bad_value_param_should_be_passed_by_reference
Alexander Alekhin [Sat, 13 Mar 2021 12:45:07 +0000 (12:45 +0000)]
Merge pull request #19716 from l-bat:lb/fix_resize
Alexander Alekhin [Sat, 13 Mar 2021 05:56:40 +0000 (05:56 +0000)]
core(ocl): skip SPIR test on AMD devices if problem detected
Dale Phurrough [Mon, 1 Mar 2021 21:42:13 +0000 (22:42 +0100)]
noexcept def construct Mat, UMat, Mat_, MatSize, MatStep
original commit:
1b0f781b7cc18562b59ef60fb303ce0f9cea9f78
Dan Ben Yosef [Fri, 12 Mar 2021 19:17:11 +0000 (14:17 -0500)]
Avoiding copy by passing param by reference
It is best to pass bad_value_ param by reference to avoid copy.
Liubov Batanina [Fri, 12 Mar 2021 13:33:16 +0000 (16:33 +0300)]
Added ngraph::op::v6::MVN
Alexander Alekhin [Fri, 12 Mar 2021 14:27:41 +0000 (14:27 +0000)]
Merge pull request #19707 from AsyaPronina:asyadev/upstream_fixes_from_release
Alexander Alekhin [Fri, 12 Mar 2021 09:45:19 +0000 (09:45 +0000)]
Merge pull request #19715 from seiko2plus:issue_19698
Liubov Batanina [Fri, 12 Mar 2021 09:00:59 +0000 (12:00 +0300)]
Added ngraph::op::v4::Interpolation
Sayed Adel [Fri, 12 Mar 2021 02:02:31 +0000 (02:02 +0000)]
core:ppc64 fix detecting CPU features when optimization is off
Alexander Alekhin [Thu, 11 Mar 2021 22:02:06 +0000 (22:02 +0000)]
Merge pull request #19683 from diablodale:add_defconstruct_noexcept_matumat
Xinguang Bian [Thu, 11 Mar 2021 21:53:06 +0000 (05:53 +0800)]
Merge pull request #19253 from mightbxg:bugfix_PnPRansac
* fix unexpected Exception in solvePnPRansac caused by input points
* calib3d: solvePnPRansac - keep minimal changes to handle DLT 6 points requirement
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Thu, 11 Mar 2021 21:33:19 +0000 (21:33 +0000)]
Merge pull request #19703 from danbey:setting_StereoSGBMParams_in_init_list
Anastasiya Pronina [Thu, 11 Mar 2021 10:25:36 +0000 (13:25 +0300)]
Upstream fixes from release
Dan Ben Yosef [Wed, 10 Mar 2021 18:00:17 +0000 (13:00 -0500)]
Init params (StereoSGBMParams) in StereoSGBMImpl constructor initialization list
To improve preformence it is better to init the params (StereoSGBMParams) in the
initialization list.
Alexander Alekhin [Wed, 10 Mar 2021 17:40:36 +0000 (17:40 +0000)]
Merge pull request #19222 from YashasSamaga:cuda4dnn-fix-build-diagnostics
Orest Chura [Wed, 10 Mar 2021 17:37:55 +0000 (20:37 +0300)]
Merge pull request #19542 from OrestChura:oc/BGSub_ptest
[G-API]: Performance tests for BackgroundSubtractor
* Perf.Tests for BackgroundSubtractor kernel
* Fix CI
* Addressing comments
* Addressing a comment
* Test cycle and validation changes
* Addressing comment
* Added assert
Alexander Alekhin [Wed, 10 Mar 2021 17:36:57 +0000 (17:36 +0000)]
Merge pull request #19613 from WeiChungChang:NMS_refine
Maxim Pashchenkov [Wed, 10 Mar 2021 16:06:46 +0000 (19:06 +0300)]
Merge pull request #18240 from mpashchenkov:mp/ocv-gapi-input-cnn-reshape
[G-API]: Adding reshape for CNN input.
* Added CNN input IE reshape
* rbs
* Added unordered_set instead vector
* Alignment
Qoo [Wed, 24 Feb 2021 09:32:45 +0000 (04:32 -0500)]
boost NMS performance
Alexey Smirnov [Wed, 10 Mar 2021 15:58:34 +0000 (18:58 +0300)]
Merge pull request #19617 from smirnov-alexey:as/extend_kernel_package_api
G-API: Extend GKernelPackage and serialization API
* Extend GKernelPackage API
* Adding tests
* Extend serialization API
* Address review comments
Alexander Alekhin [Tue, 9 Mar 2021 18:14:41 +0000 (18:14 +0000)]
Merge pull request #19692 from seiko2plus:issue_19647
Amir Tulegenov [Tue, 9 Mar 2021 17:51:40 +0000 (23:51 +0600)]
Merge pull request #19619 from amirtu:OCV-221_get_and_set_cameras_on_stitcher
* Get and set cameras for sticher.
* Code review fixes.
Co-authored-by: amir.tulegenov <amir.tulegenov@xperience.ai>
Co-authored-by: Alexander Smorkalov <alexander.smorkalov@xperience.ai>
Sayed Adel [Mon, 8 Mar 2021 19:13:12 +0000 (19:13 +0000)]
core:ppc64 fix the build with the newer versions of Eigen on IBM/Power
It also fixes the build when universal intrinsics is disabled
via `-DDCV_ENABLE_INTRINSICS=OFF`.
Daniel Playfair Cal [Tue, 9 Mar 2021 15:09:08 +0000 (02:09 +1100)]
Merge pull request #19690 from hedgepigdaniel:fix/calibration_fisheye
* fix(samples/camera_calibration): set new camera matrix for fisheye
* fix(camera_calibration): ignore inapplicable flags for fisheye
Alexander Alekhin [Tue, 9 Mar 2021 15:06:43 +0000 (15:06 +0000)]
Merge pull request #19688 from alalek:videoio_docs_hwaccel
Alexander Alekhin [Tue, 9 Mar 2021 09:43:52 +0000 (09:43 +0000)]
Merge pull request #19675 from asmorkalov:as/pylint_warnings
Alexander Smorkalov [Thu, 4 Mar 2021 14:05:15 +0000 (17:05 +0300)]
Removed unused variables found by pylint.
Dan Ben-Yosef [Sun, 7 Mar 2021 17:06:08 +0000 (19:06 +0200)]
Merge pull request #19685 from danbey:setting_stereoBMImpl_in_init_list
Init params (StereoBMParams) in StereoBMImpl constructor initialization list
* Init StereoBMImpl in initialization list
To improve preformence it is better to init the params (StereoBMImpl) in the
initialization list.
* coding style
* drop useless copy/move ctor
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Sun, 7 Mar 2021 16:23:24 +0000 (16:23 +0000)]
Merge pull request #19687 from alalek:videoio_docs_fixes_3.4
Alexander Alekhin [Sun, 7 Mar 2021 04:19:26 +0000 (04:19 +0000)]
videoio(doc): add 'videoio_hwaccel' group, fix typos
Alexander Alekhin [Sun, 7 Mar 2021 04:26:49 +0000 (04:26 +0000)]
videoio(docs): fixes
Alexander Alekhin [Sat, 6 Mar 2021 17:29:12 +0000 (17:29 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Vitaly Tuzov [Sat, 6 Mar 2021 17:22:21 +0000 (20:22 +0300)]
Merge pull request #19622 from terfendail:ref_doc
* Updated cpp reference implementations for a few intrinsics to address wide universal intrinsics as well
* Updated cpp reference implementations for a few more universal intrinsics
Alexander Alekhin [Sat, 6 Mar 2021 17:21:34 +0000 (17:21 +0000)]
Merge pull request #19641 from LupusSanctus:am/tf_reshape
Alexander Alekhin [Sat, 6 Mar 2021 17:20:02 +0000 (17:20 +0000)]
Merge pull request #19680 from alalek:cmake_update_python_linters
YashasSamaga [Sat, 6 Mar 2021 13:33:03 +0000 (19:03 +0530)]
fix checkVersions()
Alexander Alekhin [Fri, 5 Mar 2021 15:12:20 +0000 (15:12 +0000)]
Merge pull request #19671 from SamFC10:sam-darknet
cyy [Fri, 5 Mar 2021 15:04:51 +0000 (23:04 +0800)]
Merge pull request #19565 from cyyever:minor_fix
Local objects optimization in calibration init
* use emplace_back
* use {} initilization
* remove a tailing white space
Mradul Agrawal [Fri, 5 Mar 2021 13:55:52 +0000 (19:25 +0530)]
Merge pull request #19583 from theroyalpekka:patch-1
* Update polynom_solver.cpp
This pull request is in the response to Issue #19526. I have fixed the problem with the cube root calculation of 2*R. The Issue was in the usage of pow function with negative values of R, but if it is calculated for only positive values of R then changing x0 according to the parity of R, the Issue is resolved. Kindly consider it, Thanks!
* add cv::cubeRoot(double)
Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
Alexander Alekhin [Fri, 5 Mar 2021 13:54:31 +0000 (16:54 +0300)]
Merge pull request #19655 from raaldrid:EXR_rw_alpha_support_16115
Alexander Alekhin [Fri, 5 Mar 2021 12:54:51 +0000 (12:54 +0000)]
cmake: update Python linters handling
- exclude from getBuildInformation()
- fix pylint version
Alexander Alekhin [Fri, 5 Mar 2021 08:40:26 +0000 (08:40 +0000)]
Merge pull request #19677 from APrigarina:detection_fix
Anastasia Murzova [Sun, 28 Feb 2021 16:55:43 +0000 (19:55 +0300)]
Aligned TF Reshape layer behaviour
APrigarina [Thu, 4 Mar 2021 11:04:50 +0000 (14:04 +0300)]
fix false positive detection
Alexander Smorkalov [Thu, 4 Mar 2021 16:17:57 +0000 (19:17 +0300)]
Merge pull request #19668 from asmorkalov:as/filesystem_py
* Add Python Bindings for getCacheDirectory function
* Added getCacheDirectory interop test with image codecs.
Co-authored-by: Sergey Slashchinin <sergei.slashchinin@xperience.ai>
Alexander Alekhin [Thu, 4 Mar 2021 14:52:20 +0000 (14:52 +0000)]
Merge pull request #19674 from l-bat:lb/fix_ie_tests
Liubov Batanina [Thu, 4 Mar 2021 10:05:01 +0000 (13:05 +0300)]
Determine layout
Alexander Alekhin [Wed, 3 Mar 2021 21:10:57 +0000 (21:10 +0000)]
Merge pull request #19607 from alalek:backport_19606
SamFC10 [Wed, 3 Mar 2021 17:12:47 +0000 (22:42 +0530)]
Added Spatial Attention Module in Darknet Importer
Alexander Smorkalov [Wed, 3 Mar 2021 14:06:59 +0000 (17:06 +0300)]
Merge pull request #19539 from asmorkalov:as/calib_fix_focal_length
* Added CALIB_FIX_FOCAL_LENGTH to fisheye calibration #13450
Sometimes you want to calibrate just the principal point of a camera, or just the distortion coefficients. In this case, you can pass the CALIB_FIX_FOCAL_LENGTH flag to keep Fx and Fy
* Added test for CALIB_FIX_FOCAL_LENGTH option in fisheye callinration.
Alexander Alekhin [Wed, 3 Mar 2021 13:06:44 +0000 (13:06 +0000)]
Merge pull request #19666 from alalek:update_ffmpeg_4.x
Alexander Alekhin [Wed, 3 Mar 2021 12:26:54 +0000 (12:26 +0000)]
Merge pull request #19669 from alalek:fix_static_analyzer_issues_4.x
Alexander Alekhin [Wed, 3 Mar 2021 00:53:46 +0000 (00:53 +0000)]
ffmpeg/4.x: update FFmpeg wrapper 2021.03
- FFmpeg 4.3.2
Alexander Alekhin [Wed, 3 Mar 2021 11:22:56 +0000 (11:22 +0000)]
Merge pull request #19665 from alalek:update_ffmpeg_3.4
Alexander Alekhin [Wed, 3 Mar 2021 11:08:55 +0000 (11:08 +0000)]
Merge pull request #19667 from alalek:hotfix_ffmpeg_hw_accel
Alexander Alekhin [Wed, 3 Mar 2021 09:10:00 +0000 (09:10 +0000)]
static analyzer issues
Alexander Alekhin [Wed, 3 Mar 2021 08:41:30 +0000 (08:41 +0000)]
videoio(ffmpeg): fix VIDEO_ACCELERATION_ANY handling
- default is VIDEO_ACCELERATION_NONE
Alexander Alekhin [Wed, 3 Mar 2021 00:26:37 +0000 (00:26 +0000)]
Merge pull request #19657 from alalek:update_version_4.5.2-pre
Alexander Alekhin [Tue, 2 Mar 2021 23:56:27 +0000 (23:56 +0000)]
ffmpeg/3.4: update FFmpeg wrapper 2021.03
- FFmpeg 3.4.8
Alexander Alekhin [Tue, 23 Feb 2021 00:22:06 +0000 (00:22 +0000)]
core: rework code locality
- to reduce binaries size of FFmpeg Windows wrapper
- MinGW linker doesn't support -ffunction-sections (used for FFmpeg Windows wrapper)
- move code to improve locality with its used dependencies
- move UMat::dot() to matmul.dispatch.cpp (Mat::dot() is already there)
- move UMat::inv() to lapack.cpp
- move UMat::mul() to arithm.cpp
- move UMat:eye() to matrix_operations.cpp (near setIdentity() implementation)
- move normalize(): convert_scale.cpp => norm.cpp
- move convertAndUnrollScalar(): arithm.cpp => copy.cpp
- move scalarToRawData(): array.cpp => copy.cpp
- move transpose(): matrix_operations.cpp => matrix_transform.cpp
- move flip(), rotate(): copy.cpp => matrix_transform.cpp (rotate90 uses flip and transpose)
- add 'OPENCV_CORE_EXCLUDE_C_API' CMake variable to exclude compilation of C-API functions from the core module
- matrix_wrap.cpp: add compile-time checks for CUDA/OpenGL calls
- the steps above allow to reduce FFmpeg wrapper size for ~1.5Mb (initial size of OpenCV part is about 3Mb)
backport is done to improve merge experience (less conflicts)
backport of commit:
65eb9467567598c08049bb190a4f3d3cbfabdcd0
Alexander Alekhin [Mon, 1 Mar 2021 21:45:26 +0000 (21:45 +0000)]
pre: OpenCV 4.5.2 (version++)
Alexander Alekhin [Tue, 2 Mar 2021 23:20:44 +0000 (23:20 +0000)]
Merge pull request #19606 from alalek:reduce_ffmpeg_wrapper_size_4.x
Alexander Alekhin [Tue, 2 Mar 2021 21:46:30 +0000 (21:46 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 2 Mar 2021 21:44:19 +0000 (21:44 +0000)]
Merge pull request #19656 from alalek:update_version_3.4.14-pre