1
0
mirror of https://github.com/opencv/opencv_contrib.git synced 2025-10-16 05:17:39 +08:00
Commit Graph

119 Commits

Author SHA1 Message Date
Tobias Senst
40b238b01d Merge pull request #2367 from tsenst:add_robust_interpolation_of_correspondence
Add RIC method for sparse match interpolation

* * add RIC

* sparse_match_interpolators EdgeAwareInterpolation - enhance limitation of the maximal number of matches to be interpolated from SHORT_MAX to INT_MAX by substituting short by int types

* * add RIC citation

* * update EdgeAwareInterpolatorImpl

* * add intermediate RIC implementation

* * implementation of new paralelization classes. First test where sucessfull.

* * update documentation RICInterpolatorImpl and RLOF

* * update CMakeLists.txt remove highgui
* add test for RIC
* add ASSERTION for curr image

* * add cost map interface

* * fix internal cost map allocation bug

* * remove white spaces
* fix warnings

* *fix compiler warnings

* * remove double whitespaces
* underscore from parameters
* substitute parallel_for_() classes with lambda functions
* remove complex assertion statements
* remove dead code
* substitute swap function with std::swap()
* ocv_define_module now contains video instead of tracking module

* * remove whitespace endings

* * documentation update

* * remove double declarations that lead to warnings

* * unrole tracker.py
*  remove double space
* use static for inner functions
* update create function
* modify mem init. to avoid manual memory management

* * uncomment parallel_for_ for parallelization

* * unrole unwanted changes
* uncomment paralellization

* * remove empty comment
* change CHECK to CHK_GD
* remove not necessary ;

* *documentation remove double space
2019-12-09 18:46:16 +03:00
Alexander Alekhin
35972a1ec4 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-11-18 07:19:57 +00:00
Alexander Alekhin
4c5f06128b build: GCC9 compilation 2019-11-12 18:50:43 +03:00
Alexander Alekhin
26129cfe69 Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-09-25 18:55:28 +03:00
Alexander Alekhin
1a15cbc9ae Merge pull request #2271 from alalek:build_cxx11_warnings 2019-09-24 22:09:18 +00:00
Maksim Shabunin
cdd19ebead backport: Fixed warnings produced by clang-9.0.0
83fc27cb99
2019-09-24 12:32:41 +03:00
Moeed
4f524db434 Merge pull request #2269 from shaikmoeed:hotfix/samples-motempl-python-update
* Fix bug: Invalid Syntax at line 14(draw_motion_comp method)

* Fix bug: TypeError- integer argument expected, got float

* Fix bug: clean up the camera by adding .release()
2019-09-23 18:51:31 +03:00
Alexander Alekhin
fd10a4626c Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-04-18 19:59:16 +03:00
Tobias Senst
7ac648c2bd Merge pull request #2097 from tsenst:robust_optical_flow_fix
optflow: RLOF fixes (python-binding, status flag, flat textures) (#2097)

* * Bugfix for python-binding related to issue #2094. Copying the prevPtsMat to prevPoints was broken, when using python-binding.

* * Connect the blurred image correctly to CROSS support region segmentation. This allows to compute more robust support region shapes. Commit refers to issue #2094.

* * Bugfix to avoid the unintended assertion on flat textures discussed in issue #2094.

* * Bugfix on SparseRLOFOpticalFlow status was wrongly to to 0 if forward backward error < threshold, which is wrong. Inequation has been corrected. Refers to in issue #2087.

* small documentation changes

* bugfix on assertions and small test changes
2019-04-17 22:12:11 +03:00
Alexander Alekhin
8fce7e9fa7 optflow: fix RLOF SR_CROSS check 2019-04-16 20:24:45 +00:00
berak
5bf98275f4 optflow: add a check for 3 channel images for sparse RLOF 2019-04-14 12:31:30 +02:00
Alexander Alekhin
33f18dd60b Merge remote-tracking branch 'upstream/3.4' into merge-3.4 2019-02-26 15:41:56 +03:00
Maksim Shabunin
b6767ccc43 Merge pull request #2011 from mshabunin:enable-narrowing-warning
* Fixed type narrowing issues
2019-02-26 13:15:23 +03:00
tsenst
1c9e23745c Merge pull request #1940 from tsenst:add_robust_optical_flow_implementation
Add robust local optical flow (RLOF) implementations (#1940)

* Add robust local optical flow (RLOF) implementations which is an improved pyramidal iterative Lucas-Kanade approach. This implementations contains interfaces for sparse optical flow for feature tracking and dense optical flow based on sparse-to-dense interpolation schemes.
Add performance and accuracy tests have been implementation as well as documentation with the related publications

* - exchange tabs with spaces
- fix optflow.bib indentation
- remove optflow_o.hpp
- change RLOFOpticalFlowParameter interfaces to Ptr<RLOFOpticalFlowParameter>
to remove error on building. Fix warnings

* introducing precompiler flag RLOD_SSE

* remove header that could not be found

* remove whitespaces
fix perf and accuracy tests

* remove x86intrin.h header

* fix ios and arm by removing last sse commands

* fix warnings for windows compilation

* fix documentation RLOFOpticalFlowParameter

* integrate cast to remove last warnings

* * add create method and function inferfaces to RLOFOpticalFlowParamter to enable python wrapper interfaces

* white space fixes / coding style

* fix perf test

* other changes: precomp.hpp / static

* use Matx44f and Vec4f instead of Mat

* normSigmas into constants

* replace ceil() calls

* maximum level is set to 5 so that it is similar value used in the papers

* implement paralellized horizontal cross segmentation as used in Geistert2016

* drop dead code

* Avoid using "data" and "step" calculations. Use .ptr<mat_type>(row, col) instead.

* Avoid using "data" and "step" calculations. Use .ptr<mat_type>(row, col) instead.

* bugfix on BEPLK with ica and adapt the accuracy tests

* more 'static' functions

* bugfix after changing ptr + step to .ptr(y,x) calls by adjusting ROI of
prevImage, currImage and derivI as well as changing the offset of the
points in the invoker classes.

* add some static_cast to avoid warning

* remove 50 grid size sample from perf test. This grid size is to sparse
for the epic interpolation

* remove notSameColor function since it is not used anymore
2018-12-30 13:10:21 +03:00
tompollok
9e5926200e use #if instead of #ifdef for CV_SIMD128 2018-11-11 23:22:51 +01:00
Alexander Alekhin
2f516f1af3 Merge pull request #1896 from alalek:docs_fix_bib_Kroeger2016
docs: fix Kroeger2016 bib reference

move from opencv_contrib
2018-11-10 20:12:28 +03:00
Vadim Pisarevsky
dbfa4d7228 TVL1 optical flow example moved from opencv to opencv_contrib 2018-11-09 16:10:57 +03:00
Vadim Pisarevsky
2cc5ead103 moved DIS optical flow from opencv_contrib to opencv, moved TVL1 from opencv to opencv_contrib 2018-11-09 00:48:48 +03:00
Vadim Pisarevsky
4cf4cb099b fixed compile error with the new C++ persistence in contrib (#1864) 2018-11-02 00:27:32 +03:00
Alexander Alekhin
c94997ec4f fix includes 2018-10-25 14:24:56 +03:00
Hamdi Sahloul
c880b7ea4d Utilize CV_UNUSED macro 2018-09-07 19:52:08 +09:00
Alexander Alekhin
1070e7042a Merge pull request #1733 from cv3d:minor/umat_getmat_access 2018-08-24 06:45:02 +00:00
Hamdi Sahloul
271f2bcf86 UMat::getMat(): Utilize ACCESS_READ instead of 0 2018-08-24 06:03:39 +09:00
trobro
ac7d1ca613 optflow: is depending on opencv_flann 2018-08-09 22:06:13 +02:00
Alexander Alekhin
fc69aa57bc opencv: use cv::AutoBuffer<>::data() 2018-06-13 19:11:18 +00:00
Vitaly Tuzov
1bcb634a12 Fixed coarse scale evaluation for DIS optical flow estimator 2018-05-15 13:22:51 +03:00
Alexander Alekhin
b8de57f8bd cleanup unnecessary setNumThreads() calls 2018-04-28 14:53:50 +03:00
Alexander Alekhin
036e699553 samples: apply CV_OVERRIDE/CV_FINAL 2018-03-28 17:25:51 +03:00
Alexander Alekhin
0aaaba08af optflow: apply CV_OVERRIDE/CV_FINAL 2018-03-28 16:49:59 +03:00
Alexander Alekhin
af58e08ee2 build: fix C++17 build 2018-02-08 18:00:59 +03:00
Alexander Alekhin
edfdf12c31 tests: refactor test files 2018-02-02 19:15:28 +03:00
Vadim Pisarevsky
53986aaa7d Merge pull request #996 from mshabunin:cmakeex 2017-12-15 10:47:38 +00:00
Vadim Pisarevsky
e53977f64b Merge pull request #1482 from terfendail:bitexact_resize 2017-12-14 20:48:10 +00:00
Vitaly Tuzov
8c394a4f2e Updated internal calls to linear resize to use bit-exact version 2017-12-14 13:00:09 +03:00
Alexander Alekhin
57ff363389 python: 'cv2.' -> 'cv.' via 'import cv2 as cv' 2017-12-11 16:14:46 +03:00
Maksim Shabunin
18a5391672 Fixed exports and removed contrib_world 2017-12-04 14:12:23 +03:00
Alexander Alekhin
b556c2a7c3 build: migrate to traits::Type / traits::Depth 2017-08-25 19:07:05 +03:00
Alexander Alekhin
b1408e33b0 Merge pull request #1292 from VladX:gpc_fix 2017-07-24 16:43:34 +00:00
Vladislav Samsonov
3442a8deee Handle incorrect flow vectors in gpc_evaluate; fixes opencv/opencv#9183 2017-07-24 19:05:45 +03:00
Vladislav Samsonov
617db6c4fe Fixed bug inside GPCDetails::dropOutliers(); fixes opencv/opencv#9220 2017-07-24 18:42:41 +03:00
Diego
fbbda575de Fixed loop in buildPyramid in deepflow.cpp
The while loop in member function buildPyramid in deepflow.cpp terminated as a result of the break statement and never as a result of the termination criteria because the "i" variable in the while loop was never incremented.

Changed the while loop into a for loop

Changed the while loop into a for loop in the member function buildPyramid in deepFlow.cpp

removed trailing whitespace
2017-06-13 20:53:17 -07:00
Yuriy Obukh
41559d7481 Some changes to make VS2010 compiler happy. 2017-06-02 23:47:04 +03:00
LaurentBerger
64b3bbb620 solve issue 1165 2017-05-18 15:59:40 +02:00
Alexander Alekhin
3a43af8131 Merge pull request #1080 from pengli:dis_optflow 2017-03-27 19:35:07 +00:00
Li Peng
6f907c3347 add dis optical flow sample app
it takes a video file as input and shows colored optical flow.

Signed-off-by: Li Peng <peng.li@intel.com>
2017-03-24 10:40:31 +08:00
Maksim Shabunin
f8807f18cd Reduced modules dependencies:
- made some of dependencies explicit
- removed dependencies to highgui and some other modules where possible
- modified some samples to build without modules
2017-03-15 18:00:21 +03:00
Li Peng
7ed6f77840 OCL implementation of DIS optical flow
This patch adds ocl kernels to accelerate Dense Inverse Search
based optical flow algorithm, it acclerates 3 parts in the algorithm,
including 1) Structure tensor elements compute, 2) Patch inverse search,
3) Densification compute.

Perf and accuracy test are also added. The perf test shows it is 30%
faster than the current implementation.

Signed-off-by: Li Peng <peng.li@intel.com>
2017-03-15 10:02:02 +08:00
berak
3f7e74db85 fix misplaced break statement 2017-02-28 08:43:13 +01:00
Alexander Alekhin
eae4d78748 misc: minor fix in license header 2016-12-16 17:12:18 +03:00
Alexander Alekhin
c47b0ea23c Merge pull request #828 from alalek:fix_optflow
optflow: fix test failure

MSVS2013:
- DenseOpticalFlow_GlobalPatchColliderDCT.ReferenceAccuracy
- DenseOpticalFlow_GlobalPatchColliderWHT.ReferenceAccuracy
2016-10-21 21:18:54 +03:00