projects / platform / upstream / opencv.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 841741a) | patch
Merge pull request #13084 from vpisarev:shuffle_optflow_algos
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Fri, 9 Nov 2018 14:52:06 +0000 (17:52 +0300)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Fri, 9 Nov 2018 14:52:06 +0000 (17:52 +0300)
commit96bf26611e5c512ce39a5ac302fd2a132b7d1df4
tree852f62ad6b5b62da182f69f6e90e1bb8771ec270tree | snapshot
parent841741aa524e7f63c95f5b2fd631231453788b36commit | diff
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
23 files changed:
modules/video/include/opencv2/video/tracking.hpp diff | blob | history
modules/video/perf/opencl/perf_dis_optflow.cpp [new file with mode: 0644] blob
modules/video/perf/opencl/perf_optflow_dualTVL1.cpp [deleted file] blob | history
modules/video/perf/perf_disflow.cpp [new file with mode: 0644] blob
modules/video/perf/perf_precomp.hpp diff | blob | history
modules/video/perf/perf_tvl1optflow.cpp [deleted file] blob | history
modules/video/perf/perf_variational_refinement.cpp [new file with mode: 0644] blob
modules/video/src/dis_flow.cpp [new file with mode: 0644] blob
modules/video/src/opencl/dis_flow.cl [new file with mode: 0644] blob
modules/video/src/opencl/optical_flow_tvl1.cl [deleted file] blob | history
modules/video/src/optical_flow_io.cpp [new file with mode: 0644] blob
modules/video/src/tvl1flow.cpp [deleted file] blob | history
modules/video/src/variational_refinement.cpp [new file with mode: 0644] blob
modules/video/test/ocl/test_dis.cpp [new file with mode: 0644] blob
modules/video/test/ocl/test_optflow_tvl1flow.cpp [deleted file] blob | history
modules/video/test/test_OF_accuracy.cpp [new file with mode: 0644] blob
modules/video/test/test_OF_reproducibility.cpp [new file with mode: 0644] blob
modules/video/test/test_precomp.hpp diff | blob | history
modules/video/test/test_tvl1optflow.cpp [deleted file] blob | history
samples/cpp/dis_opticalflow.cpp [new file with mode: 0644] blob
samples/cpp/tvl1_optical_flow.cpp [deleted file] blob | history
samples/python/dis_opt_flow.py [new file with mode: 0755] blob
samples/tapi/dense_optical_flow.cpp diff | blob | history
Domain: Multimedia / Media Vision;