platform/upstream/opencv.git
5 years agoMerge pull request #13176 from dmatveev:gapi_doxygen
Dmitry Matveev [Fri, 16 Nov 2018 20:38:10 +0000 (23:38 +0300)]
Merge pull request #13176 from dmatveev:gapi_doxygen

G-API: Doxygen class reference

* G-API Doxygen documentation: covered cv::GComputation

* G-API Doxygen documentation: added sections on compile arguments

* G-API Doxygen documentation: restructuring & more text

* Added new sections (organized API reference into it);
* Documented GCompiled, compile args, backends, etc.

* G-API Doxygen documentation: documented GKernelPackage and added group for meta

5 years agoMerge pull request #13183 from tomoaki0705:fixCaroteneColorConvert2Gray
Alexander Alekhin [Fri, 16 Nov 2018 20:35:51 +0000 (23:35 +0300)]
Merge pull request #13183 from tomoaki0705:fixCaroteneColorConvert2Gray

5 years agoMerge pull request #13184 from paroj:imshow_cvtscale
Alexander Alekhin [Fri, 16 Nov 2018 20:34:22 +0000 (20:34 +0000)]
Merge pull request #13184 from paroj:imshow_cvtscale

5 years agoMerge pull request #13151 from paroj:nocapmodes
Alexander Alekhin [Fri, 16 Nov 2018 17:20:48 +0000 (17:20 +0000)]
Merge pull request #13151 from paroj:nocapmodes

5 years agohighgui: Qt - restore convertscale semantics
Pavel Rojtberg [Fri, 16 Nov 2018 15:13:05 +0000 (16:13 +0100)]
highgui: Qt - restore convertscale semantics

broken in 11eafca3e2a4cbc62f1309d25db0ea3ed9a6ea8e

5 years agofix test failure of ColorCvtRGB2Gray
Tomoaki Teshima [Fri, 16 Nov 2018 14:31:01 +0000 (23:31 +0900)]
fix test failure of ColorCvtRGB2Gray
  - update parameter in carotene

5 years agoMerge pull request #13162 from elatkin:el/gapi_perf_rgb2gray
Evgeny Latkin [Thu, 15 Nov 2018 15:14:27 +0000 (18:14 +0300)]
Merge pull request #13162 from elatkin:el/gapi_perf_rgb2gray

GAPI (fluid): RGB/BGR to gray: optimization (#13162)

* GAPI (fluid): RGB/BGR to Gray: add performance tests

* GAPI (fluid): RGB/BGR to Gray: speedup 8-12x with manual CV_SIMD

* GAPI (fluid): RGB/BGR to Gray: fix compiler warning

* GAPI (fluid): RGB/BGR to Gray: dynamic dispatching to AVX2

* GAPI (fluid): RGB/BGR to Gray: check R/G/B coefficients

* GAPI (fluid): RGB/BGR to Gray: fixed compilation error (caused by change in master)

5 years agoMerge pull request #13030 from dmatveev:tutorial
Dmitry Matveev [Thu, 15 Nov 2018 15:12:36 +0000 (18:12 +0300)]
Merge pull request #13030 from dmatveev:tutorial

* G-API: First steps with tutorial

* G-API Tutorial: First iteration

* G-API port of anisotropic image segmentation tutorial;
* Currently works via OpenCV only;
* Some new kernels have been required.

* G-API Tutorial: added chapters on execution code, inspection, and profiling

* G-API Tutorial: make Fluid kernel headers public

For some reason, these headers were not moved to the public
headers subtree during the initial development. Somehow it even
worked for the existing workloads.

* G-API Tutorial: Fix a couple of issues found during the work

* Introduced Phase & Sqrt kernels, OCV & Fluid versions
* Extended GKernelPackage to allow kernel removal & policies on include()

All the above stuff needs to be tested, tests will be added later

* G-API Tutorial: added chapter on running Fluid backend

* G-API Tutorial: fix a number of issues in the text

* G-API Tutorial - some final updates

- Fixed post-merge issues after Sobel kernel renaming;
- Simplified G-API code a little bit;
- Put a conclusion note in text.

* G-API Tutorial - fix build issues in test/perf targets

Public headers were refactored but tests suites were not updated in time

* G-API Tutorial: Added tests & reference docs on new kernels

* Phase
* Sqrt

* G-API Tutorial: added link to the tutorial from the main module doc

* G-API Tutorial: Added tests on new GKernelPackage functionality

* G-API Tutorial: Extended InRange tests to cover 32F

* G-API Tutorial: Misc fixes

* Avoid building examples when gapi module is not there
* Added a volatile API disclaimer to G-API root documentation page

* G-API Tutorial: Fix perf tests build issue

This change came from master where Fluid kernels are still used
incorrectly.

* G-API Tutorial: Fixed channels support in Sqrt/Phase fluid kernels

Extended tests to cover this case

* G-API Tutorial: Fix text problems found on team review

5 years agoMerge pull request #13173 from dkurt:dnn_fix_vulkan_pool
Alexander Alekhin [Thu, 15 Nov 2018 12:56:10 +0000 (12:56 +0000)]
Merge pull request #13173 from dkurt:dnn_fix_vulkan_pool

5 years agoFix Vulkan's max pooling in case of no output indices
Dmitry Kurtaev [Thu, 15 Nov 2018 11:10:24 +0000 (14:10 +0300)]
Fix Vulkan's max pooling in case of no output indices

5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Wed, 14 Nov 2018 19:41:09 +0000 (19:41 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoMerge pull request #13164 from alalek:ocl_morph
Alexander Alekhin [Wed, 14 Nov 2018 19:32:32 +0000 (19:32 +0000)]
Merge pull request #13164 from alalek:ocl_morph

5 years agoMerge pull request #13166 from catree:fix_batch_norm_layer_missing_intrin
Alexander Alekhin [Wed, 14 Nov 2018 19:02:17 +0000 (19:02 +0000)]
Merge pull request #13166 from catree:fix_batch_norm_layer_missing_intrin

5 years agoFix code and missing intrin header. Remove useless header.
catree [Wed, 14 Nov 2018 18:00:59 +0000 (19:00 +0100)]
Fix code and missing intrin header. Remove useless header.

5 years agoimgproc(ocl): fix morph generic filter checks
Alexander Alekhin [Wed, 14 Nov 2018 17:14:30 +0000 (20:14 +0300)]
imgproc(ocl): fix morph generic filter checks

'ksize' is not updated with 'kernel'

5 years agoMerge pull request #13096 from alalek:gapi_tests_checks
Alexander Alekhin [Wed, 14 Nov 2018 15:59:01 +0000 (15:59 +0000)]
Merge pull request #13096 from alalek:gapi_tests_checks

5 years agoMerge pull request #13153 from savuor:fix/filenodeit_member_ptr
Alexander Alekhin [Wed, 14 Nov 2018 14:22:58 +0000 (14:22 +0000)]
Merge pull request #13153 from savuor:fix/filenodeit_member_ptr

5 years agoMerge pull request #13160 from dkurt:fix_13159
Alexander Alekhin [Wed, 14 Nov 2018 14:18:21 +0000 (14:18 +0000)]
Merge pull request #13160 from dkurt:fix_13159

5 years agoMerge pull request #13157 from elatkin:el/gapi_perf_sobel_3
Alexander Alekhin [Wed, 14 Nov 2018 13:19:30 +0000 (13:19 +0000)]
Merge pull request #13157 from elatkin:el/gapi_perf_sobel_3

5 years agoFix a bug with OpenVINO backend
Dmitry Kurtaev [Wed, 14 Nov 2018 10:42:06 +0000 (13:42 +0300)]
Fix a bug with OpenVINO backend

5 years agogapi(test): more reliable checks
Alexander Alekhin [Fri, 9 Nov 2018 11:11:13 +0000 (14:11 +0300)]
gapi(test): more reliable checks

avoid `countNonZero()`, use `norm()`

5 years agogapi(test): use relative error check for Norm/Sum tests
Alexander Alekhin [Fri, 9 Nov 2018 09:46:39 +0000 (12:46 +0300)]
gapi(test): use relative error check for Norm/Sum tests

5 years agoGAPI (fluid): Sobel 3x3 optimization: remove needless file
Latkin, Yevgeny I [Wed, 14 Nov 2018 07:17:40 +0000 (10:17 +0300)]
GAPI (fluid): Sobel 3x3 optimization: remove needless file

5 years agoMerge pull request #13152 from ssnover95:docfix/fourier-transform-py-tutorial
Alexander Alekhin [Tue, 13 Nov 2018 19:05:25 +0000 (22:05 +0300)]
Merge pull request #13152 from ssnover95:docfix/fourier-transform-py-tutorial

5 years agodoc(tutorial_py_fourier_transform): Correct errors in tutorial for integer division...
ssnover95 [Tue, 13 Nov 2018 15:23:10 +0000 (10:23 -0500)]
doc(tutorial_py_fourier_transform): Correct errors in tutorial for integer division and filter symmetry

5 years agoremoved FileNodeIterator::operator->()
Rostislav Vasilikhin [Tue, 13 Nov 2018 17:18:53 +0000 (20:18 +0300)]
removed FileNodeIterator::operator->()

5 years agovideoio: drop VideoCaptureModes enum in favour of fourcc
Pavel Rojtberg [Tue, 13 Nov 2018 14:53:35 +0000 (15:53 +0100)]
videoio: drop VideoCaptureModes enum in favour of fourcc

5 years agoMerge pull request #13150 from dmatveev:update_ade011d
Alexander Alekhin [Tue, 13 Nov 2018 16:18:32 +0000 (16:18 +0000)]
Merge pull request #13150 from dmatveev:update_ade011d

5 years agoMerge pull request #13133 from elatkin:el/gapi_perf_sobel_2
Evgeny Latkin [Tue, 13 Nov 2018 14:48:10 +0000 (17:48 +0300)]
Merge pull request #13133 from elatkin:el/gapi_perf_sobel_2

GAPI (fluid): Sobel 3x3 optimization: CV_SIMD dynamic dispatching (#13133)

* GAPI (fluid): Sobel 3x3: remove template for run_sobel_row()

* GAPI (fluid): Sobel 3x3: dynamic dispatching of CV_SIMD code

* GAPI (fluid): Sobel 3x3 optimization: fixed CV_SIMD dynamic dispatcher

5 years agoUpdate ADE to version 0.1.1d
Dmitry Matveev [Tue, 13 Nov 2018 13:44:29 +0000 (16:44 +0300)]
Update ADE to version 0.1.1d

5 years agoMerge pull request #13070 from elatkin:el/gapi_perf_sobel
Evgeny Latkin [Tue, 13 Nov 2018 12:04:37 +0000 (15:04 +0300)]
Merge pull request #13070 from elatkin:el/gapi_perf_sobel

GAPI (fluid): optimization of Sobel 3x3 (#13070)

* GAPI: performance test for Sobel

* GAPI: performance test for Sobel w/FP32 input

* GAPI: Sobel speedup: 2.5x (U8) up to 10x (float)

* GAPI: Sobel 3x3 to support U8 into S16

* GAPI (fluid): Sobel 3x3 speedup: 10% (uchar), 1.5x (float)

* GAPI (fluid): Sobel 3x3 speedup: +10x (uchar), but -20% (float)

* GAPI (fluid): Sobel 3x3 speedup: +10% (float)

* GAPI (fluid): Sobel 3x3 speedup: +15% (float), +10% (uchar)

* GAPI (fluid): Sobel 3x3: address GCC warnings

* GAPI (fluid): Sobel 3x3: separate *.cpp file w/SIMD code

* GAPI (fluid): Sobel 3x3: fixed AVX2 code, AVX2 speedup 20-50% (uchar), 10-20% (float)

* GAPI (fluid): Sobel 3x3: fix CV_SIMD code for AVX2

* GAPI (fluid): Sobel 3x3: refactor

5 years agoMerge tag '4.0.0-rc'
Alexander Alekhin [Mon, 12 Nov 2018 21:42:02 +0000 (21:42 +0000)]
Merge tag '4.0.0-rc'

OpenCV 4.0.0-rc

5 years agorelease: OpenCV 4.0.0-rc (version++)
Alexander Alekhin [Mon, 12 Nov 2018 09:42:13 +0000 (12:42 +0300)]
release: OpenCV 4.0.0-rc (version++)

5 years agoMerge pull request #13140 from alalek:opencv3_opencv4
Alexander Alekhin [Mon, 12 Nov 2018 19:34:10 +0000 (22:34 +0300)]
Merge pull request #13140 from alalek:opencv3_opencv4

5 years agoMerge pull request #13124 from alalek:workaround_13121
Alexander Alekhin [Mon, 12 Nov 2018 19:33:47 +0000 (22:33 +0300)]
Merge pull request #13124 from alalek:workaround_13121

5 years agoMerge pull request #13137 from alalek:videoio_v4l_disable_normalization
Alexander Alekhin [Mon, 12 Nov 2018 19:15:00 +0000 (22:15 +0300)]
Merge pull request #13137 from alalek:videoio_v4l_disable_normalization

5 years agoMerge pull request #13127 from alalek:fix_13114
Alexander Alekhin [Mon, 12 Nov 2018 19:11:40 +0000 (22:11 +0300)]
Merge pull request #13127 from alalek:fix_13114

5 years agoMerge pull request #13126 from mshabunin:remove_libv4l
Alexander Alekhin [Mon, 12 Nov 2018 19:10:49 +0000 (22:10 +0300)]
Merge pull request #13126 from mshabunin:remove_libv4l

5 years agobuild: fix version 3->4
Alexander Alekhin [Mon, 12 Nov 2018 19:05:58 +0000 (19:05 +0000)]
build: fix version 3->4

5 years agovideoio: remove using of HAVE_CAMV4L
Alexander Alekhin [Mon, 12 Nov 2018 18:53:19 +0000 (18:53 +0000)]
videoio: remove using of HAVE_CAMV4L

5 years agostitching(test): workaround ParallelFeaturesFinder.IsSameWithSerial
Alexander Alekhin [Mon, 12 Nov 2018 10:19:01 +0000 (13:19 +0300)]
stitching(test): workaround ParallelFeaturesFinder.IsSameWithSerial

5 years agoRepair V4L backend
Maksim Shabunin [Mon, 12 Nov 2018 17:04:33 +0000 (20:04 +0300)]
Repair V4L backend

5 years agovideoio(v4l): turn off normalization of V4L properties
Alexander Alekhin [Mon, 12 Nov 2018 16:08:07 +0000 (19:08 +0300)]
videoio(v4l): turn off normalization of V4L properties

5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Mon, 12 Nov 2018 14:49:04 +0000 (17:49 +0300)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoMerge pull request #13123 from dkurt:fs_keys
Alexander Alekhin [Mon, 12 Nov 2018 14:46:49 +0000 (17:46 +0300)]
Merge pull request #13123 from dkurt:fs_keys

5 years agoMerge pull request #13115 from catree:fix_dis_flow_intrin
Alexander Alekhin [Mon, 12 Nov 2018 14:44:12 +0000 (17:44 +0300)]
Merge pull request #13115 from catree:fix_dis_flow_intrin

5 years agoMerge pull request #13125 from dkurt:fs_keys_test
Alexander Alekhin [Mon, 12 Nov 2018 14:33:14 +0000 (14:33 +0000)]
Merge pull request #13125 from dkurt:fs_keys_test

5 years agoMerge pull request #13112 from alalek:fix_coverity_reports_3.4
Alexander Alekhin [Mon, 12 Nov 2018 14:32:51 +0000 (14:32 +0000)]
Merge pull request #13112 from alalek:fix_coverity_reports_3.4

5 years agoMerge pull request #12983 from allnes:parallel_qrcode_pipeline
Alexander Alekhin [Mon, 12 Nov 2018 14:32:29 +0000 (14:32 +0000)]
Merge pull request #12983 from allnes:parallel_qrcode_pipeline

5 years agoMerge pull request #13128 from alalek:fix_13114_3.4
Alexander Alekhin [Mon, 12 Nov 2018 14:17:56 +0000 (14:17 +0000)]
Merge pull request #13128 from alalek:fix_13114_3.4

5 years agoAdded bugfix and some tests
Alexander Nesterov [Mon, 12 Nov 2018 12:55:22 +0000 (11:55 -0100)]
Added bugfix and some tests

5 years agocmake: fix supporting of legacy flags
Alexander Alekhin [Mon, 12 Nov 2018 11:09:57 +0000 (14:09 +0300)]
cmake: fix supporting of legacy flags

5 years agocmake: fix Android features detection
Alexander Alekhin [Mon, 12 Nov 2018 10:51:52 +0000 (13:51 +0300)]
cmake: fix Android features detection

avoid using of ENABLE_* flags

5 years agovideoio: remove cap_libv4l in favour of cap_v4l
Pavel Rojtberg [Wed, 16 Dec 2015 15:05:56 +0000 (16:05 +0100)]
videoio: remove cap_libv4l in favour of cap_v4l

cap_libv4l depends on an external library (libv4l) yet is still larger
(1966 loc vs 1822 loc).
It was initially introduced copy pasting cap_v4l in order to offload
various color conversions to libv4l.
However nowadays we handle most of the needed color conversions inside
OpenCV. Our own implementation is better tested and (probably) also
better performing. (as it can optionally leverage IPP/ OpenCL)

Currently cap_v4l is better maintained and generally the code is in
better shape. There is however an API
difference in getting unconverted frames:
* on cap_libv4l one need to set `CV_CAP_MODE_GRAY=1` or
`CV_CAP_MODE_YUYV=1`
* on cap_v4l one needs to set `CV_CAP_PROP_CONVERT_RGB=0`

the latter is more flexible though as it also allows accessing undecoded
JPEG images.

fixes #4563

5 years agoAdd a test for FileNode::keys()
Dmitry Kurtaev [Mon, 12 Nov 2018 10:38:18 +0000 (13:38 +0300)]
Add a test for FileNode::keys()

5 years agoAdd FileNode::keys() missed during refactoring
Dmitry Kurtaev [Mon, 12 Nov 2018 10:29:38 +0000 (13:29 +0300)]
Add FileNode::keys() missed during refactoring

5 years agoFix missing intrin.hpp header in dis_flow.cpp.
catree [Sun, 11 Nov 2018 19:14:04 +0000 (20:14 +0100)]
Fix missing intrin.hpp header in dis_flow.cpp.

Fix #ifdef CV_SIMD128, should be #if CV_SIMD128.

5 years agoMerge pull request #12896 from alalek:cmake_deprecate_pkgconfig
Alexander Alekhin [Sun, 11 Nov 2018 22:12:41 +0000 (22:12 +0000)]
Merge pull request #12896 from alalek:cmake_deprecate_pkgconfig

5 years agoMerge pull request #13107 from alalek:core_divzero_simd_test
Alexander Alekhin [Sun, 11 Nov 2018 22:01:50 +0000 (22:01 +0000)]
Merge pull request #13107 from alalek:core_divzero_simd_test

5 years agofix coverity reports
Alexander Alekhin [Sun, 11 Nov 2018 13:51:47 +0000 (13:51 +0000)]
fix coverity reports

5 years agocmake: OPENCV_GENERATE_PKGCONFIG
Alexander Alekhin [Mon, 22 Oct 2018 14:46:54 +0000 (14:46 +0000)]
cmake: OPENCV_GENERATE_PKGCONFIG

5 years agocore(test): extend divideByZero test
Alexander Alekhin [Sat, 10 Nov 2018 21:38:24 +0000 (21:38 +0000)]
core(test): extend divideByZero test

to verify SIMD code path

5 years agoMerge remote-tracking branch 'upstream/3.4' into merge-3.4
Alexander Alekhin [Sat, 10 Nov 2018 20:10:57 +0000 (20:10 +0000)]
Merge remote-tracking branch 'upstream/3.4' into merge-3.4

5 years agoMerge pull request #13102 from alalek:issue_13101
Alexander Alekhin [Sat, 10 Nov 2018 19:11:06 +0000 (19:11 +0000)]
Merge pull request #13102 from alalek:issue_13101

5 years agoMerge pull request #13104 from alalek:docs_fix_bib_Kroeger2016
Alexander Alekhin [Sat, 10 Nov 2018 17:11:28 +0000 (20:11 +0300)]
Merge pull request #13104 from alalek:docs_fix_bib_Kroeger2016

docs: fix Kroeger2016 bib reference

move from opencv_contrib

5 years agoMerge pull request #12827 from hrnr:stitching_4
Jiri Horner [Sat, 10 Nov 2018 16:53:48 +0000 (17:53 +0100)]
Merge pull request #12827 from hrnr:stitching_4

[evolution] Stitching for OpenCV 4.0

* stitching: wrap Stitcher::create for bindings

* provide method for consistent stitcher usage across languages

* samples: add python stitching sample

* port cpp stitching sample to python

* stitching: consolidate Stitcher create methods

* remove Stitcher::createDefault, it returns Stitcher, not Ptr<Stitcher> -> inconsistent API
* deprecate cv::createStitcher and cv::createStitcherScans in favor of Stitcher::create

* stitching: avoid anonymous enum in Stitcher

* ORIG_RESOL should be double
* add documentatiton

* stitching: improve documentation in Stitcher

* stitching: expose estimator in Stitcher

* remove ABI hack

* stitching: drop try_use_gpu flag

* OCL will be used automatically through T-API in OCL-enable paths
* CUDA won't be used unless user sets CUDA-enabled classes manually

* stitching: drop FeaturesFinder

* use Feature2D instead of FeaturesFinder
* interoperability with features2d module
* detach from dependency on xfeatures2d

* features2d: fix compute and detect to work with UMat vectors

* correctly pass UMats as UMats to allow OCL paths
* support vector of UMats as output arg

* stitching: use nearest interpolation for resizing masks

* fix warnings

5 years agoMerge pull request #13097 from alalek:backport_13086
Alexander Alekhin [Sat, 10 Nov 2018 13:36:06 +0000 (13:36 +0000)]
Merge pull request #13097 from alalek:backport_13086

5 years agoMerge pull request #13103 from alalek:fix_doc_links_3.4
Alexander Alekhin [Sat, 10 Nov 2018 13:34:47 +0000 (16:34 +0300)]
Merge pull request #13103 from alalek:fix_doc_links_3.4

5 years agodocs: fix links
Alexander Alekhin [Sat, 10 Nov 2018 12:00:02 +0000 (12:00 +0000)]
docs: fix links

- cv::at => cv::Mat::at()
- removed unnecessary @ref

5 years agocore: rework getContinuousSize() for vector-col/row support
Alexander Alekhin [Sat, 10 Nov 2018 10:17:34 +0000 (10:17 +0000)]
core: rework getContinuousSize() for vector-col/row support

5 years agoMerge pull request #13072 from gineshidalgo99:Pendantic_warning
Alexander Alekhin [Fri, 9 Nov 2018 22:52:41 +0000 (22:52 +0000)]
Merge pull request #13072 from gineshidalgo99:Pendantic_warning

5 years agobackport: refined QRCodeDetector API for OpenCV 4.0
Vadim Pisarevsky [Fri, 9 Nov 2018 09:57:27 +0000 (12:57 +0300)]
backport: refined QRCodeDetector API for OpenCV 4.0

5 years agoMerge pull request #12878 from tompollok:3.4
Alexander Alekhin [Fri, 9 Nov 2018 19:54:16 +0000 (19:54 +0000)]
Merge pull request #12878 from tompollok:3.4

5 years agoMerge pull request #13024 from rgarnov:gapi_fix_lut_test
Alexander Alekhin [Fri, 9 Nov 2018 19:16:39 +0000 (19:16 +0000)]
Merge pull request #13024 from rgarnov:gapi_fix_lut_test

5 years agoMerge pull request #12962 from paroj:manualwb
Alexander Alekhin [Fri, 9 Nov 2018 19:15:49 +0000 (19:15 +0000)]
Merge pull request #12962 from paroj:manualwb

5 years agoMerge pull request #11935 from mattmyne:filestorage_matx
Matt Bennett [Fri, 9 Nov 2018 17:05:59 +0000 (17:05 +0000)]
Merge pull request #11935 from mattmyne:filestorage_matx

* Support for Matx read/write by FileStorage

* Only empty filestorage read now produces default Matx. Split Matx IO test into smaller units. Test checks for exception thrown if reading a Mat into a Matx of different size.

5 years agoMerge pull request #13094 from alalek:ocl_reduce_sync
Alexander Alekhin [Fri, 9 Nov 2018 16:44:10 +0000 (16:44 +0000)]
Merge pull request #13094 from alalek:ocl_reduce_sync

5 years agovideoio: add manual white-balance and implement it for V4L2
Pavel Rojtberg [Fri, 26 Oct 2018 14:54:00 +0000 (16:54 +0200)]
videoio: add manual white-balance and implement it for V4L2

5 years agocore(ocl): run "reduce" kernels in synchronous mode
Alexander Alekhin [Fri, 9 Nov 2018 14:36:37 +0000 (17:36 +0300)]
core(ocl): run "reduce" kernels in synchronous mode

5 years agoMerge pull request #13084 from vpisarev:shuffle_optflow_algos
Vadim Pisarevsky [Fri, 9 Nov 2018 14:52:06 +0000 (17:52 +0300)]
Merge pull request #13084 from vpisarev:shuffle_optflow_algos

* moved DIS optical flow from opencv_contrib to opencv, moved TVL1 from opencv to opencv_contrib

* fixed compile warning

* TVL1 optical flow example moved to opencv_contrib

5 years agosignificantly reduced OpenCV binary size by disabling IPP in some funcs (#13085)
Vadim Pisarevsky [Fri, 9 Nov 2018 14:39:29 +0000 (17:39 +0300)]
significantly reduced OpenCV binary size by disabling IPP in some funcs (#13085)

* significantly reduced OpenCV binary size by disabling IPP calls in some OpenCV functions: Sobel, Scharr, medianBlur, GaussianBlur, filter2D, mean, meanStdDev, norm, sum, minMaxIdx, sort.

* re-enable IPP in norm, since it's much faster (without adding too much space overhead)

5 years agoMerge pull request #13080 from alalek:issue_13078
Alexander Alekhin [Fri, 9 Nov 2018 13:20:27 +0000 (13:20 +0000)]
Merge pull request #13080 from alalek:issue_13078

5 years agomostly removed obsolete C API from calib3d (at least at the interface level) (#13081)
Vadim Pisarevsky [Fri, 9 Nov 2018 13:12:22 +0000 (16:12 +0300)]
mostly removed obsolete C API from calib3d (at least at the interface level) (#13081)

5 years agorefined QRCodeDetector API for OpenCV 4.0 (#13086)
Vadim Pisarevsky [Fri, 9 Nov 2018 09:57:27 +0000 (12:57 +0300)]
refined QRCodeDetector API for OpenCV 4.0 (#13086)

* refined QRCodeDetector API for OpenCV 4.0

* expanded and tested QRCodeDetector::detectAndDecode()

5 years agoMerge pull request #13088 from alalek:gapi_fix_arm_build
Alexander Alekhin [Fri, 9 Nov 2018 09:25:52 +0000 (12:25 +0300)]
Merge pull request #13088 from alalek:gapi_fix_arm_build

5 years agoFixed uniniitialized mats in tests, added operator<< for compare_f
Ruslan Garnov [Fri, 2 Nov 2018 12:42:25 +0000 (15:42 +0300)]
Fixed uniniitialized mats in tests, added operator<< for compare_f

5 years agogapi: fix ARM build
Alexander Alekhin [Fri, 9 Nov 2018 06:37:48 +0000 (06:37 +0000)]
gapi: fix ARM build

5 years agoremoved C API in the following modules: photo, video, imgcodecs, videoio (#13060)
Vadim Pisarevsky [Thu, 8 Nov 2018 21:52:09 +0000 (00:52 +0300)]
removed C API in the following modules: photo, video, imgcodecs, videoio (#13060)

* removed C API in the following modules: photo, video, imgcodecs, videoio

* trying to fix various compile errors and warnings on Windows and Linux

* continue to fix compile errors and warnings

* continue to fix compile errors, warnings, as well as the test failures

* trying to resolve compile warnings on Android

* Update cap_dc1394_v2.cpp

fix warning from the new GCC

5 years agoMerge pull request #13008 from dbudniko:dbudniko/gpu_opencl_backend
Dmitry Budnikov [Thu, 8 Nov 2018 19:14:53 +0000 (22:14 +0300)]
Merge pull request #13008 from dbudniko:dbudniko/gpu_opencl_backend

G-API GPU-OpenCL backend (#13008)

* gpu/ocl backend core

* accuracy tests added and adjusted + license headers

* GPU perf. tests added; almost all adjusted to pass

* all tests adjusted and passed - ready for pull request

* missing license headers

* fix warning (workaround RGB2Gray)

* fix c++ magic

* precompiled header

* white spaces

* try to fix warning and blur test

* try to fix Blur perf tests

* more alignments with the latest cpu backend

* more gapi tests refactoring + 1 more UB issue fix + more informative tolerance exceed reports

* white space fix

* try workaround for SumTest

* GAPI_EXPORTS instead CV_EXPORTS

5 years agoMerge pull request #12893 from aleksey-nikolaev:cap-update
Alexey Nikolaev [Thu, 8 Nov 2018 18:27:45 +0000 (21:27 +0300)]
Merge pull request #12893 from aleksey-nikolaev:cap-update

V4L (V4L2): Refactoring. Added missed camera properties. Fixed getting `INF` for some properties. Singlethread as always (#12893)

* cap_v4l:
1 Added cap_properties verbalization.
2 Set Get of properties elementary refactoring.
3 Removed converting parameters to/from [0,1] range.
4 Added all known conversion from V4L2_CID_* to CV_CAP_PROP_*

* cap_v4l:
1. Removed all query for parameters range.
2. Refactored capture initialization.
3. Added selecting input channel by CV_CAP_PROP_MODE. Default value -1 the channels not changed.

* cap_v4l:
1. Refactoring of Convert To RGB

* cap_v4l:
1. Fixed use of video buffer index.
2. Removed extra memcopy for grab image.
3. Removed device closing from autosetup_capture_mode_v4l2

* cap_v4l:
1. The `goto` was eliminated
2. Fixed use of temporary buffer index for V4L2_PIX_FMT_SN9C10X
3. Fixed use of the bufferIndex
4. Removed trailing spaces and unused variables.

* cap_v4l:
1. Alias for capture->buffers[capture->bufferIndex]
2. Reduced size of data for memcpy: bytesused instead of length
3. Refactoring. Code duplication. More info for debug

* cap_v4l:
1. Added the ability to grab and retrieveFrame independently several times

* cap_v4l:
1. Not need to close/open device for new capture parameters applying.
2. Removed using of device name as a flag that the capture is closed. Added sufficient function.
3. Refactoring. Added requestBuffers and createBuffers

* cap_v4l:
1. Added tryIoctl with `select` like was in mainloop_v4l2.
2. Fixed buffer request for device without closing the device.
3. Some static function moved to CvCaptureCAM_V4L
4. Removed unused defines

* cap_v4l:
1. Thread-safe now

* cap_v4l:
1. Fixed thread-safe destructor
2. Fixed FPS setting

* Missed brake

* Removed thread-safety

* cap_v4l:
1. Reverted conversion parameters to/from [0,1] by default for backward compatibility.
2. Added setting for turn off compatibility mode: set CV_CAP_PROP_MODE to 65536
3. Most static functions moved to CvCaptureCAM_V4L
4. Refactoring of icvRetrieveFrameCAM_V4L and using of frame_allocated flag

* cap_v4l:
1. Added conversion to RGB from NV12, NV21
2. Refactoring. Removed wrappers for known format conversions.

* Added `CAP_PROP_CHANNEL` to the enum VideoCaptureProperties.
CAP_V4L migrated to use VideoCaptureProperties.

* 1. Update comments.
2. Environment variable `OPENCV_VIDEOIO_V4L_RANGE_NORMALIZED` for setting default backward compatibility mode.
3. Revert getting of `CAP_PROP_MODE` as fourcc code in backward compatibility mode.

* videoio: update cap_v4l - compatibilityMode => normalizePropRange

* videoio(test): V4L2 MJPEG test

`v4l2-ctl --list-formats` should have 'MJPG' entry

* videoio: fix buffer initialization

to avoid "munmap: Invalid argument" messages

5 years agocore: fix processing of vector-rows
Alexander Alekhin [Thu, 8 Nov 2018 15:42:53 +0000 (18:42 +0300)]
core: fix processing of vector-rows

5 years agorefactoring catching all exceptions as const ref
tompollok [Fri, 19 Oct 2018 20:21:20 +0000 (22:21 +0200)]
refactoring catching all exceptions as const ref

5 years agoRevert CV_TRY/CV_CATCH macros
Alexander Alekhin [Thu, 8 Nov 2018 16:46:25 +0000 (19:46 +0300)]
Revert CV_TRY/CV_CATCH macros

This reverts commit 7349b8f5cecfc6eb649b224e58da16d137c3c578 (partially).

5 years agoMerge pull request #13065 from dkurt:dnn_update_tf_faster_rcnn
Alexander Alekhin [Thu, 8 Nov 2018 16:31:38 +0000 (16:31 +0000)]
Merge pull request #13065 from dkurt:dnn_update_tf_faster_rcnn

5 years agoMerge pull request #13076 from berak:fix_digits_video_py
Alexander Alekhin [Thu, 8 Nov 2018 16:30:41 +0000 (16:30 +0000)]
Merge pull request #13076 from berak:fix_digits_video_py

5 years agoMerge pull request #13074 from alalek:cleanup_videoio
Alexander Alekhin [Thu, 8 Nov 2018 16:09:32 +0000 (19:09 +0300)]
Merge pull request #13074 from alalek:cleanup_videoio

5 years agoMerge pull request #13073 from alalek:cleanup_carbon
Alexander Alekhin [Thu, 8 Nov 2018 16:08:33 +0000 (19:08 +0300)]
Merge pull request #13073 from alalek:cleanup_carbon

5 years agoMerge pull request #13069 from alalek:move_viz_contrib
Alexander Alekhin [Thu, 8 Nov 2018 16:04:31 +0000 (19:04 +0300)]
Merge pull request #13069 from alalek:move_viz_contrib

5 years agoMerge pull request #13029 from alalek:move_videostab_contrib
Alexander Alekhin [Thu, 8 Nov 2018 16:03:14 +0000 (19:03 +0300)]
Merge pull request #13029 from alalek:move_videostab_contrib

5 years agoMerge pull request #11680 from alalek:videoio_deprecate_dshow_vfw
Alexander Alekhin [Thu, 8 Nov 2018 14:07:50 +0000 (14:07 +0000)]
Merge pull request #11680 from alalek:videoio_deprecate_dshow_vfw