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.
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 15:52:04 +0000 (15:52 +0000)]
Merge pull request #15995 from bwignall:typo
Brian Wignall [Tue, 26 Nov 2019 00:55:07 +0000 (19:55 -0500)]
Fix some typos
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
Alexander Alekhin [Mon, 18 Nov 2019 19:13:45 +0000 (19:13 +0000)]
ffmpeg/3.4: update FFmpeg wrapper
Alexander Alekhin [Mon, 18 Nov 2019 18:56:57 +0000 (18:56 +0000)]
videoio: fix ffmpeg wrapper build
Alexander Alekhin [Mon, 18 Nov 2019 18:26:00 +0000 (18:26 +0000)]
Merge pull request #15938 from alalek:backport_15290
Alexander Alekhin [Mon, 18 Nov 2019 18:23:48 +0000 (18:23 +0000)]
Merge pull request #15937 from clunietp:3.4-fix-13577
cudawarped [Mon, 18 Nov 2019 14:07:06 +0000 (14:07 +0000)]
videoio: retrieve encoded frames through FFmpeg backend
- backport 15290
- add extra test case
cudawarped [Mon, 18 Nov 2019 14:07:06 +0000 (14:07 +0000)]
Merge pull request #15290 from cudawarped:ffmpeg_raw_retrieve
Add retrieve encoded frame to VideoCapture
* Add capacity to retrieve the encoded frame from a VideoCapture object.
* Correct raw codec and pixle format output from ffmpeg capture.
* Remove warnings from build.
* Added VideoCaptureRaw subclass.
* Include abstract base class VideoCaptureBase and rename new subclass VideoContainer as suggested by mshabunin.
* Remove using.
* Change base class name for compatibility with jave bindings generator.
* Move grab and retrieve and add override specifier
* Add setRaw and readRaw to IVideoCapture interface
-setRaw to disable video decoding and enable bitstream filters from mp4 to h254 and h265.
-readRaw to return the raw undecoded/filtered bitstream.
Add createRawCapture to initiate a backend with setRaw enabled.
Remove inheritance and use an independant VideoContainer subclass with IVideoCapture member.
* Address unused parameter warings.
Remove VideoContainer from python bindings as it no longer returns a Mat.
Use opencv type uchar instead of unsigned char.
Add missing destructor to VideoContainer class.
* Address build warnings and include all params in documentation.
* Include deprecated bitstream filtering API.
* Update codec_id query to work with older ffmpeg api's.
Change api version defines to be consistent - most recent api version first.
* Fix typo.
* Update test to work with naming of new files in the extra repo
* Investigate test failure
* Check bytes read by ffmpeg
* Removed mp4 video container test
* Applied suggested changes.
* videoio: rework API for extraction of RAW video streams
- FFmpeg only
* address review comments
Ruslan Garnov [Mon, 18 Nov 2019 12:39:10 +0000 (15:39 +0300)]
Fixed own::Mat::empty() for non md case
clunietp [Mon, 18 Nov 2019 12:41:34 +0000 (07:41 -0500)]
Fix 13577
Orest Chura [Mon, 18 Nov 2019 12:13:05 +0000 (15:13 +0300)]
Merge pull request #15888 from OrestChura:facebeautification_gapi_sample
Introducing the sample of Face Beautification algorithm implemented via Graph-API
* Introducing the sample of Face Beautification algorithm implemented via Graph-API
- 'gapi/samples/face_beautification.cpp' added
- FIXME added in 'gcpukernel.hpp'
* INF_ENGINE fix
- preprocessing clauses added not to run the sample without Inference Engine
* INF_ENGINE fix 2
- warnings removed
* Fixes
- checking IE version cut as there is no dependency
- some alignments fixed
- the comment about preprocessing commands fixed
* ie::backend() issue fix (according to dmatveev)
- as the sample needs the cv::gapi::ie::backend() to be defined regardless of having IE or not, there is its throw-error definition in `giebackend.cpp` now (by dmatveev)
- for the same reason, #includes in `giebackend.hpp` are fixed
- HAVE_INF_ENGINE check is removed from the sample
Alexander Alekhin [Sun, 17 Nov 2019 22:51:16 +0000 (22:51 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sun, 17 Nov 2019 22:39:27 +0000 (01:39 +0300)]
imgproc: fix bit-exact GaussianBlur() / sepFilter2D() (#15855)
* imgproc: fix bit-exact GaussianBlur() / sepFilter2D()
- avoid kernels with bad approximation
- GaussiabBlur - apply error-diffusion approximation for kernel (8-bit fraction)
* java(test): update features2d ref data
* test: update test_facedetect
Sebastián Gurin [Sat, 16 Nov 2019 21:29:38 +0000 (18:29 -0300)]
Merge pull request #15503 from cancerberoSgx:js-test-puppeteer
Js test puppeteer
* run_puppeteer.js / tests
* js run test section
* rollback html
* whitespace
* js: update OpenCV.js tests infrastructure
* js: exclude puppeteer from default 'npm install'
* js: update notes
* js: more fixes in run_puppeteer
* fix build folder
Alexander Alekhin [Sat, 16 Nov 2019 19:45:37 +0000 (19:45 +0000)]
Merge pull request #15917 from ChipKerchner:demosaicingToHal2
Maxim Pashchenkov [Fri, 15 Nov 2019 16:42:12 +0000 (19:42 +0300)]
Merge pull request #15100 from Volskig:cam_multiplexing_function_v
Implement Camera Multiplexing API
* IdideoCapture + two wrong function
function waitAny
Add errors catcher
Stub for Python added.
Sifting warnings
One test added
Two tests for camera and Perf tests added
* Perf sync and async tests for waitAny() added, waitAnyInterior() deleted, getDeviceHandle() deleted
* Variable OPENCV_TEST_CAMERA_LIST added
* Without fps set
* ASSERT_FAILED for environment variable
* Perf tests is DISABLED_
* --Trailing whitespace
* Return false from cap.cpp deleted
* Two functions deleted from interface, +range for, +environment variable in test_camera
* Space deleted
* printf deleted, perror added
* CV_WRAP deleted, cv2 cleared from stubs
* -- space
* default timeout added
* @param changed
* place of waitAny changed
* --whitespace
* ++function description
* function description changed
* revert unused changes
* videoio: rework API for VideoCapture::waitAny()
Alexander Alekhin [Fri, 15 Nov 2019 14:29:51 +0000 (17:29 +0300)]
python: force using of ArgInfo
Alexander Alekhin [Fri, 15 Nov 2019 15:37:56 +0000 (18:37 +0300)]
python: emit bindings conversion failures on OPENCV_PYTHON_DEBUG=1
ChipKerchner [Fri, 15 Nov 2019 13:42:03 +0000 (07:42 -0600)]
Convert demosiacing with variable number of gradients to HAL - 5.5x faster
Alexander Alekhin [Fri, 15 Nov 2019 11:04:05 +0000 (11:04 +0000)]
Merge pull request #15911 from l-bat:fix_reducel2
Alexander Alekhin [Thu, 14 Nov 2019 14:55:24 +0000 (14:55 +0000)]
Merge pull request #15852 from akhakim:gauss_blur_kernel_5x5
Alexander Alekhin [Thu, 14 Nov 2019 14:22:01 +0000 (14:22 +0000)]
Merge pull request #15896 from alalek:build_gcc_9
Alexander Alekhin [Thu, 14 Nov 2019 14:07:05 +0000 (14:07 +0000)]
Merge pull request #15906 from anton-potapov:gapi_fluid_i420_support
Liubov Batanina [Thu, 14 Nov 2019 12:30:53 +0000 (15:30 +0300)]
Fix ReduceL2
Anna Khakimova [Fri, 8 Nov 2019 08:15:40 +0000 (11:15 +0300)]
GAPI Fluid: SIMD optimization for sep filters 5x5 kernel size (gaussBlur)
Alexander Alekhin [Thu, 14 Nov 2019 10:33:29 +0000 (10:33 +0000)]
Merge pull request #15905 from alalek:issue_15904
Anton Potapov [Wed, 13 Nov 2019 12:05:56 +0000 (15:05 +0300)]
G-API (Fluid) core support for I420
- Extended NV12 support in Fluid Core engine to cover I420
Alexander Alekhin [Wed, 13 Nov 2019 17:02:08 +0000 (17:02 +0000)]
Merge pull request #15900 from komakai:fix-osx-build
Sebastián Gurin [Wed, 13 Nov 2019 15:14:53 +0000 (12:14 -0300)]
Merge pull request #15425 from cancerberoSgx:nodejs
JS - adds a tutorial about running opencv.js in Node.js
Alexander Alekhin [Wed, 13 Nov 2019 14:53:14 +0000 (14:53 +0000)]
Merge pull request #15874 from akhakim:runsepfilter_5x5_kernel_size
Giles Payne [Tue, 12 Nov 2019 23:30:30 +0000 (08:30 +0900)]
Fix MacOS build
Alexander Alekhin [Wed, 13 Nov 2019 11:13:17 +0000 (14:13 +0300)]
imgproc(IPP): disable ippiDistanceTransform_3x3_8u32f_C1R
Alexander Alekhin [Tue, 12 Nov 2019 22:57:15 +0000 (22:57 +0000)]
Merge pull request #15891 from alalek:issue_15886
Alexander Alekhin [Tue, 12 Nov 2019 22:56:51 +0000 (22:56 +0000)]
Merge pull request #15883 from cbachhuber:refactor-opencl-information
Christoph Bachhuber [Sun, 10 Nov 2019 12:18:57 +0000 (13:18 +0100)]
Refactor for clarity and avoiding code duplication
Implement GArik's comments
Remove unnecessary c_str()
Fix brace position
Alexander Alekhin [Mon, 11 Nov 2019 14:20:07 +0000 (17:20 +0300)]
build: GCC9 compilation
Anna Khakimova [Fri, 8 Nov 2019 13:45:10 +0000 (16:45 +0300)]
GAPI Fluid: The run_sepfilter() has logic error into handler for 5x5 and larger kernels
Alexander Alekhin [Mon, 11 Nov 2019 18:24:05 +0000 (18:24 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 11 Nov 2019 20:19:40 +0000 (20:19 +0000)]
cmake: set _WIN32_WINNT for Windows 7 API
Alexander Alekhin [Sun, 10 Nov 2019 09:35:59 +0000 (09:35 +0000)]
Merge pull request #15875 from gyadam:fix-windows-install-doc
Alexander Alekhin [Sun, 10 Nov 2019 09:25:29 +0000 (09:25 +0000)]
Merge pull request #15877 from mshabunin:fix-gst-relative-34
Alexander Alekhin [Sun, 10 Nov 2019 09:22:45 +0000 (09:22 +0000)]
Merge pull request #15835 from alalek:cmake_cpu_optimizations_fix_15802
Alexander Alekhin [Sun, 10 Nov 2019 09:22:22 +0000 (09:22 +0000)]
Merge pull request #15826 from alalek:cmake_fix_itt_define_condition
Maksim Shabunin [Sat, 9 Nov 2019 11:19:23 +0000 (11:19 +0000)]
Fixed relative paths handling in cap_gstreamer:
Lubov Batanina [Sat, 9 Nov 2019 11:11:09 +0000 (14:11 +0300)]
Merge pull request #15811 from l-bat:eltwise_div
Supported ONNX Squeeze, ReduceL2 and Eltwise::DIV
* Support eltwise div
* Fix test
* OpenCL support added
* refactoring
* fix code style
* Only squeeze with axes supported
Adam Gyarmati [Sat, 9 Nov 2019 03:05:46 +0000 (19:05 -0800)]
Fix Windows installation script error
Fix an error during Windows installation caused by trying to create the already existing Build directory. Also excluding intermediate steps for Install directory creation.
Alexander Alekhin [Fri, 8 Nov 2019 22:01:07 +0000 (22:01 +0000)]
Merge pull request #15861 from dkurt:dnn_fix_get_input_layers
Alexander Alekhin [Fri, 8 Nov 2019 13:20:09 +0000 (13:20 +0000)]
Merge pull request #15319 from cancerberoSgx:fs
Sebastián Gurín [Fri, 16 Aug 2019 02:09:37 +0000 (23:09 -0300)]
expose FS
collinbrake [Fri, 8 Nov 2019 09:27:37 +0000 (04:27 -0500)]
Merge pull request #15832 from collinbrake:feature_grammar_fixes_4
* Grammar fixes for python core operations docs
* fixed whitespace error
* reverted changes
Alexander Alekhin [Thu, 7 Nov 2019 16:48:41 +0000 (16:48 +0000)]
Merge pull request #15848 from alalek:backport_test_15842
Alexander Alekhin [Thu, 7 Nov 2019 14:21:35 +0000 (14:21 +0000)]
Merge pull request #15868 from alalek:issue_15857
Alexander Alekhin [Thu, 7 Nov 2019 14:04:33 +0000 (14:04 +0000)]
Merge pull request #15866 from mshabunin:add-security-md
Alexander Alekhin [Thu, 7 Nov 2019 13:49:34 +0000 (13:49 +0000)]
Merge pull request #15867 from mshabunin:fix-gapi-install
Alexander Alekhin [Thu, 7 Nov 2019 11:01:51 +0000 (14:01 +0300)]
core(persistence): add more checks for implementation limitations
Maksim Shabunin [Thu, 7 Nov 2019 11:03:46 +0000 (14:03 +0300)]
Install: added missing gapi headers
Maksim Shabunin [Thu, 7 Nov 2019 10:10:42 +0000 (13:10 +0300)]
Added SECURITY.md
Dimitri Gerin [Wed, 6 Nov 2019 18:05:35 +0000 (21:05 +0300)]
Fix dnn::getLayerInputs
Alexander Alekhin [Wed, 6 Nov 2019 13:47:37 +0000 (13:47 +0000)]
Merge pull request #15854 from czgdp1807:rem-typo
Alexander Smorkalov [Wed, 6 Nov 2019 13:37:37 +0000 (13:37 +0000)]
Merge pull request #15159 from SSE4:fix_find_openexr
czgdp1807 [Wed, 6 Nov 2019 11:45:31 +0000 (17:15 +0530)]
removed typo
SSE4 [Tue, 5 Nov 2019 09:13:21 +0000 (16:13 +0700)]
- fix FindOpenEXR to respect OPENEXR_ROOT
Signed-off-by: SSE4 <tomskside@gmail.com>
Alexander Alekhin [Wed, 6 Nov 2019 09:54:29 +0000 (09:54 +0000)]
Merge pull request #15814 from i-murzov:3.4-ocl-cleanup
Alexander Alekhin [Wed, 6 Nov 2019 08:12:40 +0000 (08:12 +0000)]
Merge pull request #15813 from i-murzov:3.4-ocl-empty-platform
Igor Murzov [Wed, 30 Oct 2019 15:24:32 +0000 (18:24 +0300)]
Fix OpenCL device detection when some OpenCL platform has no devices
It's not an error if some OpenCL platform has no devices. This makes
OpenCL device detection work correctly in the following scenario:
$ OPENCV_OPENCL_DEVICE=:GPU: ./opencv_test_dnn
OpenCV version: 4.1.2-dev
OpenCV VCS version: 4.1.2-80-g467748ee98-dirty
Build type: Debug
Compiler: /usr/bin/g++ (ver 7.4.0)
Parallel framework: pthreads
CPU features: SSE SSE2 SSE3 *SSE4.1 *SSE4.2 *FP16 *AVX *AVX2 *AVX512-SKX?
Intel(R) IPP version: ippIP AVX2 (l9) 2019.0.0 Gold (-) Jul 24 2018
OpenCL Platforms:
AMD Accelerated Parallel Processing
Portable Computing Language
CPU: pthread-AMD Ryzen 7 2700X Eight-Core Processor (OpenCL 1.2 pocl HSTR: pthread-x86_64-pc-linux-gnu-znver1)
NVIDIA CUDA
dGPU: GeForce GTX 1080 (OpenCL 1.2 CUDA)
Current OpenCL device:
Type = dGPU
Name = GeForce GTX 1080
Version = OpenCL 1.2 CUDA
Driver version = 430.26
Alexander Alekhin [Tue, 5 Nov 2019 16:21:04 +0000 (16:21 +0000)]
Merge pull request #15851 from alalek:fixup_15842
Chip Kerchner [Tue, 5 Nov 2019 15:52:35 +0000 (10:52 -0500)]
Merge pull request #15828 from ChipKerchner:momentsToHal
* Convert moments in tile algorithms to HAL (1.3x faster for VSX).
* Adding NEON code back in for non 64-bit platforms.
* Remove floats from post processing.
TH3CHARLie [Mon, 4 Nov 2019 13:27:48 +0000 (21:27 +0800)]
core(test): add test for YAML parse multiple documents
- added removal of temporary file
Alexander Alekhin [Tue, 5 Nov 2019 15:28:15 +0000 (18:28 +0300)]
core(persistence): fix processing of multiple documents
Alexander Alekhin [Tue, 5 Nov 2019 15:22:42 +0000 (18:22 +0300)]
revert changes in modules/core/src/persistence_yml.cpp (PR15842)
Igor Murzov [Wed, 30 Oct 2019 15:35:38 +0000 (18:35 +0300)]
Simplify OpenCL info dumping code:
* Reduce code nesting
* Drop redundant .c_str() calls