Alexander Alekhin [Sat, 5 Mar 2022 19:41:20 +0000 (19:41 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Sergey Ivanov [Sat, 5 Mar 2022 10:50:40 +0000 (13:50 +0300)]
Merge pull request #21658 from sivanov-work:vpp_core_add_roi
G-API: Add ROI processing in VPP preproc
* Add ROI in VPP prepro
* Apply comments
Alexander Alekhin [Fri, 4 Mar 2022 09:50:29 +0000 (09:50 +0000)]
Merge pull request #21674 from jeremyephron:patch-1
Alexander Alekhin [Thu, 3 Mar 2022 08:46:46 +0000 (08:46 +0000)]
Merge pull request #21676 from masa-iwm:fix-convertFromD3D11Texture2D
masa-iwm [Wed, 2 Mar 2022 22:21:53 +0000 (07:21 +0900)]
bugfix convertFromD3D11Texture2D
Jeremy Ephron [Wed, 2 Mar 2022 19:01:53 +0000 (11:01 -0800)]
Update stitching_detailed.py
### Critical bugs fixed:
- `seam_finder.find()` returns None and overwrites `masks_warped`
- `indices` is only 1-dimensional
### Nice-to-have bugs fixed:
- avoid invalid value in sqrt and subsequent runtime warning
- avoid printing help string on each run (use argparse builtin behavior)
### New features:
- added graphcut seam finder support
### Test Summary:
Tested on Ubuntu 20.04 with python 3.8.10 and opencv-python-contrib 4.5.5.62
Alexander Alekhin [Wed, 2 Mar 2022 18:44:00 +0000 (18:44 +0000)]
Merge pull request #21488 from VadimLevin:dev/vlevin/scope-for-classes
Anna Khakimova [Wed, 2 Mar 2022 13:36:16 +0000 (16:36 +0300)]
Merge pull request #21530 from anna-khakimova:ak/simd_divrc
* GAPI Fluid: SIMD for DivRC kernel.
* Fluid: Div kernel's SIMD refactoring
* SIMD for DivRC 3 channel case
* Applied comments
Vadim Levin [Thu, 20 Jan 2022 12:21:47 +0000 (15:21 +0300)]
feature: submodule or a class scope for exported classes
All classes are registered in the scope that corresponds to C++
namespace or exported class.
Example:
`cv::ml::Boost` is exported as `cv.ml.Boost`
`cv::SimpleBlobDetector::Params` is exported as
`cv.SimpleBlobDetector.Params`
For backward compatibility all classes are registered in the global
module with their mangling name containing scope information.
Example:
`cv::ml::Boost` has `cv.ml_Boost` alias to `cv.ml.Boost` type
Pierre Chatelier [Tue, 1 Mar 2022 16:55:00 +0000 (17:55 +0100)]
Merge pull request #21645 from chacha21:applyColorMap_8UC1_optimized
Optimize cv::applyColorMap() for simple case
* Optimize cv::applyColorMap() for simple case
PR for 21640
For regular cv::Mat CV_8UC1 src, applying the colormap is simpler than calling the cv::LUT() mechanism.
* add support for src as CV_8UC3
src as CV_8UC3 is handled with a BGR2GRAY conversion, the same optimized code being used afterwards
* code style
rely on cv::Mat.ptr() to index data
* Move new implementation to ColorMap::operator()
Changes as suggested by reviewer
* style
improvements suggsted by reviewer
* typo
* tune parallel work
* better usage of parallel_for_
use nstripes parameter of parallel_for_
assume _lut is continuous to bring faster pixel indexing
optimize src/dst access by contiguous rows of pixels
do not locally copy the LUT any more, it is no more relevant with the new optimizations
Alexander Alekhin [Mon, 28 Feb 2022 22:38:24 +0000 (22:38 +0000)]
Merge pull request #21542 from rogday:split_expand
Sinitsina Maria [Mon, 28 Feb 2022 15:23:00 +0000 (18:23 +0300)]
Merge pull request #21458 from SinM9:speech_recognition_cpp
AudioIO: add dnn speech recognition sample on C++
* add speech recognition cpp
* fix warnings
* fixes
* fix warning
* microphone fix
Egor Smirnov [Thu, 17 Feb 2022 17:30:44 +0000 (20:30 +0300)]
fix slice and expand
Tatsuro Shibamura [Sat, 26 Feb 2022 17:35:03 +0000 (02:35 +0900)]
Merge pull request #21630 from shibayan:arm64-msvc-neon
* Added NEON support in builds for Windows on ARM
* Fixed `HAVE_CPU_NEON_SUPPORT` display broken during compiler test
* Fixed a build error prior to Visual Studio 2022
Vadim Levin [Thu, 24 Feb 2022 22:17:43 +0000 (01:17 +0300)]
Merge pull request #21553 from VadimLevin:dev/vlevin/scope-for-classes-4x-port
4.x: submodule or a class scope for exported classes
* feature: submodule or a class scope for exported classes
All classes are registered in the scope that corresponds to C++
namespace or exported class.
Example:
`cv::ml::Boost` is exported as `cv.ml.Boost`
`cv::SimpleBlobDetector::Params` is exported as
`cv.SimpleBlobDetector.Params`
For backward compatibility all classes are registered in the global
module with their mangling name containing scope information.
Example:
`cv::ml::Boost` has `cv.ml_Boost` alias to `cv.ml.Boost` type
* refactor: remove redundant GAPI aliases
* fix: use explicit string literals in CVPY_TYPE macro
* fix: add handling for class aliases
Alexander Alekhin [Thu, 24 Feb 2022 12:08:55 +0000 (12:08 +0000)]
Merge pull request #21625 from hanliutong:rvv1p0
Sergey Ivanov [Thu, 24 Feb 2022 10:35:52 +0000 (13:35 +0300)]
Merge pull request #21618 from sivanov-work:vpp_preproc_core
G-API: Add VPL/VPP preproc core module
* Add BaseMediAdapter for VPL
* Add PreprocSession & PreprocEngine interface part
* Implement preproc UT, Fix base path
* Add common PP interface, add common pp_params
* Rough decoupling VPL & Preproc
* Add syntax sugar for PP interface
* Integrate VPP preproc in GIEbackend
* Add PP bypass
* Add perf tests for PP
* Fix warning in vpl core UT
* Add inner preproc resolution Unit Test
* Remove VPP preproc description from single ROI sample
* Apply SetROIBlob for diferent Infer operations
* Eliminate extra branch-lines for cfg_param_parser & transcode_engine
* Fix UT warning &PreprocSession compile
* Fix compilation & warnings
* Reduce Session&Engine code amount
* Apply some comments
* Revert IE changes, rename preproc
* Fix for DX11 infer for OV: turn off texture array
* Remove dependency PP on IE
* Change fixture tests params
* Apply other comments & turn off ROI for GPU
* Fix compilation: remove forgotten INFER define
* Apply debt comments
* Fix PP UTs: add FrameInfo value comparator
* Fix style
* Remove standalone map for preproc frames storage
* Add other comments
Alexander Alekhin [Tue, 22 Feb 2022 19:23:32 +0000 (19:23 +0000)]
Merge pull request #21613 from YusukeKameda:patch-1
Alexander Alekhin [Mon, 21 Feb 2022 22:17:16 +0000 (22:17 +0000)]
Merge pull request #21534 from alexgiving:atrutnev/simd_for_merge4
Aleksei Trutnev [Mon, 7 Feb 2022 09:54:50 +0000 (12:54 +0300)]
enable dynamic dispatching for merge4
Alexander Alekhin [Mon, 21 Feb 2022 16:34:10 +0000 (16:34 +0000)]
Merge pull request #21646 from zchrissirhcz:seamless_cloning-remove-const
Yuantao Feng [Mon, 21 Feb 2022 13:49:07 +0000 (21:49 +0800)]
Merge pull request #21607 from fengyuentau:fix_FaceDetectorYN_dynamic_shape
Use YuNet of fixed input shape to fix not-supported-dynamic-zero-shape for FaceDetectorYN
* use yunet with input of fixed shape
* update yunet used in face recognition regression
Zhuo Zhang [Mon, 21 Feb 2022 12:39:41 +0000 (20:39 +0800)]
remove const in seamless_cloding APIs for better semantics
Alexander Alekhin [Sat, 19 Feb 2022 21:04:35 +0000 (21:04 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 19 Feb 2022 20:58:57 +0000 (20:58 +0000)]
Merge pull request #21639 from georgthegreat:patch-1
Alexander Alekhin [Sat, 19 Feb 2022 20:58:35 +0000 (20:58 +0000)]
Merge pull request #21598 from KaurkerDevourer:patch-1
KaurkerDevourer [Fri, 11 Feb 2022 11:38:48 +0000 (14:38 +0300)]
Fix DpSeamFinder::hasOnlyOneNeighbor
std::lower_bound is linear for set
https://en.cppreference.com/w/cpp/algorithm/lower_bound
Artem Saratovtsev [Fri, 18 Feb 2022 14:58:58 +0000 (17:58 +0300)]
Merge pull request #21635 from DumDereDum:issue_21595_3.4
Issue 21595 fix 3.4 branch
* bug fix; add test
* rewrite tests avoiding vector in tests
Yuriy Chernyshov [Fri, 18 Feb 2022 14:57:46 +0000 (17:57 +0300)]
Аix -Winvalid-noreturn under clang-cl
Alexander Alekhin [Thu, 17 Feb 2022 12:16:06 +0000 (12:16 +0000)]
Merge pull request #21628 from anna-khakimova:ak/resize_fix_32bit_builds
Anna Khakimova [Wed, 16 Feb 2022 13:29:17 +0000 (16:29 +0300)]
GAPI Fluid: Fix for 32bit build issue.
Alexander Alekhin [Wed, 16 Feb 2022 18:37:15 +0000 (18:37 +0000)]
Merge pull request #21602 from paroj:hidpi
Alexander Alekhin [Wed, 16 Feb 2022 17:47:48 +0000 (17:47 +0000)]
Merge pull request #21626 from anna-khakimova:ak/workaround_for_16s
Alexander Alekhin [Wed, 16 Feb 2022 17:45:19 +0000 (17:45 +0000)]
Merge pull request #21529 from alexgiving:atrutnev/simd_for_merge3
Anna Khakimova [Wed, 16 Feb 2022 11:21:14 +0000 (14:21 +0300)]
GAPI Perf Tests:Workaround for the OpenCV's issue.
Alexander Alekhin [Wed, 16 Feb 2022 09:57:25 +0000 (09:57 +0000)]
Merge pull request #21612 from seanm:tsan-call-once
HAN Liutong [Wed, 16 Feb 2022 08:01:38 +0000 (16:01 +0800)]
Update clang toolchain for RVV.
Sean McBride [Mon, 14 Feb 2022 21:33:04 +0000 (16:33 -0500)]
Replaced incorrect double checked locking with a static
Thread Sanitizer identified an incorrect implementation of double checked locking.
Replaced it with a static, which therefore can only be created once.
Alexander Alekhin [Tue, 15 Feb 2022 18:19:51 +0000 (18:19 +0000)]
Merge pull request #21622 from alalek:imgcodecs_checks_3.4
Alexander Alekhin [Tue, 15 Feb 2022 11:48:09 +0000 (11:48 +0000)]
imgcodecs: add runtime checks to validate input
backport of commit:
f9b1dbe2ac3da4ed87647ea27d9060879acc20fe
Alexander Alekhin [Tue, 15 Feb 2022 16:30:47 +0000 (16:30 +0000)]
Merge pull request #21620 from alalek:imgcodecs_checks
Alexander Alekhin [Tue, 15 Feb 2022 15:31:23 +0000 (15:31 +0000)]
Merge pull request #21614 from alalek:fix_build_power8_vec_absd
Alexander Alekhin [Tue, 15 Feb 2022 13:11:59 +0000 (13:11 +0000)]
Merge pull request #21617 from mshabunin:disable-onnx-tests-34
Alexander Alekhin [Tue, 15 Feb 2022 11:48:09 +0000 (11:48 +0000)]
imgcodecs: add runtime checks to validate input
Maksim Shabunin [Tue, 8 Feb 2022 17:32:55 +0000 (20:32 +0300)]
Update filters in ONNX tests
Alexander Alekhin [Tue, 15 Feb 2022 04:23:32 +0000 (07:23 +0300)]
core(vsx): update vec_absd() workaround condition
Alexander Alekhin [Mon, 14 Feb 2022 15:53:24 +0000 (15:53 +0000)]
Merge pull request #21609 from mshabunin:disable-onnx-tests
Maksim Shabunin [Tue, 8 Feb 2022 17:32:55 +0000 (20:32 +0300)]
Update filters in ONNX tests
Alexander Alekhin [Mon, 14 Feb 2022 14:14:30 +0000 (14:14 +0000)]
Merge pull request #21606 from sturkmen72:hog_update
Yusuke Kameda [Mon, 14 Feb 2022 10:31:45 +0000 (19:31 +0900)]
Incorrect kernel matrix size when Scharr
Incorrect Mat size ksize==-1
Suleyman TURKMEN [Sun, 13 Feb 2022 08:18:30 +0000 (11:18 +0300)]
update HOGDescriptor documentation
Pavel Rojtberg [Sat, 12 Feb 2022 13:56:42 +0000 (14:56 +0100)]
highui: qt - enable hidpi by default
can be overriden by environment:
QT_AUTO_SCREEN_SCALE_FACTOR=0
Alexander Alekhin [Fri, 11 Feb 2022 17:32:37 +0000 (17:32 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 11 Feb 2022 16:46:55 +0000 (16:46 +0000)]
Merge pull request #21599 from alalek:winpack_dldt_force_cmake_config
Alexander Alekhin [Fri, 11 Feb 2022 12:13:09 +0000 (15:13 +0300)]
build(winpack_dldt): force using CMake config for InferenceEngine
Alexander Alekhin [Thu, 10 Feb 2022 21:47:30 +0000 (21:47 +0000)]
Merge pull request #21591 from alalek:dnn_drop_legacy_ie
cudawarped [Thu, 10 Feb 2022 16:45:34 +0000 (16:45 +0000)]
Merge pull request #21561 from cudawarped:ffmpeg_prefer_tcp_default
Default FFMPEG VideoCapture backend to rtsp_flags=prefer_tcp
* Make the VideoCapture ffmpeg backends default rtsp connection type prefer_tcp.
* Ensure that the ffmpeg version of avformat is checked.
Vincent Rabaud [Thu, 10 Feb 2022 16:44:14 +0000 (17:44 +0100)]
Merge pull request #21594 from vrabaud:3.4_msan
* Fix harmless MSAN error.
This is similar to https://github.com/opencv/opencv/pull/21527
A macro is also created to simplify the code.
* Declare fallback only once.
Alexander Alekhin [Wed, 9 Feb 2022 14:25:08 +0000 (14:25 +0000)]
dnn: drop legacy Inference Engine NN builder API
Alexander Alekhin [Wed, 9 Feb 2022 18:49:41 +0000 (18:49 +0000)]
Merge pull request #21590 from berak:patch-1
Alexander Alekhin [Wed, 9 Feb 2022 18:49:24 +0000 (18:49 +0000)]
Merge pull request #21582 from gfiumara:3.4
Sergey Ivanov [Wed, 9 Feb 2022 18:48:06 +0000 (21:48 +0300)]
Merge pull request #21567 from sivanov-work:gapi_streaming_fix
G-API: Fix streaming hangs for ConstSource & Improve troubleshooting logger messages
Greg Fiumara [Tue, 8 Feb 2022 21:21:53 +0000 (16:21 -0500)]
Fix cv::FileStorage::Mode::Memory doxygen layout
Anatoliy Talamanov [Wed, 9 Feb 2022 16:52:23 +0000 (19:52 +0300)]
Merge pull request #21579 from TolyaTalamanov:at/handle-errors-in-iebackend
[G-API] Handle errors in IEBackend & modeling tool
* Handle errors in IEBackend & modeling tool
* Handle exceptions in callback
* Add const cv to exception
berak [Wed, 9 Feb 2022 16:14:05 +0000 (17:14 +0100)]
Update text_detection.py
there is a recent change, how `std::vector<int>` is wrapped in python,
it used to be a 2d array (requirig that weird `[0]` indexing), now it is only 1d
Dmitry Budnikov [Tue, 8 Feb 2022 13:51:53 +0000 (16:51 +0300)]
Merge pull request #21560 from dbudniko:dbudniko/gapi_media_format_gray_plus_gst_source
G-API gst source gray support
Alexander Alekhin [Tue, 8 Feb 2022 13:30:29 +0000 (13:30 +0000)]
Merge pull request #21577 from sturkmen72:upd_floodfill
Suleyman TURKMEN [Tue, 8 Feb 2022 05:37:04 +0000 (08:37 +0300)]
fix cv::floodfill() for calling it with an empty mask
Alexander Alekhin [Mon, 7 Feb 2022 17:55:12 +0000 (17:55 +0000)]
Merge pull request #21573 from lamm45:lineiterator-doc
Anatoliy Talamanov [Mon, 7 Feb 2022 16:48:43 +0000 (19:48 +0300)]
Merge pull request #21566 from TolyaTalamanov:at/gapi-modeling-tool_fix_handling_fp16_precision
[G-API] Pipeline modeling tool - Fix generating FP16 Mat
* Fix handling fp16 precision
* Disable preproc in case FP16 input inside IE backend
* Fix isApplicableForResize function
lamm45 [Sun, 6 Feb 2022 23:42:26 +0000 (18:42 -0500)]
Update LineIterator documentation
Alexander Alekhin [Sun, 6 Feb 2022 16:10:43 +0000 (16:10 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sun, 6 Feb 2022 16:06:23 +0000 (16:06 +0000)]
Merge pull request #21564 from alalek:dnn_fix_openvino_outputs
Alexander Alekhin [Sun, 6 Feb 2022 16:04:38 +0000 (16:04 +0000)]
Merge pull request #21569 from alalek:fixup_18031
Alexander Alekhin [Sat, 5 Feb 2022 16:16:45 +0000 (16:16 +0000)]
dnn(ngraph): fix output names
Alexander Alekhin [Sat, 5 Feb 2022 02:51:44 +0000 (02:51 +0000)]
dnn(ngraph): fix outputs handling, drop 'unconnected' logic
Alexander Alekhin [Sat, 5 Feb 2022 14:36:57 +0000 (14:36 +0000)]
dnn(ngraph): add debuging messages
Alexander Alekhin [Thu, 3 Feb 2022 20:23:17 +0000 (20:23 +0000)]
dnn: don't fuse 'outputs' with OpenVINO backend
Alexander Alekhin [Sat, 5 Feb 2022 03:31:39 +0000 (03:31 +0000)]
dnn(test): re-enable ONNX split tests for OpenVINO
Alexander Alekhin [Sat, 5 Feb 2022 03:28:36 +0000 (03:28 +0000)]
dnn(ngraph): fixup get_output_as_single_output_node() replacement patch
Alexander Alekhin [Thu, 3 Feb 2022 19:18:26 +0000 (19:18 +0000)]
Merge pull request #21562 from alalek:cmake_carotene_use_cv_disable_optimization
Alexander Alekhin [Thu, 3 Feb 2022 17:25:52 +0000 (17:25 +0000)]
cmake(carotene): disable with CV_DISABLE_OPTIMIZATION
Alexander Alekhin [Thu, 3 Feb 2022 12:28:49 +0000 (12:28 +0000)]
Merge pull request #21555 from cudawarped:fix_gpumat_dataend_bug
Dmitry Budnikov [Thu, 3 Feb 2022 12:20:21 +0000 (15:20 +0300)]
Merge pull request #21511 from dbudniko:dbudniko/gapi_media_format_gray
G-API media format gray
Anna Khakimova [Wed, 2 Feb 2022 18:47:01 +0000 (21:47 +0300)]
Merge pull request #21474 from anna-khakimova:ak/simd_for_divc
GAPI Fluid: SIMD for DivC kernel.
* GAPI Fluid:SIMD for DivC
* Applied comment
Alexander Alekhin [Wed, 2 Feb 2022 18:04:50 +0000 (18:04 +0000)]
Merge pull request #21551 from alalek:cmake_dnn_backport_3.4
cudawarped [Wed, 2 Feb 2022 14:25:46 +0000 (14:25 +0000)]
Fix GpuMat to correctly calculate dataend when using GpuMat::create().
Add output to createMat() to be used by locateROI test cases.
Maksim Shabunin [Fri, 14 Jan 2022 21:53:19 +0000 (00:53 +0300)]
3.4: Use modern OpenVINO package interface
original commit:
437af37b1341e5cef90aa1a4ce60210feacc6c8a
Ilya Lavrenov [Thu, 9 Sep 2021 07:56:34 +0000 (10:56 +0300)]
3.4: Support of OpenVINO interface libraries
original commit:
c703f1eed6c3da4f14b37cc151e03463bb4ff54f
Alexander Alekhin [Tue, 1 Feb 2022 18:59:59 +0000 (18:59 +0000)]
Merge pull request #21452 from mshabunin:ov-pkg
Alexander Alekhin [Tue, 1 Feb 2022 17:01:36 +0000 (17:01 +0000)]
Merge pull request #21547 from mshabunin:plugin-link
Alexander Alekhin [Tue, 1 Feb 2022 17:01:16 +0000 (17:01 +0000)]
Merge pull request #21538 from edman007:fixup-21536
Lukas-Alexander Weber [Tue, 1 Feb 2022 16:56:44 +0000 (17:56 +0100)]
Merge pull request #21420 from lukasalexanderweber:4.x
Introduce Cropping to OpenCV Stitching Tool
* Introduced Cropping
* integrate https://github.com/opencv/opencv/pull/21413/
* fixed failing subsetter tests
* updated stuff
Maksim Shabunin [Fri, 14 Jan 2022 21:53:19 +0000 (00:53 +0300)]
Use modern OpenVINO package interface
Aleksei Trutnev [Thu, 27 Jan 2022 13:12:53 +0000 (16:12 +0300)]
Enable dynamic dispatching for Merge3
Anatoliy Talamanov [Tue, 1 Feb 2022 13:32:56 +0000 (16:32 +0300)]
Merge pull request #21477 from TolyaTalamanov:at/pipeline-builder-tool
[G-API] Implement G-API pipeline modeling tool
* Implement G-API pipeline builder tool
* Remove whitespaces from config
* Remove unused unittest stuff
* Fix comments to review
* Fix MAC warning
* Rename to pipeline_modeling_tool
* Move to opencv apps
* Move config to gapi/samples/data
* gapi: samples sources are installed automatically
Maksim Shabunin [Fri, 13 Aug 2021 11:20:32 +0000 (14:20 +0300)]
Option to enable/disable plugin linking with OpenCV
Ed Martin [Sat, 29 Jan 2022 04:01:03 +0000 (23:01 -0500)]
Fallback to vaCreateImage + vaPutImage/vaGetImage when vaDeriveImage fails
Per intel docs for libva, when vaDeriveImage fails vaCreateImage +
vaPutImage should be tried. This is important as mesa with AMD HW
will always fail because the image is interlaced so a indirect
method must be used to get the surface to/from and image
Fixes https://github.com/opencv/opencv/issues/21536
Harvey [Mon, 31 Jan 2022 17:54:27 +0000 (01:54 +0800)]
Merge pull request #21428 from Harvey-Huang:TIFF
TiffEncoder write support more depth type
* TiffEncoder write support more depth type
* testing code
* update testing code
* add fallthrough
Alexander Alekhin [Mon, 31 Jan 2022 17:51:23 +0000 (17:51 +0000)]
Merge pull request #21508 from tailsu:sd/fix-zlib-png-android