Dmitry Matveev [Tue, 10 Dec 2019 10:31:43 +0000 (13:31 +0300)]
Merge pull request #16081 from dmatveev:dm/ocv42_gapi_bugfixes
G-API: Fix various issues for 4.2 release
* G-API: Fix issues reported by Coverity
- Fixed: passing values by value instead of passing by reference
* G-API: Fix redundant std::move()'s in return statements
Fixes #15903
* G-API: Added a smarter handling of Stop messages in the pipeline
- This should fix the "expected 100, got 99 frames" problem
- Fixes #15882
* G-API: Pass enum instead of GKernelPackage in Streaming test parameters
- Likely fixes #15836
* G-API: Address review issues in new bugfix comments
Dmitry Matveev [Mon, 9 Dec 2019 21:30:10 +0000 (00:30 +0300)]
Merge pull request #16039 from dmatveev:dm/gapi_tutorial_interactive_face_detection
* G-API-NG/Docs: Added a tutorial page on interactive face detection sample
- Introduced a "--ser" option to run the pipeline serially for
benchmarking purposes
- Reorganized sample code to better fit the documentation;
- Fixed a couple of issues (mainly typos) in the public headers
* G-API-NG/Docs: Reflected meta-less compilation in new G-API tutorial
* G-API-NG/Docs: Addressed review comments on Face Analytics Pipeline example
Yashas Samaga B L [Mon, 9 Dec 2019 19:26:58 +0000 (00:56 +0530)]
Merge pull request #16069 from YashasSamaga:cuda4dnn-crop_and_resize
add CropAndResize layer for CUDA backend
* add CropAndResize layer
* process multiple channels per iteration
Alexander Alekhin [Mon, 9 Dec 2019 14:34:48 +0000 (14:34 +0000)]
Merge pull request #16096 from YashasSamaga:cuda4dnn-region-optimize
Yashas Samaga B L [Mon, 9 Dec 2019 14:31:27 +0000 (20:01 +0530)]
Merge pull request #16097 from YashasSamaga:cuda4dnn-optimize-resize-bilinear
cuda4dnn(resize): process multiple channels each iteration
* resize bilinear: process multiple chans. per iter.
* remove unused headers
* correct dispatch logic
* resize_nn: process multiple chans. per iter.
Alexander Alekhin [Mon, 9 Dec 2019 14:15:38 +0000 (14:15 +0000)]
Merge pull request #16103 from alalek:videoio_ffmpeg_wrapper_version_check
Alexander Alekhin [Mon, 9 Dec 2019 11:06:36 +0000 (14:06 +0300)]
videoio(plugins): relax version check for FFmpeg wrapper on Windows
Yashas [Sun, 8 Dec 2019 15:33:30 +0000 (21:03 +0530)]
optimize region kernels
Alexander Alekhin [Sat, 7 Dec 2019 22:33:11 +0000 (22:33 +0000)]
Merge pull request #16084 from alalek:issue_15784
Alexander Alekhin [Fri, 6 Dec 2019 18:33:55 +0000 (18:33 +0000)]
Merge pull request #16087 from YashasSamaga:cuda4dnn-eltwise-div
YashasSamaga [Fri, 6 Dec 2019 15:58:36 +0000 (21:28 +0530)]
add DIV support to EltwiseOp
Alexander Alekhin [Fri, 6 Dec 2019 13:36:42 +0000 (16:36 +0300)]
gapi: update CMakeLists.txt, fix TBB dependency handling
Dmitry Matveev [Fri, 6 Dec 2019 12:36:02 +0000 (15:36 +0300)]
Merge pull request #16050 from dmatveev:dm/ocv42_gapi_doc_fixup
* G-API: Addressed various documentation issues
- Fixed various typos and missing references;
- Added brief documentaion on G_TYPED_KERNEL and G_COMPOUND_KERNEL macros;
- Briefly described GComputationT<>;
- Briefly described G-API data objects (in a group section).
* G-API: Some clean-ups in doxygen, also a chapter on Render API
* G-API: Expose more graph compilation arguments in the documentation
* G-API: Address documentation review comments
Alexander Alekhin [Fri, 6 Dec 2019 12:31:30 +0000 (12:31 +0000)]
Merge pull request #16077 from dmatveev:dm/gapi_narg_combine
Alexander Alekhin [Fri, 6 Dec 2019 11:26:11 +0000 (11:26 +0000)]
Merge pull request #16078 from alalek:update_version_4.2.0-pre
Alexander Alekhin [Fri, 6 Dec 2019 09:58:57 +0000 (12:58 +0300)]
pre: OpenCV 4.2.0 (version++)
Dmitry Matveev [Fri, 6 Dec 2019 07:43:02 +0000 (10:43 +0300)]
G-API: Added an arbitrary-argument version of cv::gapi::combine
- Now user doesn't need to do `combine(x, combine(y, combine(z, zz)))` but
just `combine(x, y, z, zz)`
Alexander Alekhin [Thu, 5 Dec 2019 14:29:22 +0000 (17:29 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Thu, 5 Dec 2019 14:23:48 +0000 (14:23 +0000)]
Merge pull request #16024 from alalek:issue_15953
Alexander Alekhin [Thu, 5 Dec 2019 12:36:39 +0000 (15:36 +0300)]
Merge pull request #16052 from alalek:issue_16040
* calib3d: use normalized input in solvePnPGeneric()
* calib3d: java regression test for solvePnPGeneric
* calib3d: python regression test for solvePnPGeneric
Alexander Alekhin [Thu, 5 Dec 2019 11:48:18 +0000 (14:48 +0300)]
Merge pull request #16046 from alalek:issue_15990
* core: disable invalid constructors in C API by default
- C API objects will lose their default initializers through constructors
* samples: stop using of C API
Alexander Alekhin [Thu, 5 Dec 2019 09:56:00 +0000 (09:56 +0000)]
Merge pull request #16036 from dkurt:dnn_backport_15203
Alexander Alekhin [Thu, 5 Dec 2019 09:52:03 +0000 (09:52 +0000)]
Merge pull request #16014 from dkurt:dnn_ie_pooling_with_indices
Alexander Alekhin [Thu, 5 Dec 2019 07:54:17 +0000 (07:54 +0000)]
Merge pull request #16055 from alalek:issue_16041
Alexander Alekhin [Wed, 4 Dec 2019 19:13:22 +0000 (19:13 +0000)]
Merge pull request #16061 from alalek:bindings_parser_support_simple_if
Dmitry Kurtaev [Wed, 27 Nov 2019 16:37:56 +0000 (19:37 +0300)]
Enable MaxPooling with indices in Inference Engine
cudawarped [Wed, 4 Dec 2019 15:57:58 +0000 (15:57 +0000)]
Merge pull request #15957 from cudawarped:fix_cudacodec_python
Fix cudacodec python
* Add python bindings to cudacodec.
* Allow args with CV_OUT GpuMat& or CV_OUT cuda::GpuMat& to generate python bindings that allow the argument to be an optional output in the same way as OutputArray.
* Add wrapper flag to indicate that an OutputArray is a GpuMat.
* python: drop CV_GPU, extra checks in test
* Remove "cuda::GpuMat" check rom python parser
Alexander Alekhin [Wed, 4 Dec 2019 15:50:06 +0000 (15:50 +0000)]
Merge pull request #16045 from YashasSamaga:cuda4dnn-hotfix-log1p-expm1
Alexander Alekhin [Wed, 4 Dec 2019 15:49:46 +0000 (15:49 +0000)]
Merge pull request #16037 from alalek:dnn_test_fix_skip_vulkan
Alexander Alekhin [Wed, 4 Dec 2019 14:29:05 +0000 (17:29 +0300)]
bindings: basic support for #if preprocessor directives
- #if 0
- #ifdef __OPENCV_BUILD
Alexander Alekhin [Wed, 4 Dec 2019 06:18:36 +0000 (06:18 +0000)]
core(tls): unblock TlsAbstraction destructor call
- required to unregister callbacks from system
Alexander Alekhin [Tue, 3 Dec 2019 20:09:21 +0000 (20:09 +0000)]
Merge pull request #15972 from TolyaTalamanov:at/ftext-primitive
Pinaev Danil [Tue, 3 Dec 2019 16:14:13 +0000 (19:14 +0300)]
Merge pull request #16031 from aDanPin:dm/streaming_auto_meta
G-API-NG/Streaming: don't require explicit metadata in compileStreaming()
* First probably working version
Hardcode gose to setSource() :)
* Pre final version of move metadata declaration from compileStreaming() to setSource().
* G-API-NG/Streaming: recovered the existing Streaming functionality
- The auto-meta test is disabling since it crashes.
- Restored .gitignore
* G-API-NG/Streaming: Made the meta-less compileStreaming() work
- Works fine even with OpenCV backend;
- Fluid doesn't support such kind of compilation so far - to be fixed
* G-API-NG/Streaming: Fix Fluid to support meta-less compilation
- Introduced a notion of metadata-sensitive passes and slightly
refactored GCompiler and GFluidBackend to support that
- Fixed a TwoVideoSourcesFail test on streaming
* Add three smoke streaming tests to gapi_streaming_tests.
All three teste run pipeline with two different input sets
1) SmokeTest_Two_Const_Mats test run pipeline with two const Mats
2) SmokeTest_One_Video_One_Const_Scalar test run pipleline with Mat(video source) and const Scalar
3) SmokeTest_One_Video_One_Const_Vector test run pipeline with Mat(video source) and const Vector
# Please enter the commit message for your changes. Lines starting
* style fix
* Some review stuff
* Some review stuff
Alexander Alekhin [Tue, 3 Dec 2019 12:34:10 +0000 (12:34 +0000)]
Merge pull request #16028 from catree:improve_calib3d_doc
Talamanov, Anatoliy [Tue, 3 Dec 2019 10:13:06 +0000 (13:13 +0300)]
Implement cv::gapi::wip::draw::FText
YashasSamaga [Tue, 3 Dec 2019 09:55:35 +0000 (15:25 +0530)]
fix expm1 and log1p for __half/__half2
Alexander Alekhin [Mon, 2 Dec 2019 15:22:10 +0000 (18:22 +0300)]
dnn(test): fix Vulkan skip test tag
Dmitry Kurtaev [Mon, 2 Dec 2019 13:25:21 +0000 (16:25 +0300)]
Backport for dnn input shape estimation
Alexander Alekhin [Mon, 2 Dec 2019 13:18:07 +0000 (16:18 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Lubov Batanina [Mon, 2 Dec 2019 13:16:06 +0000 (16:16 +0300)]
Merge pull request #15537 from l-bat:ngraph
* Support nGraph
* Fix resize
catree [Mon, 2 Dec 2019 02:04:56 +0000 (03:04 +0100)]
Improve calib3d documentation:
- add reference to Rodrigues Jacobian
- add references to SE(3) and Lie Groups topics
- update some conventions and pinhole figure
Alexander Alekhin [Sun, 1 Dec 2019 21:07:26 +0000 (21:07 +0000)]
Merge pull request #16025 from dkurt:thebhatman/Mish_swish_3.4
Manjunath Bhat [Sun, 1 Dec 2019 21:06:17 +0000 (02:36 +0530)]
Merge pull request #15808 from thebhatman:Mish_swish
* Added Swish and Mish activations
* Fixed whitespace errors
* Kernel implementation done
* Added function for launching kernel
* Changed type of 1.0
* Attempt to add test for Swish and Mish
* Resolving type mismatch for log
* exp from device
* Use log1pexp instead of adding 1
* Added openCL kernels
thebhatman [Sun, 1 Dec 2019 08:00:58 +0000 (11:00 +0300)]
Port Swish and Mish layers
Alexander Alekhin [Sat, 30 Nov 2019 22:47:39 +0000 (22:47 +0000)]
calib3d: revert stereoRectify() changes from PRs: 6836, 6972, 6955
(1/4) Revert "Correct image borders and principal point computation in cv::stereoRectify"
This reverts commit
93ff1fb2f21a552c258fc2e9f7973f7d5b159cfc.
(2/4) Revert "fix calib3d changes in 6836 plus some others"
This reverts commit
fa42a1cfc2b0fce1d807f18f0ea26ba1e5753b80.
(3/4) Revert "fix compiler warning"
This reverts commit
b3d55489d3f1bd2eab0c1e3ad56d8f17d4f447e9.
(4/4) Revert "add test for 6836"
This reverts commit
d06b8c4ea9d30be7f60196cdf3c9a65f64370fa4.
Alexander Alekhin [Sat, 30 Nov 2019 20:20:56 +0000 (20:20 +0000)]
Merge pull request #16006 from sajarindider:typo
sajarindider [Thu, 21 Nov 2019 19:10:50 +0000 (14:10 -0500)]
fixed Scheimpflug typo
Alexander Alekhin [Fri, 29 Nov 2019 14:29:37 +0000 (17:29 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Vadim Levin [Fri, 29 Nov 2019 13:24:13 +0000 (16:24 +0300)]
Merge pull request #15955 from VadimLevin:dev/vlevin/generator_tests
Tests for argument conversion of Python bindings generator
* Tests for parsing elemental types from Python bindings
- Add positive and negative tests for int, float, double, size_t,
const char*, bool.
- Tests with wrong conversion behavior are skipped.
* Move implicit conversion of bool to integer/floating types to wrong
conversion behavior.
Alexander Alekhin [Fri, 29 Nov 2019 11:38:21 +0000 (11:38 +0000)]
Merge pull request #16017 from berak:fix_svm_train_auto
berak [Thu, 28 Nov 2019 19:33:58 +0000 (20:33 +0100)]
ml: fix check in SVM::trainAuto
Pinaev Danil [Thu, 28 Nov 2019 13:25:20 +0000 (16:25 +0300)]
Merge pull request #15695 from aDanPin:dp/incorrect_use_of_muve_fix
Fix incorrect use of std::move() in g-api perf tests
* First version
* Fix perfomace tests
Replace
c.apply(...);
with
cc = c.compile(...);
cc(...);
* Remove output meta arguments from .compile()
* Style fix
* Remove useless commented string
* Stick to common pattern : i.e. use gin() and gout() explicitly.
* Use cc(gin(...), gout(...)) in all cases.
Alexander Alekhin [Wed, 27 Nov 2019 19:23:27 +0000 (19:23 +0000)]
Merge pull request #15998 from alalek:ts_count_skip_exception
Alexander Alekhin [Wed, 27 Nov 2019 19:23:09 +0000 (19:23 +0000)]
Merge pull request #15994 from SSteve:affine_transform_docs
Alexander Alekhin [Wed, 27 Nov 2019 19:19:34 +0000 (19:19 +0000)]
Merge pull request #15839 from alalek:core_simd_v_setall_template
atalaman [Wed, 27 Nov 2019 15:21:00 +0000 (18:21 +0300)]
Merge pull request #15869 from TolyaTalamanov:at/plaidml-backend
G-API: Implement PlaidML2 backend
* PlaidML backend init version
* Add test
* Support multiply inputs/outputs in PlaidML2 backend
* Fix comment to review
* Add HAVE_PLAIDML macros
* Move plaidml tests to separate file
* Fix comment to review
* Fix cmake warning
* Fix comments to review
* Fix typos
overload -> overflow
* Fix comments to review
* Clean up
* Remove spaces from cmake scripts
* Disable tests with bitwise operations
* Use plaidml::exec::Binder
Dmitry Matveev [Wed, 27 Nov 2019 14:54:17 +0000 (17:54 +0300)]
Merge pull request #15753 from dmatveev:dm/ng-5000-security_barrier-interactive_face
G-API: Introduced Security Barrier & Interactive Face Detection samples
* G-API-NG/Samples: Added samples & relevant changes
- Security barrier camera sample
- Age/Gender/Emotions recognition sample
- GIEBackend now loads CPU extension libraries
- A couple of API-level workarounds added to deal with cv::Mat/Blob conversions
* G-API-NG/Samples: removed HAVE_INF_ENGINE remnants
Alexander Alekhin [Tue, 26 Nov 2019 18:35:28 +0000 (18:35 +0000)]
Merge pull request #16001 from alalek:backport_15995
Alexander Alekhin [Tue, 26 Nov 2019 15:52:04 +0000 (15:52 +0000)]
Merge pull request #15995 from bwignall:typo
Alexander Alekhin [Tue, 26 Nov 2019 15:48:22 +0000 (15:48 +0000)]
Merge pull request #15991 from collinbrake:feature_grammar_fixes_8
Brian Wignall [Tue, 26 Nov 2019 00:55:07 +0000 (19:55 -0500)]
Fix some typos
Alexander Alekhin [Tue, 26 Nov 2019 11:01:18 +0000 (14:01 +0300)]
ts: count skipped tests via SkipTestException
- apply tag 'skip_other'
Brian Wignall [Tue, 26 Nov 2019 00:55:07 +0000 (19:55 -0500)]
Fix some typos
Steve Nicholson [Tue, 26 Nov 2019 00:31:03 +0000 (16:31 -0800)]
Rename parameter R to H in AffineWarper member declarations
Alexander Alekhin [Mon, 25 Nov 2019 20:04:47 +0000 (20:04 +0000)]
Merge pull request #15986 from dkurt:fix_15863
Alexander Alekhin [Mon, 25 Nov 2019 20:04:25 +0000 (20:04 +0000)]
Merge pull request #15978 from alalek:videoio_refactor_v4l
Maksim Shabunin [Mon, 25 Nov 2019 20:03:16 +0000 (20:03 +0000)]
Merge pull request #15959 from mshabunin:refactor-ml-tests
ml: refactored tests
* use parametrized tests where appropriate
* use stable theRNG in most tests
* use modern style with EXPECT_/ASSERT_ checks
Collin Brake [Mon, 25 Nov 2019 18:41:55 +0000 (13:41 -0500)]
grammar corrections
Dmitry Kurtaev [Sun, 24 Nov 2019 18:59:25 +0000 (21:59 +0300)]
Resolve https://github.com/opencv/opencv/issues/15863
Alexander Alekhin [Sun, 24 Nov 2019 09:39:48 +0000 (09:39 +0000)]
Merge pull request #15980 from SSteve:doxygen_links
Steve Nicholson [Sat, 23 Nov 2019 22:03:14 +0000 (14:03 -0800)]
Update links to Doxygen website
Alexander Alekhin [Sat, 23 Nov 2019 22:59:01 +0000 (22:59 +0000)]
Merge pull request #15975 from SSteve:ios_install
Steve Nicholson [Fri, 22 Nov 2019 23:38:53 +0000 (15:38 -0800)]
Update and add information to iOS build instructions.
Alexander Alekhin [Fri, 22 Nov 2019 21:03:52 +0000 (21:03 +0000)]
videoio(v4l2): use logging, update handling of EBUSY, device closing
- DEBUG logging compilation is enabled for all videoio backends
- eliminate output through perror(), stderr
Alexander Alekhin [Fri, 22 Nov 2019 22:47:13 +0000 (22:47 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Vadim Levin [Fri, 22 Nov 2019 22:10:16 +0000 (01:10 +0300)]
Merge pull request #15973 from VadimLevin:dev/vlevin/video_capture_inf_loop
* Fix infinite loop when trying to change state of the busy camera
- Add finite number of attempts in tryIoctl functions
10 by default.
* Introduced new flag for ioctl call to handle EBUSY
Alexander Alekhin [Fri, 22 Nov 2019 21:36:01 +0000 (21:36 +0000)]
Merge pull request #15971 from alalek:core_kmeans_handle_overflow
Natsu [Fri, 22 Nov 2019 15:42:25 +0000 (23:42 +0800)]
Merge pull request #15970 from akemimadoka:master
* Fix android armv7 c++_static init crash
* core: move initialization of 'ios_base::Init' for Android
Alexander Alekhin [Fri, 22 Nov 2019 10:52:28 +0000 (10:52 +0000)]
core(kmeans): bailout if can't select cluster center
Alexander Alekhin [Thu, 21 Nov 2019 17:36:10 +0000 (17:36 +0000)]
Merge pull request #15968 from alalek:fix_msa_build
Alexander Alekhin [Thu, 21 Nov 2019 15:59:41 +0000 (18:59 +0300)]
core: fix MSA build
Alexander Alekhin [Thu, 21 Nov 2019 13:04:09 +0000 (13:04 +0000)]
Merge pull request #15962 from alalek:dnn_fix_ie_opencvlayer
Alexander Alekhin [Wed, 20 Nov 2019 21:42:26 +0000 (21:42 +0000)]
dnn: fix registration of custom OpenCVLayer
- do not require extensions library
Alexander Alekhin [Wed, 20 Nov 2019 19:05:15 +0000 (19:05 +0000)]
Merge pull request #15951 from alalek:python_reduce_code_size
Alexander Alekhin [Wed, 20 Nov 2019 15:43:32 +0000 (15:43 +0000)]
Merge pull request #15956 from lorenzolightsgdwarf:dnn_fix_tf_ssd
Everton Constantino [Wed, 20 Nov 2019 10:41:07 +0000 (07:41 -0300)]
Merge pull request #15494 from everton1984:hal_vector_get_n
Improving VSX performance of integral function
* Adding support for vector get function on VSX datatypes so the
integral function gains a bit of performance.
* Removing get as a datatype member function and implementing a new HAL
instruction v_extract_n to get the n-th element of a vector register.
* Adding SSE/NEON/AVX intrinsics.
* Implement new HAL instruction v_broadcast_element on VSX/AVX/NEON/SSE.
* core(simd): add tests for v_extract_n/v_broadcast_element
- updated docs
- commented out code to repair compilation
- added WASM and MSA default implementations
* core(simd): fix compilation
- x86: avoid _mm256_extract_epi64/32/16/8 with MSVS 2015
- x86: _mm_extract_epi64 is 64-bit only
* cleanup
Lorenzo Lucignano [Wed, 20 Nov 2019 09:45:57 +0000 (10:45 +0100)]
Samples DNN: tf_text_graph_sd.py loads box coder variance and box NMS params from config file
Alexander Alekhin [Wed, 20 Nov 2019 07:32:06 +0000 (07:32 +0000)]
Merge pull request #15950 from alalek:ffmpeg_update_master
Alexander Alekhin [Tue, 19 Nov 2019 22:43:28 +0000 (22:43 +0000)]
python: reduce code size of cv2.cpp
Alexander Alekhin [Tue, 19 Nov 2019 22:04:44 +0000 (22:04 +0000)]
ffmpeg/4.x: update FFmpeg plugin
Alexander Alekhin [Tue, 19 Nov 2019 19:13:38 +0000 (19:13 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Tue, 19 Nov 2019 18:45:39 +0000 (18:45 +0000)]
Merge pull request #15939 from alalek:ffmpeg_update_3.4
Alexander Alekhin [Tue, 19 Nov 2019 18:39:56 +0000 (18:39 +0000)]
Merge pull request #15918 from alalek:python_debug_parameter
Alexander Alekhin [Tue, 19 Nov 2019 18:08:45 +0000 (21:08 +0300)]
Merge pull request #15925 from alalek:core_test_simd_cpp_emulation
core(test): extending tests with SIMD C++ emulation code (intrin_cpp.hpp)
* core(test): test SIMD CPP emulation code (intrin_cpp.hpp)
* core(simd): eliminate build warnings from intrin_cpp.hpp
Alexander Alekhin [Tue, 19 Nov 2019 14:25:28 +0000 (14:25 +0000)]
Merge pull request #15946 from alalek:fix_js_test_features2d
Alexander Alekhin [Tue, 19 Nov 2019 14:25:12 +0000 (14:25 +0000)]
Merge pull request #15945 from alalek:dnn_ie_extension_handling
Alexander Alekhin [Tue, 19 Nov 2019 13:24:58 +0000 (13:24 +0000)]
Merge pull request #15919 from alalek:python_fix_arginfo
Alexander Alekhin [Tue, 19 Nov 2019 11:08:19 +0000 (11:08 +0000)]
Merge pull request #15935 from rgarnov:rg/fix_own_mat_empty
Alexander Alekhin [Tue, 19 Nov 2019 07:40:12 +0000 (07:40 +0000)]
js(test): update features2d test
Alexander Alekhin [Tue, 19 Nov 2019 06:55:14 +0000 (06:55 +0000)]
dnn: update InferenceEngine extension handling