platform/upstream/opencv.git
2 years agoFluid: SIMD multiply kernel
Anna Khakimova [Tue, 9 Nov 2021 09:44:11 +0000 (12:44 +0300)]
Fluid: SIMD multiply kernel

2 years agoMerge pull request #20914 from anna-khakimova:ak/simd_div
Anna Khakimova [Mon, 15 Nov 2021 17:16:25 +0000 (20:16 +0300)]
Merge pull request #20914 from anna-khakimova:ak/simd_div

GAPI Fluid: SIMD Div kernel.

* HAL implementation for Div kernel

* Removed dbg lines

* Applied comments.

* Reworked

* Final version

2 years agoMerge pull request #20918 from TolyaTalamanov:at/fix-empty-map-importNetwork
Anatoliy Talamanov [Mon, 15 Nov 2021 17:11:53 +0000 (20:11 +0300)]
Merge pull request #20918 from TolyaTalamanov:at/fix-empty-map-importNetwork

[G-API] Fix bugs in GIEBackend

* Remove inputs/outputs map from IEUnit

* Add test

* Add NV12 test

* Reorganize setBlob function

* Check that backend don't overwrite blob precision

* Stop setting config to global IE::Core

* Replace mutable to const_cast

* Update modules/gapi/test/infer/gapi_infer_ie_test.cpp

* Update modules/gapi/test/infer/gapi_infer_ie_test.cpp

* Make blob parameter as const ref

* Cosmetic fixes

* Fix failed test on inferROI

* Removed double ref for ii

* Disable tests

* Skip tests if device not available

* Use Sync prim under shared_ptr to avoid issue on MAC

* Apply WA for IE::Core

* Apply WA for MAC build

* Try to apply another WA

* Not release IE::Core for apple

* Put comment

* Support PreprocInfo for

* InferROI
* InferList
* InferList2

* Remove empty line

* Fix alignment

Co-authored-by: Maxim Pashchenkov <maxim.pashchenkov@intel.com>
2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 13 Nov 2021 15:11:30 +0000 (15:11 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge pull request #21039 from SegaraRai:use-pragma-message
Alexander Alekhin [Fri, 12 Nov 2021 14:31:03 +0000 (14:31 +0000)]
Merge pull request #21039 from SegaraRai:use-pragma-message

2 years agoMerge pull request #20857 from alexgiving:atrutnev/move_API_samples
Trutnev Aleksei [Fri, 12 Nov 2021 14:17:21 +0000 (17:17 +0300)]
Merge pull request #20857 from alexgiving:atrutnev/move_API_samples

Move API sample code to tutorial_code location

2 years agoMerge pull request #21048 from ffontaine:4.x
Alexander Alekhin [Fri, 12 Nov 2021 12:28:28 +0000 (12:28 +0000)]
Merge pull request #21048 from ffontaine:4.x

2 years agomodules/videoio/src/cap_ffmpeg_impl.hpp: fix build with gcc 4.8
Fabrice Fontaine [Fri, 12 Nov 2021 08:50:17 +0000 (09:50 +0100)]
modules/videoio/src/cap_ffmpeg_impl.hpp: fix build with gcc 4.8

Fix the following build failure with gcc 4.8:

In file included from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/cap_ffmpeg_impl.hpp:100:0,
                 from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/cap_ffmpeg.cpp:50:
/home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/cap_ffmpeg_hw.hpp: In constructor 'HWAccelIterator::HWAccelIterator(cv::VideoAccelerationType, bool, AVDictionary*)':
/home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/cap_ffmpeg_hw.hpp:939:23: error: use of deleted function 'std::basic_istringstream<char>& std::basic_istringstream<char>::operator=(const std::basic_istringstream<char>&)'
             s_stream_ = std::istringstream(accel_list);
                       ^
In file included from /home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/arm-none-linux-gnueabi/include/c++/4.8.3/complex:45:0,
                 from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/core/include/opencv2/core/cvstd.inl.hpp:47,
                 from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/core/include/opencv2/core.hpp:3306,
                 from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/include/opencv2/videoio.hpp:46,
                 from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/precomp.hpp:57,
                 from /home/buildroot/autobuild/instance-3/output-1/build/opencv4-4.5.4/modules/videoio/src/cap_ffmpeg.cpp:42:
/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/arm-none-linux-gnueabi/include/c++/4.8.3/sstream:272:11: note: 'std::basic_istringstream<char>& std::basic_istringstream<char>::operator=(const std::basic_istringstream<char>&)' is implicitly deleted because the default definition would be ill-formed:
     class basic_istringstream : public basic_istream<_CharT, _Traits>
           ^
/home/buildroot/autobuild/instance-3/output-1/host/opt/ext-toolchain/arm-none-linux-gnueabi/include/c++/4.8.3/sstream:272:11: error: use of deleted function 'std::basic_istream<char>& std::basic_istream<char>::operator=(const std::basic_istream<char>&)'

Fixes:
 - http://autobuild.buildroot.org/results/60f8846b435dafda0ced412d59ffe15bdff0810d

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
2 years agoMerge pull request #21025 from alalek:issue_21004
Alexander Alekhin [Thu, 11 Nov 2021 22:54:07 +0000 (01:54 +0300)]
Merge pull request #21025 from alalek:issue_21004

* dnn(ocl4dnn): fix LRN layer accuracy problems

- FP16 intermediate computation is not accurate and may provide NaN values

* dnn(test): update tolerance for FP16

2 years agoMerge pull request #21028 from AleksandrPanov:fix_markers_parse_in_gen_pattern.py
Alexander Alekhin [Thu, 11 Nov 2021 22:11:33 +0000 (22:11 +0000)]
Merge pull request #21028 from AleksandrPanov:fix_markers_parse_in_gen_pattern.py

2 years agoMerge pull request #20977 from JulieBar:remap_overflow
Alexander Alekhin [Thu, 11 Nov 2021 22:06:15 +0000 (22:06 +0000)]
Merge pull request #20977 from JulieBar:remap_overflow

2 years agoMerge pull request #21040 from alexgiving:atrutnev/rename_RMatAdapter
Trutnev Aleksei [Thu, 11 Nov 2021 11:52:38 +0000 (14:52 +0300)]
Merge pull request #21040 from alexgiving:atrutnev/rename_RMatAdapter

GAPI: Rename MatAdapter to RMatOnMat

2 years agoMerge pull request #21030 from tv3141:fix_seg_fault_houghlinespointset
tv3141 [Wed, 10 Nov 2021 19:15:38 +0000 (20:15 +0100)]
Merge pull request #21030 from tv3141:fix_seg_fault_houghlinespointset

Fix seg fault houghlinespointset

* Clarify parameter doc for HoughLinesPointSet

* Fix seg fault.

* Add regression test.

* Fix latex typo

2 years agouse `#pragma message` instead of `#warning` for non-GCC compilers
SegaraRai [Wed, 10 Nov 2021 18:14:19 +0000 (03:14 +0900)]
use `#pragma message` instead of `#warning` for non-GCC compilers

2 years agoMerge pull request #20870 from pkubaj:master
Alexander Alekhin [Wed, 10 Nov 2021 16:08:20 +0000 (16:08 +0000)]
Merge pull request #20870 from pkubaj:master

2 years agoAdd support for runtime CPU feature check on POWER on FreeBSD.
Piotr Kubaj [Wed, 13 Oct 2021 16:19:57 +0000 (18:19 +0200)]
Add support for runtime CPU feature check on POWER on FreeBSD.

1. Code uses PPC_FEATURE_HAS_VSX, but it's not checked similarly to
PPC_FEATURE2_ARCH_3_00 and PPC_FEATURE2_ARCH_3_00 for availability. FreeBSD has
those macros in machine/cpu.h, but I went with the way chosen for
PPC_FEATURE2_ARCH_3_00 and PPC_FEATURE2_ARCH_3_00. Other than that, FreeBSD also
has sys/auxv.h and that's where elf_aux_info() is defined.
2. getauxval() is actually Linux-only, but code checked for __unix__. It won't
work on all UNIX, so change it back to __linux__. Add another code variant
strictly for FreeBSD.
3. Update comment. This commit adds code for FreeBSD, but recently there
appeared support for powerpc64 in OpenBSD.

2 years agoMerge pull request #20901 from sivanov-work:merge_source_unite_perf_mod
Sergey Ivanov [Wed, 10 Nov 2021 13:21:51 +0000 (16:21 +0300)]
Merge pull request #20901 from sivanov-work:merge_source_unite_perf_mod

 G-API: oneVPL - Performance: Add async decode pipeline & add cached pool

* Add async decode pipeline & intro cached pool

* Fix performacne test with checking OPENCV_EXTRA

* Add sip perf test with no VPL

* Fix misprint

* Remove empty line..

* Apply some comments

* Apply some comments

* Make perf test fail if no OPENCV_TEST_DATA_PATH declared

2 years agoMerge pull request #20664 from anna-khakimova:ak/resize_simd
Anna Khakimova [Wed, 10 Nov 2021 13:19:52 +0000 (16:19 +0300)]
Merge pull request #20664 from anna-khakimova:ak/resize_simd

Fluid: SIMD for Resize Linear 8UC3

* SIMD for fluid::Resize 8U3C

* Rework horizontal pass + add 8U4C case

* Reproduce stackoverflow test

* StackOverflow test

* SSE42 impl

* SSE42 impl improvement

* GAPI:SSE42 simd opt for Resize 8UC3. Final version

* Fix tests

* Conditional compilation fix

* Applied comments

* Applied comments. Step2

* Applied comments. Step2

2 years agoMerge pull request #20998 from alalek:update_protobuf_3.19.1
Alexander Alekhin [Wed, 10 Nov 2021 12:03:45 +0000 (15:03 +0300)]
Merge pull request #20998 from alalek:update_protobuf_3.19.1

3rdparty(protobuf): upgrade 3.5.2 => 3.19.1

* 3rdparty(protobuf): upgrade 3.5.2 => 3.19.1

* dnn: update protobuf files (3.19.1)

* 3rdparty(protobuf): re-apply OpenCV patch for custom fields (3.19.1)

* protobuf: suppress new build warnings

* protobuf: remove unused files

2 years agofix markers parse in gen_pattern.py
AleksandrPanov [Wed, 10 Nov 2021 08:14:06 +0000 (11:14 +0300)]
fix markers parse in gen_pattern.py

2 years agoMerge pull request #20904 from Crayon-new:fix_bug_in_maxLayer
ZaKiiiiiiiii [Tue, 9 Nov 2021 16:24:04 +0000 (00:24 +0800)]
Merge pull request #20904 from Crayon-new:fix_bug_in_maxLayer

fix bug: wrong output dimension when "keep_dims" is false in pooling layer.

* fix bug in max layer

* code align

* delete permute layer and add test case

* add name assert

* check other cases

* remove c++11 features

* style:add "const" remove assert

* style:sanitize file names

2 years agoMerge pull request #21027 from anonymouss:4.x
Alexander Alekhin [Tue, 9 Nov 2021 15:12:35 +0000 (15:12 +0000)]
Merge pull request #21027 from anonymouss:4.x

2 years agovideoio: drop unnecessary offset for accessing video output buffer
jcong [Tue, 9 Nov 2021 09:23:34 +0000 (17:23 +0800)]
videoio: drop unnecessary offset for accessing video output buffer

Fix: #21021

NDK API AMediaCodec_getOutputBuffer() returns MediaCodecBuffer::data()
which is actually ABuffer::data(). The returned buffer address is already
adjusted by offset.

More info:
    ABuffer::base() returns base address without offset
    ABuffer::data() returns base + offset

Change-Id: I2936339ce4fa9acf657a5a7d92adc1275d7b28a1

2 years agoMerge pull request #21020 from lukasalexanderweber:squash
Lukas-Alexander Weber [Mon, 8 Nov 2021 11:54:06 +0000 (12:54 +0100)]
Merge pull request #21020 from lukasalexanderweber:squash

Created Stitching Tool based on stitching_detailed.py

2 years agoMerge pull request #21016 from alalek:issue_21002
Alexander Alekhin [Sat, 6 Nov 2021 22:12:39 +0000 (22:12 +0000)]
Merge pull request #21016 from alalek:issue_21002

2 years agohighgui(win32): fix trackbar setRange
Alexander Alekhin [Sat, 6 Nov 2021 15:16:42 +0000 (18:16 +0300)]
highgui(win32): fix trackbar setRange

2 years agoMerge pull request #21005 from nikpappas:bug-samples-falsecolor-trackbar
Alexander Alekhin [Sat, 6 Nov 2021 14:19:57 +0000 (14:19 +0000)]
Merge pull request #21005 from nikpappas:bug-samples-falsecolor-trackbar

2 years agoFix trackbar in falsecolor cpp sample
Nikolaos Pappas [Wed, 3 Nov 2021 22:13:30 +0000 (22:13 +0000)]
Fix trackbar in falsecolor cpp sample

2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Fri, 5 Nov 2021 09:27:46 +0000 (09:27 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge pull request #21011 from vrabaud:3.4
Alexander Alekhin [Fri, 5 Nov 2021 09:25:50 +0000 (09:25 +0000)]
Merge pull request #21011 from vrabaud:3.4

2 years agoOnly use fma functions when CV_FMA3 is set.
Vincent Rabaud [Thu, 4 Nov 2021 21:48:10 +0000 (22:48 +0100)]
Only use fma functions when CV_FMA3 is set.

In practice, processors offering AVX2/AVX512 also FMA, that is why it got unnoticed.

2 years agoMerge pull request #21009 from alalek:dnn_skip_tests_32bit
Alexander Alekhin [Thu, 4 Nov 2021 18:15:50 +0000 (18:15 +0000)]
Merge pull request #21009 from alalek:dnn_skip_tests_32bit

2 years agodnn(test): skip tests with high memory usage
Alexander Alekhin [Thu, 4 Nov 2021 13:26:33 +0000 (13:26 +0000)]
dnn(test): skip tests with high memory usage

- 32-bit configuration may fail due to memory fragmentation

2 years agoMerge pull request #21007 from alalek:cmake_dnn_fix_wrong_tengine_order
Alexander Alekhin [Thu, 4 Nov 2021 12:28:27 +0000 (12:28 +0000)]
Merge pull request #21007 from alalek:cmake_dnn_fix_wrong_tengine_order

2 years agodnn(cmake): don't hijack OpenCL options with Tengine
Alexander Alekhin [Thu, 4 Nov 2021 09:59:19 +0000 (09:59 +0000)]
dnn(cmake): don't hijack OpenCL options with Tengine

2 years agoMerge pull request #21003 from APrigarina:add_test_qrdetect_fix
Alexander Alekhin [Wed, 3 Nov 2021 22:32:00 +0000 (22:32 +0000)]
Merge pull request #21003 from APrigarina:add_test_qrdetect_fix

2 years agoMerge pull request #20882 from flytogcp:flytogcp-patch-1
Alexander Alekhin [Wed, 3 Nov 2021 20:30:24 +0000 (20:30 +0000)]
Merge pull request #20882 from flytogcp:flytogcp-patch-1

2 years agoadd test case for QR detect fix
APrigarina [Wed, 3 Nov 2021 17:04:27 +0000 (20:04 +0300)]
add test case for QR detect fix

2 years agoMerge pull request #20990 from alalek:fix_warnings_msvc_clang_dshow_3.4
Alexander Alekhin [Wed, 3 Nov 2021 19:51:31 +0000 (19:51 +0000)]
Merge pull request #20990 from alalek:fix_warnings_msvc_clang_dshow_3.4

2 years agoUpdate qrcode.cpp
cpengu [Fri, 15 Oct 2021 03:11:35 +0000 (11:11 +0800)]
Update qrcode.cpp

Fixed issue #20880, QRDetect::searchHorizontalLines() boundary condition will skip the matched qrcode near the end

2 years agoMerge pull request #20999 from alalek:dnn_replace_deprecated_calls
Alexander Alekhin [Wed, 3 Nov 2021 15:59:36 +0000 (18:59 +0300)]
Merge pull request #20999 from alalek:dnn_replace_deprecated_calls

dnn(protobuf): replace deprecated calls

* dnn: replace deprecated ByteSize() => ByteSizeLong()

* dnn: replace deprecated calls, use GetRepeatedFieldRef

2 years agoMerge pull request #20970 from s-trinh:update_Bayer_naming
Alexander Alekhin [Tue, 2 Nov 2021 20:41:17 +0000 (20:41 +0000)]
Merge pull request #20970 from s-trinh:update_Bayer_naming

2 years agovideoio(dshow): eliminate build warnings from MSVC-Clang
Alexander Alekhin [Tue, 2 Nov 2021 19:22:47 +0000 (19:22 +0000)]
videoio(dshow): eliminate build warnings from MSVC-Clang

2 years agoAdd conventional Bayer naming.
Souriya Trinh [Thu, 28 Oct 2021 21:46:13 +0000 (23:46 +0200)]
Add conventional Bayer naming.

2 years agoMerge pull request #20836 from alexgiving:atrutnev/rename_Adapter_to_IAdapter
Trutnev Aleksei [Mon, 1 Nov 2021 12:43:27 +0000 (15:43 +0300)]
Merge pull request #20836 from alexgiving:atrutnev/rename_Adapter_to_IAdapter

* Rename RMat::Adapter to RMat::IAdapter

* Add comments

2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 30 Oct 2021 14:26:17 +0000 (14:26 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge pull request #20982 from alalek:highgui_drop_cvGetWindowImageRect_4.x
Alexander Alekhin [Sat, 30 Oct 2021 14:01:33 +0000 (14:01 +0000)]
Merge pull request #20982 from alalek:highgui_drop_cvGetWindowImageRect_4.x

2 years agoMerge pull request #20980 from alalek:highgui_fix_cvGetWindowImageRect_3.4
Alexander Alekhin [Sat, 30 Oct 2021 13:59:08 +0000 (13:59 +0000)]
Merge pull request #20980 from alalek:highgui_fix_cvGetWindowImageRect_3.4

2 years agohighgui: drop invalid cvGetWindowImageRect
Alexander Alekhin [Sat, 30 Oct 2021 10:57:47 +0000 (10:57 +0000)]
highgui: drop invalid cvGetWindowImageRect

2 years agohighgui: drop invalid cvGetWindowImageRect
Alexander Alekhin [Sat, 30 Oct 2021 10:51:52 +0000 (10:51 +0000)]
highgui: drop invalid cvGetWindowImageRect

- return type is C++ template
- removal from 'extern "C"' scope broke ABI anyway, so this symbols is removed completelly

2 years agoMerge pull request #20976 from alalek:issue_20968
Alexander Alekhin [Sat, 30 Oct 2021 10:27:32 +0000 (10:27 +0000)]
Merge pull request #20976 from alalek:issue_20968

2 years agopython: properly handle step for multichannel case
Alexander Alekhin [Fri, 29 Oct 2021 16:08:57 +0000 (16:08 +0000)]
python: properly handle step for multichannel case

2 years agoMerge pull request #20971 from alalek:cmake_build_type_use_release
Alexander Alekhin [Fri, 29 Oct 2021 17:45:09 +0000 (17:45 +0000)]
Merge pull request #20971 from alalek:cmake_build_type_use_release

2 years agoAdded overflow handling during conversion from float to int for LinearFilter
Julie Bareeva [Fri, 29 Oct 2021 16:46:11 +0000 (19:46 +0300)]
Added overflow handling during conversion from float to int for LinearFilter

2 years agoMerge pull request #20922 from alexgiving:atrutnev/align_expect_assert_macros
Trutnev Aleksei [Fri, 29 Oct 2021 16:30:35 +0000 (19:30 +0300)]
Merge pull request #20922 from alexgiving:atrutnev/align_expect_assert_macros

GAPI: Align EXPECT/ASSERT macros

* Align TEST macros

* restart CI

* Fix ASSERT_GT in gapi_async_test

2 years agoMerge pull request #20972 from Isydmr:correct-db-text-detector-drive-links
Alexander Alekhin [Fri, 29 Oct 2021 15:19:34 +0000 (15:19 +0000)]
Merge pull request #20972 from Isydmr:correct-db-text-detector-drive-links

2 years agocmake: use CMAKE_BUILD_TYPE=Release by default
Alexander Alekhin [Thu, 28 Oct 2021 23:02:32 +0000 (02:02 +0300)]
cmake: use CMAKE_BUILD_TYPE=Release by default

2 years agoCorrect drive links for DB_IC15 and DB_TD500
Ihsan Soydemir [Fri, 29 Oct 2021 10:30:51 +0000 (13:30 +0300)]
Correct drive links for DB_IC15 and DB_TD500

2 years agoMerge pull request #20969 from alalek:fix_msvc_clang_warning_noreturn
Alexander Alekhin [Thu, 28 Oct 2021 23:00:48 +0000 (23:00 +0000)]
Merge pull request #20969 from alalek:fix_msvc_clang_warning_noreturn

2 years agoMerge pull request #20967 from alalek:fix_msvc_clang_unused_parameter
Alexander Alekhin [Thu, 28 Oct 2021 22:27:41 +0000 (22:27 +0000)]
Merge pull request #20967 from alalek:fix_msvc_clang_unused_parameter

2 years agocore: eliminate Winvalid-noreturn in base.hpp
Alexander Alekhin [Thu, 28 Oct 2021 21:32:47 +0000 (21:32 +0000)]
core: eliminate Winvalid-noreturn in base.hpp

2 years agobuild: fix MSVC-Clang warnings about unused parameters in stubs
Alexander Alekhin [Thu, 28 Oct 2021 21:08:36 +0000 (21:08 +0000)]
build: fix MSVC-Clang warnings about unused parameters in stubs

2 years agoMerge pull request #20937 from mpashchenkov:mp/ocv-gapi-warnings
Maxim Pashchenkov [Thu, 28 Oct 2021 18:19:46 +0000 (21:19 +0300)]
Merge pull request #20937 from mpashchenkov:mp/ocv-gapi-warnings

G-API: Disable Windows warnings with 4996 code

* Windows warnings 4503 and 4996 are disabled with dnn style

* Applying comments to review

* Reproducing

* Added check MSVC_VERSION for both warnings

2 years agoMerge pull request #20961 from alalek:fix_msvc_clang
Alexander Alekhin [Thu, 28 Oct 2021 13:54:23 +0000 (13:54 +0000)]
Merge pull request #20961 from alalek:fix_msvc_clang

2 years agoMerge pull request #20960 from alalek:fix_icc_support_3.4
Alexander Alekhin [Thu, 28 Oct 2021 13:54:07 +0000 (13:54 +0000)]
Merge pull request #20960 from alalek:fix_icc_support_3.4

2 years agocore(simd): fix compilation with MSVC-Clang
Alexander Alekhin [Thu, 28 Oct 2021 11:25:00 +0000 (11:25 +0000)]
core(simd): fix compilation with MSVC-Clang

2 years agobuild(icc): fix nodiscard attribute handling
Alexander Alekhin [Thu, 28 Oct 2021 05:49:05 +0000 (05:49 +0000)]
build(icc): fix nodiscard attribute handling

2 years agocmake: fix popcnt detection with Intel Compiler
Alexander Alekhin [Thu, 28 Oct 2021 05:20:23 +0000 (05:20 +0000)]
cmake: fix popcnt detection with Intel Compiler

2 years agoMerge pull request #20950 from Harvey-Huang:master
Alexander Alekhin [Wed, 27 Oct 2021 20:09:51 +0000 (20:09 +0000)]
Merge pull request #20950 from Harvey-Huang:master

2 years agoMerge pull request #20958 from noahstier:3.4_tvl1_optimization
Alexander Alekhin [Wed, 27 Oct 2021 19:59:57 +0000 (19:59 +0000)]
Merge pull request #20958 from noahstier:3.4_tvl1_optimization

2 years agoMerge pull request #20954 from shengyu7697:remove-redundant-semicolon
Alexander Alekhin [Wed, 27 Oct 2021 19:31:27 +0000 (19:31 +0000)]
Merge pull request #20954 from shengyu7697:remove-redundant-semicolon

2 years agotvl1 cuda optflow optimization
Noah Stier [Wed, 27 Oct 2021 19:01:53 +0000 (12:01 -0700)]
tvl1 cuda optflow optimization

2 years agoMerge pull request #20935 from crywang:dnn_face
Chengrui Wang [Wed, 27 Oct 2021 12:23:42 +0000 (20:23 +0800)]
Merge pull request #20935 from crywang:dnn_face

Fix problems in tutorial and python sample of dnn_face.

* Update dnn_face.markdown

* Update face_match.py

2 years agoremove redundant semicolons
shengyu [Wed, 27 Oct 2021 12:19:05 +0000 (20:19 +0800)]
remove redundant semicolons

2 years agoMerge pull request #20924 from alexgiving:atrutnev/fix_gkernel_documentation
Alexander Alekhin [Wed, 27 Oct 2021 09:17:15 +0000 (09:17 +0000)]
Merge pull request #20924 from alexgiving:atrutnev/fix_gkernel_documentation

2 years agofixed bug: opencv read tif file convert Palette color image as grayscale image
Harvey [Wed, 27 Oct 2021 05:52:54 +0000 (13:52 +0800)]
fixed bug: opencv read tif file convert Palette color image as grayscale image

2 years agoMerge pull request #20947 from alalek:cmake_find_package_quiet
Alexander Alekhin [Tue, 26 Oct 2021 16:04:17 +0000 (16:04 +0000)]
Merge pull request #20947 from alalek:cmake_find_package_quiet

2 years agoMerge pull request #20942 from MaximMilashchenko:AudioPatch
MaximMilashchenko [Tue, 26 Oct 2021 14:33:53 +0000 (17:33 +0300)]
Merge pull request #20942 from MaximMilashchenko:AudioPatch

Audio patch

* fixed microphone, audio position

* fixed docs

* changed AudioOpenCheck

2 years agocmake: find_package with QUIET
Alexander Alekhin [Tue, 26 Oct 2021 14:29:57 +0000 (14:29 +0000)]
cmake: find_package with QUIET

2 years agoMerge pull request #20940 from alalek:cmake_fix_samples_parallel_backend
Alexander Alekhin [Mon, 25 Oct 2021 18:17:13 +0000 (18:17 +0000)]
Merge pull request #20940 from alalek:cmake_fix_samples_parallel_backend

2 years agosamples: update parallel_backend examples
Alexander Alekhin [Mon, 18 Oct 2021 20:48:24 +0000 (20:48 +0000)]
samples: update parallel_backend examples

- use find_package(TBB)

2 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 23 Oct 2021 15:33:31 +0000 (15:33 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

2 years agoMerge pull request #20919 from berak:patch-1
Alexander Alekhin [Fri, 22 Oct 2021 14:08:08 +0000 (14:08 +0000)]
Merge pull request #20919 from berak:patch-1

2 years agoMerge pull request #20875 from Harvey-Huang:master
Harvey [Fri, 22 Oct 2021 14:04:19 +0000 (22:04 +0800)]
Merge pull request #20875 from Harvey-Huang:master

* bmp specified BI_BITFIELDS should take care RGBA bit mask

* change the name

* support xrgb bmp file

* support xrgb bmp file(add test case)

* update testing code

2 years agoresolves #20913
berak [Thu, 21 Oct 2021 09:38:17 +0000 (11:38 +0200)]
resolves #20913

imgproc: remove asserts for circles_ in HoughCircles

2 years agofix gkernel Doxygen documentation
atrutnev [Fri, 22 Oct 2021 08:06:09 +0000 (11:06 +0300)]
fix gkernel Doxygen documentation

2 years agoMerge pull request #20912 from AleksandrPanov:fix_findMinEnclosingTriangle
Alexander Alekhin [Thu, 21 Oct 2021 16:26:53 +0000 (16:26 +0000)]
Merge pull request #20912 from AleksandrPanov:fix_findMinEnclosingTriangle

2 years agoMerge pull request #20921 from sivanov-work:atl_patch
Sergey Ivanov [Thu, 21 Oct 2021 16:12:03 +0000 (19:12 +0300)]
Merge pull request #20921 from sivanov-work:atl_patch

G-API: FIX OpenVINO build - Add CComPtr RAII replacement into G-API sample

* Add CComPtr RAII replacement into G-API sample

* Remove completely `atlbase.h'

2 years agofix findMinEnclosingTriangle and add tests
AleksandrPanov [Thu, 21 Oct 2021 15:12:51 +0000 (18:12 +0300)]
fix findMinEnclosingTriangle and add tests

2 years agoMerge pull request #20614 from mshabunin:use-onevpl-load
Maksim Shabunin [Thu, 21 Oct 2021 13:56:11 +0000 (16:56 +0300)]
Merge pull request #20614 from mshabunin:use-onevpl-load

videoio: use oneVPL load mechanism, encoder bitrate estimation

* videoio: updated oneVPL support - use mfxLoad

* videoio: advanced bitrate estimation for MFX encoder

* videoio: improved MediaSDK/oneVPL/libva detection

* videoio(ffmpeg): don't try oneVPL

* videoio(test): tune checks of videoio_mfx.read_write_raw tests

Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2 years agoMerge pull request #20903 from alalek:samples_fix_nothreads_build
Alexander Alekhin [Thu, 21 Oct 2021 13:04:01 +0000 (13:04 +0000)]
Merge pull request #20903 from alalek:samples_fix_nothreads_build

2 years agoMerge pull request #20906 from alalek:backport_20903
Alexander Alekhin [Thu, 21 Oct 2021 13:03:46 +0000 (13:03 +0000)]
Merge pull request #20906 from alalek:backport_20903

2 years agoMerge pull request #20916 from Harvey-Huang:32bit_rgb
Alexander Alekhin [Thu, 21 Oct 2021 11:45:48 +0000 (11:45 +0000)]
Merge pull request #20916 from Harvey-Huang:32bit_rgb

2 years agoMerge pull request #20920 from alalek:hotfix_clang_abi
Alexander Alekhin [Thu, 21 Oct 2021 11:35:57 +0000 (11:35 +0000)]
Merge pull request #20920 from alalek:hotfix_clang_abi

2 years agohotfix: repair Clang ABI
Alexander Alekhin [Thu, 21 Oct 2021 09:36:25 +0000 (09:36 +0000)]
hotfix: repair Clang ABI

2 years ago32bit rgb bmp file should not copy data as rgba
Harvey [Thu, 21 Oct 2021 08:47:27 +0000 (16:47 +0800)]
32bit rgb bmp file should not copy data as rgba

2 years agoMerge pull request #20908 from alalek:4.x_drop_legacy
Alexander Alekhin [Thu, 21 Oct 2021 07:09:14 +0000 (07:09 +0000)]
Merge pull request #20908 from alalek:4.x_drop_legacy

2 years agoMerge pull request #20877 from rogday:simple_layers
Alexander Alekhin [Wed, 20 Oct 2021 17:00:38 +0000 (17:00 +0000)]
Merge pull request #20877 from rogday:simple_layers

2 years agoMerge pull request #19721 from MaximMilashchenko:Audio
MaximMilashchenko [Wed, 20 Oct 2021 13:18:24 +0000 (16:18 +0300)]
Merge pull request #19721 from MaximMilashchenko:Audio

add audio support in cap_msmf

* audio msmf

* fixed warnings

* minor fix

* fixed SampleTime MSMF

* minor fix, fixed audio test, retrieveAudioFrame

* fixed warnings

* impelemented sync audio and video stream with start offset

* fixed error

* fixed docs

* fixed audio sample

* CAP_PROP_AUDIO_POS, minor fixed

* fixed warnings

* videoio(MSMF): update audio test checks, add debug logging

* fixed

* fixed desynchronization of time positions, warnings

* fixed warnings

* videoio(audio): tune tests checks

* videoio(audio): update properties description

* build warnings

Co-authored-by: Alexander Alekhin <alexander.a.alekhin@gmail.com>
2 years agoMerge pull request #20910 from lukasalexanderweber:sift_fix
Alexander Alekhin [Wed, 20 Oct 2021 09:48:20 +0000 (09:48 +0000)]
Merge pull request #20910 from lukasalexanderweber:sift_fix