Commit Graph

9485 Commits

Author SHA1 Message Date
Andrey Pavlenko
7193762d2d Merge pull request #2495 from ilya-lavrenov:tapi_flip 2014-03-21 16:08:46 +04:00
Andrey Pavlenko
d18ebfa8e8 Merge pull request #2500 from akarsakov:hog_intel_fix 2014-03-21 16:02:49 +04:00
Ilya Lavrenov
2875ce60ea added 3-channels support to optimized version 2014-03-21 16:02:47 +04:00
Andrey Pavlenko
fe5eaae102 adding missing include (fixing 'no ocl implementation' error) 2014-03-21 14:30:49 +04:00
Alexander Smorkalov
846266fde4 Native camera fix for some deivices with Qualcomm SoC like Samsung Galaxy S4. 2014-03-21 14:16:03 +04:00
Alexander Karsakov
0bd4fd3a87 Workaround for Intel platform: replace min() with ternary operator 2014-03-21 09:33:00 +04:00
Andrey Pavlenko
b7198ccf1c dropping legacy modes testing 2014-03-20 22:30:16 +04:00
Andrey Pavlenko
640e180efe switching to CV_HAAR_SCALE_IMAGE mode, enabling test 2014-03-20 22:22:55 +04:00
Andrey Pavlenko
d060d30fa0 enabling OCL LBP branch for all devices 2014-03-20 21:57:34 +04:00
Andrey Pavlenko
bdfd29a0b8 Merge pull request #2496 from ilya-lavrenov:tapi_imgproc 2014-03-20 19:20:15 +04:00
mlyashko
80a40ae3d7 changed epsilon for test pass on Win32 2014-03-20 16:15:43 +04:00
Andrey Pavlenko
9c7ba6db90 Merge pull request #2490 from ilya-lavrenov:ocl_sep_filters 2014-03-20 13:54:27 +04:00
Andrey Pavlenko
2299e2ed1b Merge pull request #2494 from ilya-lavrenov:tapi_merge 2014-03-20 13:39:39 +04:00
Andrey Pavlenko
87ae0f9990 Merge pull request #2492 from KonstantinMatskevich:ocl_fix_wrongdevice 2014-03-20 13:39:17 +04:00
Ilya Lavrenov
63d8a61b9b enabled 3-channels support for cv::createSuperResolution_BTVL1 2014-03-20 13:31:20 +04:00
Alexander Karsakov
b14c314fc3 Fixed incorrect thread synchronizations 2014-03-20 13:03:03 +04:00
Roman Donchenko
68c57a1e82 Merge pull request #2473 from euphrat:mog2_weight_bugfix 2014-03-20 12:40:23 +04:00
Ilya Lavrenov
eb8b4c58c7 fixed bug in cv::ocl::predictOptimalVectorWidth 2014-03-20 00:28:21 +04:00
krodyush
65d64af2a8 ocl_calcOpticalFlowPyrLK optimizations
1. decrease branch number in CL code by replacing them into weights
2. decrease local mem pressure in reduce operation by using private variables
3. decrease image sampler pressure by caching data into local memory
4. remove unnecessary sync point on the HOST side.
2014-03-19 19:31:14 +04:00
Ilya Lavrenov
291458a859 generalized OpenCL version of cv::sepFilter2D; removed some restrictions and added 3-channels support 2014-03-19 18:56:16 +04:00
Alexander Karsakov
30a8308f8e Enabled Intel-specific optimizations for HOG detector. 2014-03-19 17:30:13 +04:00
Ilya Lavrenov
b449b0bf71 simplified cv::sepFilter2D OpenCL part 2014-03-19 15:59:00 +04:00
Roman Donchenko
a1e5bd71f1 Merge pull request #2446 from asmorkalov:ocv_implicit_cuda_control 2014-03-19 14:49:22 +04:00
Ilya Lavrenov
b73490f86c eliminated restriction src[i].channels() == 1 in cv::merge 2014-03-19 13:56:31 +04:00
Andrey Pavlenko
a2dec6c34e Merge pull request #2493 from ilya-lavrenov:tapi_fnlm 2014-03-19 12:56:11 +04:00
Konstantin Matskevich
f9f730c426 update error message 2014-03-19 12:14:48 +04:00
Ilya Lavrenov
04884ebf45 added 3-channels support to cv::setIdentity 2014-03-19 01:53:53 +04:00
Ilya Lavrenov
d1cfcfcafd added 3-channels support to morphology operations 2014-03-18 20:15:11 +04:00
Ilya Lavrenov
8d97d0d631 added 3-channels support to cv::flip 2014-03-18 19:31:37 +04:00
Firat Kalaycilar
0a16d93e1d Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in the CUDA and OCL versions of BackgroundSubtractorMOG2 2014-03-18 17:26:24 +02:00
Koji Miyazato
a43ef9a6cd WriteStructContext treats state of fs 2014-03-18 23:29:30 +09:00
Alexander Smorkalov
b4e4f13f9e Superres module enabled for Android. GPU samples build fixed for Android. 2014-03-18 17:07:19 +04:00
Roman Donchenko
b70332d806 Merge pull request #1986 from GregoryMorse:patch-3 2014-03-18 16:18:33 +04:00
Firat Kalaycilar
4d9698a4cf Merge branch '2.4' of git://github.com/Itseez/opencv into mog2_weight_bugfix 2014-03-18 14:00:30 +02:00
Andrey Pavlenko
6e44f05e6f Merge pull request #2464 from KonstantinMatskevich:ocl_stereobm_experiment 2014-03-18 15:53:09 +04:00
Konstantin Matskevich
eebf92ba58 fix for incorrect opencl device selection 2014-03-18 15:47:35 +04:00
Roman Donchenko
bff92da970 Merge pull request #2488 from Nerei:minor_doc 2014-03-18 15:41:20 +04:00
Roman Donchenko
d76226e21b Merge pull request #2456 from kurodash:pr_use_cvAlloc 2014-03-18 14:39:40 +04:00
Ilya Lavrenov
6fe71bd27c added 4 channels support to fnlm 2014-03-18 14:29:02 +04:00
Roman Donchenko
ae2b0b0098 Merge pull request #2486 from SpecLad:merge-2.4 2014-03-18 13:55:57 +04:00
Roman Donchenko
bfb1ba371c Merge pull request #2026 from pemmanuelviel:giveFurthestPoint 2014-03-18 13:40:44 +04:00
Ilya Lavrenov
82e6edfba2 optimized sep filter 2014-03-18 00:16:38 +04:00
Ilya Lavrenov
3940b6163b remove intel guard since the code is 2 times faster on AMD too 2014-03-17 19:11:21 +04:00
yash
51cb6998ea made the example consistent with the fuction definition and improved doc
made the example consistent with the fuction definition and improved doc
2014-03-17 18:44:02 +05:30
Anatoly Baksheev
0c02e5de25 minor doc fix 2014-03-17 17:02:49 +04:00
vbystricky
6890aa0033 Fix problems on Intel HD graphics 2014-03-17 16:03:15 +04:00
Roman Donchenko
40a740ff88 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/imgproc/src/opencl/precornerdetect.cl
	modules/nonfree/perf/perf_main.cpp
	modules/nonfree/perf/perf_surf.ocl.cpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/gftt.cpp
	modules/ocl/src/opencl/arithm_bitwise.cl
	modules/ocl/src/opencl/arithm_bitwise_binary_scalar_mask.cl
	modules/ocl/src/opencl/arithm_minMax.cl
	modules/ocl/src/opencl/arithm_nonzero.cl
	modules/ocl/src/opencl/arithm_sum.cl
	modules/ocl/test/test_arithm.cpp
	modules/viz/src/precomp.hpp
	modules/viz/src/vizcore.cpp
	modules/viz/src/vtk/vtkCloudMatSink.h
	modules/viz/src/vtk/vtkXYZReader.cpp
	modules/viz/src/vtk/vtkXYZReader.h
	modules/viz/test/test_precomp.hpp
2014-03-17 14:14:07 +04:00
Andrey Pavlenko
dc28451b8a Merge pull request #2479 from alalek:ocl_compare_scalar 2014-03-17 14:04:22 +04:00
Andrey Pavlenko
2a1d5c6d43 Merge pull request #2428 from alalek:ocl_copyMakeBorder_3channels 2014-03-17 13:10:34 +04:00
Alexander Alekhin
af062b7c42 ocl: compare: remove useless perf tests 2014-03-17 12:33:12 +04:00
Roman Donchenko
882971151d Merge pull request #2485 from Nerei:viz_correct_viewer_pose 2014-03-17 11:59:14 +04:00
Roman Donchenko
136e5eb804 Merge pull request #2484 from berak:mat_doc_24 2014-03-17 11:57:10 +04:00
Konstantin Matskevich
1a43ed9893 finalizing 2014-03-17 10:42:19 +04:00
Anatoly Baksheev
24d8cbf940 Viz::setViewerPose() - changed up-vector to down (common for Computer Vision & Odometry) 2014-03-16 20:07:05 +04:00
berak
80708008a4 missing () on Mat::type() 2014-03-16 14:04:05 +01:00
Alexander Alekhin
7ce2ca2e0c ocl: workaround for Pow accuracy test failure 2014-03-14 19:51:19 +04:00
Alexander Alekhin
9cafd50160 ocl: fixes 2014-03-14 19:51:19 +04:00
Alexander Alekhin
755ca4b7cf ocl: compare with scalar 2014-03-14 19:51:19 +04:00
Andrey Pavlenko
dd6cf15a39 Merge pull request #2481 from akarsakov:fix_hog_intel 2014-03-14 19:17:03 +04:00
Andrey Pavlenko
bcb938efbb Merge pull request #2483 from ilya-lavrenov:tapi_3_vs_4 2014-03-14 19:14:35 +04:00
Andrey Pavlenko
c72a0a1295 Merge pull request #2482 from ilya-lavrenov:tapi_fix 2014-03-14 19:08:07 +04:00
Andrey Pavlenko
6b434befc9 Merge pull request #2480 from vpisarev:ocl_orb 2014-03-14 19:04:19 +04:00
Konstantin Matskevich
af1084eb58 speedUp 2014-03-14 18:00:13 +04:00
Konstantin Matskevich
91e4334227 temp 2014-03-14 18:00:12 +04:00
Konstantin Matskevich
18a59b48ba fixes 2014-03-14 18:00:12 +04:00
Konstantin Matskevich
ddc235172e new approach 2014-03-14 18:00:11 +04:00
Konstantin Matskevich
a5d989f346 new attempt 2014-03-14 18:00:11 +04:00
Konstantin Matskevich
799d7e7a50 bad experiment =( 2014-03-14 18:00:10 +04:00
Konstantin Matskevich
0904f10ab5 optimizations 2014-03-14 18:00:10 +04:00
Konstantin Matskevich
bfc843a5f5 added optimization 2014-03-14 18:00:09 +04:00
Konstantin Matskevich
b5f717b6b3 stereoBM 2014-03-14 18:00:09 +04:00
Ilya Lavrenov
6f12f1b3b5 added 3 vs 4 channels performance tests 2014-03-14 17:30:14 +04:00
Ilya Lavrenov
6be7869ae8 fix for unsupported doubles 2014-03-14 16:54:52 +04:00
Roman Donchenko
4a4151ec97 Merge pull request #2474 from akarsakov:fix_getpolicy 2014-03-14 15:17:45 +04:00
Alexander Karsakov
4698d62125 Removed workaround for Intel platform. 2014-03-14 14:18:52 +04:00
Alexander Karsakov
8910508b83 Fixed getPolicy() method to make it thread-safe. 2014-03-14 13:50:33 +04:00
kuroda sho
f9484bae8a fix: use "cvAlloc" wrapper function for malloc. 2014-03-14 17:09:08 +09:00
Ilya Lavrenov
b47bec2ed0 performance tests for ORB 2014-03-13 23:30:02 +04:00
Vadim Pisarevsky
4fafab3786 fixed extra whitespace 2014-03-13 23:18:41 +04:00
Vadim Pisarevsky
42e604abea fixed bug in FAST 2014-03-13 23:17:28 +04:00
Vadim Pisarevsky
3e854fa6e5 finished OpenCL port of ORB 2014-03-13 22:56:53 +04:00
Ilya Lavrenov
61c347fb76 typos 2014-03-13 22:56:46 +04:00
Ilya Lavrenov
357a856cf6 nonfree perf tests 2014-03-13 22:35:08 +04:00
Ilya Lavrenov
6f76e7b42d improved performance of bitwise ops 2014-03-13 19:42:13 +04:00
Andrey Pavlenko
0ce8f1d5dd Merge pull request #2477 from alalek:ocl_cleanup_workarounds 2014-03-13 18:55:28 +04:00
Andrey Pavlenko
c5bf1c108c Merge pull request #2470 from ilya-lavrenov:tapi_reduction 2014-03-13 18:42:01 +04:00
Andrey Pavlenko
4233539617 Merge pull request #2469 from alalek:ocl_pyrUp_pyrDown_3channels 2014-03-13 18:37:05 +04:00
Ilya Lavrenov
adc15c2bba improved performance of cv::ocl::sum 2014-03-13 17:33:18 +04:00
Andrey Pavlenko
a6c40abfb2 Merge pull request #2466 from ilya-lavrenov:tapi_transpose_3cn 2014-03-13 16:56:01 +04:00
Andrey Pavlenko
0764a23eb2 Merge pull request #2459 from ilya-lavrenov:tapi_experiments 2014-03-13 16:49:57 +04:00
Andrey Pavlenko
6b6cfa893d Merge pull request #2382 from ilya-lavrenov:tapi_nlmeans 2014-03-13 16:48:38 +04:00
Alexander Alekhin
48196ad10b ocl: cleanup workarounds 2014-03-13 15:46:38 +04:00
Ilya Lavrenov
3ebfe60008 improved performance of cv::ocl::countNonZero 2014-03-13 15:35:53 +04:00
Ilya Lavrenov
8e79de35a8 changes for GFTT 2014-03-13 14:57:13 +04:00
Koji Miyazato
b96762a48f Fix for bug #3599: cv::FileStorage does not work for std::vector of user-defined struct. 2014-03-13 19:41:13 +09:00
Ilya Lavrenov
a5afcd9f11 improved performance of cv::ocl::minMax 2014-03-13 14:35:12 +04:00
Roman Donchenko
553673eeed Merge pull request #2468 from mlyashko:back_proj_fix 2014-03-13 13:42:20 +04:00
Roman Donchenko
fd8f2c8d23 Merge pull request #2463 from ziyangli:master 2014-03-12 18:51:41 +04:00
Firat Kalaycilar
a87607e3ef Fixed an issue with weight assignment causing the resulting GMM weights to be unsorted in BackgroundSubtractorMOG2 2014-03-12 16:14:59 +02:00
Roman Donchenko
836635d2d5 Merge pull request #2434 from Nerei:viz_continue 2014-03-12 16:53:42 +04:00
Anatoly Baksheev
4d7a593c25 minor cmake fix fo macos 2014-03-12 16:22:22 +04:00
Ilya Lavrenov
9932cf41a4 3-channel reduction operations 2014-03-12 15:07:39 +04:00
Alexander Alekhin
dca401d4cc ocl: pyrUp/pyrDown 3-channel 2014-03-12 14:39:55 +04:00
ziyangli
bbe8654c3d cleanup 2014-03-12 18:16:54 +08:00
Ziyang LI
4f5896493e remove a whitepace 2014-03-12 18:14:43 +08:00
Ilya Lavrenov
f138b613b7 cv::compare 2014-03-12 13:16:33 +04:00
mlyashko
5252aa8fdd added data type check for back projection fix 2014-03-12 11:30:28 +04:00
Ilya Lavrenov
89b7c0dd93 3 channel support to cv::transpose 2014-03-12 00:17:11 +04:00
Ilya Lavrenov
2755ae5df9 experiments 2014-03-11 23:03:55 +04:00
Roman Donchenko
1bb0c5747c Merge pull request #2462 from ibtaylor:fix_deblurring_calcBlurriness_var_name_typo 2014-03-11 17:41:18 +04:00
Roman Donchenko
95a55453df Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/calib3d/perf/perf_pnp.cpp
	modules/contrib/src/imagelogpolprojection.cpp
	modules/contrib/src/templatebuffer.hpp
	modules/core/perf/opencl/perf_gemm.cpp
	modules/cudafeatures2d/doc/feature_detection_and_description.rst
	modules/cudafeatures2d/perf/perf_features2d.cpp
	modules/cudafeatures2d/src/fast.cpp
	modules/cudafeatures2d/test/test_features2d.cpp
	modules/features2d/doc/feature_detection_and_description.rst
	modules/features2d/include/opencv2/features2d/features2d.hpp
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/perf4au/main.cpp
	modules/imgproc/perf/opencl/perf_blend.cpp
	modules/imgproc/perf/opencl/perf_color.cpp
	modules/imgproc/perf/opencl/perf_moments.cpp
	modules/imgproc/perf/opencl/perf_pyramid.cpp
	modules/objdetect/perf/opencl/perf_hogdetect.cpp
	modules/ocl/perf/perf_arithm.cpp
	modules/ocl/perf/perf_bgfg.cpp
	modules/ocl/perf/perf_blend.cpp
	modules/ocl/perf/perf_brute_force_matcher.cpp
	modules/ocl/perf/perf_canny.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/perf/perf_gftt.cpp
	modules/ocl/perf/perf_haar.cpp
	modules/ocl/perf/perf_imgproc.cpp
	modules/ocl/perf/perf_imgwarp.cpp
	modules/ocl/perf/perf_match_template.cpp
	modules/ocl/perf/perf_matrix_operation.cpp
	modules/ocl/perf/perf_ml.cpp
	modules/ocl/perf/perf_moments.cpp
	modules/ocl/perf/perf_opticalflow.cpp
	modules/ocl/perf/perf_precomp.hpp
	modules/ocl/src/cl_context.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/video/src/lkpyramid.cpp
	modules/video/src/precomp.hpp
	samples/gpu/morphology.cpp
2014-03-11 17:20:01 +04:00
Andrey Pavlenko
702a2a6ff6 Merge pull request #2373 from mlyashko:optflow_dualtvl1 2014-03-11 16:00:22 +04:00
Andrey Pavlenko
5261fbe217 Merge pull request #2387 from alalek:ocl_remap_3cn 2014-03-11 15:59:12 +04:00
Andrey Pavlenko
90c5dde887 Merge pull request #2455 from ilya-lavrenov:tapi_fix 2014-03-11 15:58:32 +04:00
Ilya Lavrenov
9b31e6cd44 changes according to reviewer's suggestions 2014-03-11 15:40:31 +04:00
Andrey Pavlenko
0084dee05b Merge pull request #2448 from akarsakov:ocl_cxt_termination 2014-03-11 12:57:29 +04:00
Ilya Lavrenov
3eff05e3eb added performance tests for cv::ocl::calcHist 2014-03-11 12:34:27 +04:00
Alexander Alekhin
e7475bff68 TAPI: remap 3-channel 2014-03-10 20:35:10 +04:00
Alexander Alekhin
e4608229f0 ocl: copyMakeBorder 3-channel 2014-03-10 17:22:49 +04:00
Ziyang LI
786e3b9eee Moved x = 0 into the parenthesis
Easier to understand
2014-03-10 17:33:13 +08:00
Ian Taylor
45969bb3ae fix variable name typo in calcBlurriness 2014-03-10 03:02:06 -04:00
Ilya Lavrenov
208831eb5d optimized cv::calcHist 2014-03-08 12:24:31 +04:00
Vadim Pisarevsky
efdfca7a11 do not use the large "score" buffer; now without non-max suppression OpenCL FAST is pretty efficient 2014-03-07 18:55:45 +04:00
Roman Donchenko
70e22b682d Merge pull request #2397 from vbystricky:intelperc 2014-03-07 18:19:00 +04:00
Vadim Pisarevsky
06c138bd64 make the correctness test pass 2014-03-07 18:18:10 +04:00
vbystricky
193e97a34a Move declaration of IVideoCapture class into precomp.hpp, make some methods of IVideoCapture pure virtual 2014-03-07 16:25:15 +04:00
kurodash
0eaeff0641 fix: use "cvAlloc" wrapper function for malloc. 2014-03-07 19:02:37 +09:00
Andrey Pavlenko
2879ff2098 Merge pull request #2437 from ilya-lavrenov:tapi_morph 2014-03-07 14:00:09 +04:00
Andrey Pavlenko
5dbe73f94d Merge pull request #2438 from ilya-lavrenov:tapi_flip 2014-03-07 13:54:34 +04:00
Andrey Pavlenko
182d74d33f Merge pull request #2441 from akarsakov:ocl_platform_vendor 2014-03-07 13:54:13 +04:00
Andrey Pavlenko
451be9ed53 Merge pull request #2444 from ilya-lavrenov:tapi_gftt 2014-03-07 13:53:43 +04:00
Andrey Pavlenko
3cb49eac49 Merge pull request #2451 from ilya-lavrenov:tapi_fast_covar_data 2014-03-07 13:52:47 +04:00
Andrey Pavlenko
8f3492851e Merge pull request #2453 from ilya-lavrenov:tapi_sobel 2014-03-07 13:51:37 +04:00
Alexander Karsakov
8660588fe9 Pass vendor macro to opencl kernel 2014-03-07 12:57:29 +04:00
mlyashko
eb2e8a11fa changed kernel.set to support unsuccssful set 2014-03-07 11:15:54 +04:00
Ilya Lavrenov
0e2cc5ef63 fix bitwise ops and mask support 2014-03-06 23:39:05 +04:00
Andrey Pavlenko
d1d451c952 Merge pull request #2431 from ilya-lavrenov:tapi_perf 2014-03-06 22:17:44 +04:00
Andrey Pavlenko
229aa62300 Merge pull request #2445 from ilya-lavrenov:ocl_perf 2014-03-06 22:03:01 +04:00
Andrey Pavlenko
2f0fe5b87b Merge pull request #2450 from ilya-lavrenov:tapi_test 2014-03-06 21:55:50 +04:00
Vadim Pisarevsky
8e1918e86e added OpenCL-accelerated(?) FAST; for now the tests fail :( 2014-03-06 18:04:04 +04:00
Ilya Lavrenov
dc76e6b4a1 added new dtypes to cv::Sobel 2014-03-06 17:57:13 +04:00
Ilya Lavrenov
4a7289b22f improved cv::preCornerDetect 2014-03-06 17:40:02 +04:00
Ilya Lavrenov
d9c5fbc9ba disable SURF 2014-03-06 16:49:22 +04:00
Alexander Karsakov
806e9241a6 Clarifying comments 2014-03-06 16:44:46 +04:00
Ilya Lavrenov
1291bd1c4a ported fast calculation of covar data 2014-03-06 15:40:27 +04:00
Ilya Lavrenov
f404315368 test for clEnqueueReadBufferRect 2014-03-06 12:11:46 +04:00
mlyashko
66ed6a8a50 macro for normal return from thriveless kernel.set 2014-03-06 11:43:01 +04:00
Alexander Smorkalov
b3e18d23a3 Implicit CUDA and OpenCL control for module definition added.
Feature allows to exclude CUDA or OpenCL optimizations at all even CUDA is used
on build. Exclusion of CUDA or OpenCL cut unwanted dependencies.
2014-03-06 10:31:33 +04:00
Ilya Lavrenov
f7a474180b tuned some tests 2014-03-06 09:24:02 +04:00
Ilya Lavrenov
86a3ed4162 improved performance of GFTT 2014-03-06 09:19:40 +04:00
Anatoly Baksheev
fde0185a77 iteractor work 2014-03-06 03:26:21 +04:00
Vadim Pisarevsky
22f42a639f fixed doc builder warnings; make sure the tests give reasonable results when OpenCL is not available 2014-03-05 18:48:19 +04:00
Alexander Karsakov
4aa891e773 Remove clReleaseDevice call (workaround for pure virtual call on Windows) 2014-03-05 17:57:06 +04:00
Vadim Pisarevsky
60ce2b2e9f modified SURF's performance test to test OpenCL version as well 2014-03-05 17:10:51 +04:00
Vadim Pisarevsky
da70b04262 made SURF_OCL default constructor parameters the same as SURF 2014-03-05 17:04:49 +04:00
Vadim Pisarevsky
3c1917771b modified OpenCL SURF API and the tests in 2.4.x to prove that it gives different from CPU results 2014-03-05 16:31:41 +04:00
Alexander Karsakov
c1dad2178c Added Device:: isAMD,isIntel,isNvidia methods. 2014-03-05 14:43:11 +04:00
vbystricky
d4a1df85be Change text of copyright 2014-03-05 13:06:36 +04:00
vbystricky
f9e942f9ef Change text of license and copyright 2014-03-05 11:03:57 +04:00
Dave Hughes
b184d7f27b Fix for #3554
v4l2_scan_controls_enumerate_menu is unused and causes ioctl error on
RaspberryPi and possibly other Video4Linux variants. See
http://www.raspberrypi.org/forum/viewtopic.php?f=43&t=65026 for more
detail.
2014-03-05 02:44:40 +00:00
Cody Rigney
a80ebfe28d Master Version: Added NEON Optimizations for LK Optical Flow. 2014-03-04 14:47:12 -05:00
Andrey Pavlenko
0a3aca230c Merge pull request #2436 from ilya-lavrenov:tapi_dft_fix 2014-03-04 19:21:15 +04:00
Andrey Pavlenko
ba4513503e Merge pull request #2429 from ilya-lavrenov:master_compatible_tests 2014-03-04 19:18:13 +04:00
Andrey Pavlenko
c9d8025fab Merge pull request #2391 from ilya-lavrenov:tapi_match_template 2014-03-04 18:50:14 +04:00
Andrey Pavlenko
c00f0faf24 Merge pull request #2408 from ilya-lavrenov:tapi_core_opt 2014-03-04 18:37:26 +04:00
Roman Donchenko
5527f2872d Merge pull request #2409 from juanmanpr:master 2014-03-04 15:32:13 +04:00
Roman Donchenko
b5248dbf3f Merge pull request #2407 from codyrigney92:LKOptFlow_NEON 2014-03-04 15:30:26 +04:00
Roman Donchenko
fa3f29f2b5 Merge pull request #2439 from ilya-lavrenov:typo 2014-03-04 13:51:31 +04:00
Ilya Lavrenov
099ea91823 typos 2014-03-04 12:47:40 +04:00
Roman Donchenko
0692a674d1 Merge pull request #2381 from ElenaGvozdeva:ipp_resize 2014-03-04 11:49:02 +04:00
Roman Donchenko
a600267b9f Merge pull request #2432 from ilya-lavrenov:summary_py 2014-03-04 11:46:29 +04:00
mlyashko
5c867463d2 changed localsize to NULL (reviewers comment) 2014-03-04 11:36:47 +04:00
Hilton Bristow
72d5609a36 Merged upstream master 2014-03-04 11:14:03 +10:00
GregoryMorse
90920c2376 Update cap_msmf.cpp
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.

Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.

My discussion and proposal to finish this change:
 Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.

ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.

The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.

It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.

Update cap_msmf.cpp

Fixed bugs and completed the change.  I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction).  Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it).  Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled).  After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft.  This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration.  Better to document that it is not supported.

Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.

The remaining changes are not difficult and will be complete soon along with debug tracing messages.

Update cap_msmf.cpp

Create cap_msmf.h

Update cap_msmf.cpp

Update cap_msmf.h

Update cap_msmf.cpp

Update cap_msmf.h

Update and rename cap_msmf.h to cap_msmf.hpp

Update cap_msmf.cpp

Update CMakeLists.txt

Update cap_msmf.hpp

Update cap_msmf.cpp

Update cap_msmf.cpp

Update cap_msmf.cpp

Update cap_msmf.hpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Successful test - samples are grabbed

Update cap_msmf.cpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Update cap_msmf.hpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Update cap_msmf.hpp

Create ppltasks_winrt.h

Update cap_msmf.hpp

Update cap_msmf.hpp

Update cap_msmf.cpp

Update ppltasks_winrt.h

Library updated and cleaned up with comments, marshaling, exceptions and linker settings

Update ppltasks_winrt.h

Fixed trailing whitespace
2014-03-04 01:52:17 +08:00
Ilya Lavrenov
050cca0422 improved performance of cv::flip (flip cols) 2014-03-03 19:04:32 +04:00
Ilya Lavrenov
4376de7698 fixed morphology operations 2014-03-03 15:29:48 +04:00
Ilya Lavrenov
be5b5a0471 fixed cv::dft 2014-03-03 14:32:38 +04:00
Roman Donchenko
db85c35e69 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	modules/contrib/src/basicretinafilter.hpp
	modules/contrib/src/magnoretinafilter.hpp
	modules/contrib/src/parvoretinafilter.hpp
	modules/contrib/src/retinacolor.hpp
	modules/gpu/include/opencv2/gpu/gpu.hpp
	modules/highgui/src/cap_tyzx.cpp
	modules/ocl/perf/perf_filters.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/opencl/haarobjectdetect.cl
	modules/ocl/test/test_filters.cpp
	modules/ocl/test/test_objdetect.cpp
2014-03-03 13:45:22 +04:00
Ilya Lavrenov
29deff8707 ability to merge logs with intersections only 2014-03-03 13:27:07 +04:00
Roman Donchenko
af8aa8a2fa Merge pull request #2433 from ilya-lavrenov:typos 2014-03-03 12:20:35 +04:00
Anatoly Baksheev
fb7e74c511 iteractor work 2014-03-02 23:15:53 +04:00
Ilya Lavrenov
eedf86402d typos 2014-03-02 21:04:17 +04:00
Ilya Lavrenov
68957b2757 added some new performance tests 2014-03-02 10:29:50 +04:00
Ilya Lavrenov
767b28f2e3 tests 2014-03-01 18:47:44 +04:00
Cody Rigney
fbc69e444b Added NEON optimizations for LK optical flow (Intrinsics). 2014-02-28 16:48:04 -05:00
Ilya Lavrenov
c1c3139368 master-like performance tests 2014-02-28 22:40:24 +04:00
Elena Gvozdeva
68edda3350 fixed 2014-02-28 11:56:23 +04:00
Alexander Alekhin
b9d68ef061 core/ocl: OpenCL build log improvements 2014-02-27 13:16:07 +04:00
Andrey Pavlenko
57b6850d74 Merge pull request #2415 from vpisarev:fix_stereobm_sse 2014-02-27 09:37:04 +04:00
Alexander Karsakov
e6f6707558 OCL: Fix for Haar classifier (thanks to Konstantin Rodyushkin). 2014-02-26 18:11:11 +04:00
Roman Donchenko
bd5d8404c9 Merge pull request #2393 from ilya-lavrenov:coverity 2014-02-26 12:16:36 +04:00
mlyashko
ba5ebaa758 changed file name to case-sensitve to support linux 2014-02-26 10:55:18 +04:00
juanmanpr
7a68e3d207 CV_Assert for photo module corrected 2014-02-25 19:58:08 +01:00
Roman Donchenko
693129902d Merge pull request #2399 from SpecLad:merge-2.4 2014-02-25 19:42:54 +04:00
Vadim Pisarevsky
a3aced20c1 fixed difference between SSE2 and C branches of StereoBM; they should now produce absolutely the same results 2014-02-25 18:13:51 +04:00
Roman Donchenko
c9a4a82667 Merge pull request #2358 from rohitgirdhar:rotatedRect 2014-02-25 17:43:48 +04:00
Ilya Lavrenov
ce0557ebb8 fixed defects from Xcode 2014-02-25 17:33:12 +04:00
Elena Gvozdeva
45cc8a5300 fixed 2014-02-25 16:43:52 +04:00
Roman Donchenko
1db1a83410 Merge pull request #2410 from asmorkalov:android_tiff_lowmem_fix 2014-02-25 15:04:24 +04:00
Roman Donchenko
48432502b6 Merge remote-tracking branch 'origin/2.4' into merge-2.4
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	doc/tutorials/introduction/linux_gcc_cmake/linux_gcc_cmake.rst
	modules/core/CMakeLists.txt
	modules/features2d/perf/opencl/perf_brute_force_matcher.cpp
	modules/highgui/src/grfmt_tiff.cpp
	modules/imgproc/src/clahe.cpp
	modules/imgproc/src/moments.cpp
	modules/nonfree/CMakeLists.txt
	modules/ocl/perf/perf_ml.cpp
	modules/superres/CMakeLists.txt
2014-02-25 15:02:24 +04:00
Ilya Lavrenov
fe38aab84a core tapi optimization 2014-02-25 14:14:42 +04:00
Elena Gvozdeva
48e7bc6b30 fixed 2014-02-25 12:59:33 +04:00
Roman Donchenko
7dc549f166 Merge pull request #2411 from asmorkalov:android_mat_leak_fix 2014-02-25 12:37:01 +04:00
Alexander Smorkalov
c78142acb0 Bug #3391 org.opencv.android.NativeCameraView crashes after latest OpenCV Manager update fixed.
The crash was cased by massive Mat objects leak in NativeCameraView class.
2014-02-25 11:54:03 +04:00
vbystricky
ff8b8ef24c Remove implementation of CvCapture interface for Intel PerC camera. Add IVideoCapture interface and implementation of this one for Intel PerC camera 2014-02-25 10:59:35 +04:00
Alexander Smorkalov
dbb7aa7856 Highgui_Tiff.decode_tile16384x16384 disabled for Android.
Last changes in test leads to SIGKILL on Android.
SIGKILL is called by out of memory killer.
2014-02-25 10:36:20 +04:00
Andrey Pavlenko
d695d4a0bf Merge pull request #2406 from ilya-lavrenov:abf 2014-02-25 09:12:32 +04:00
juanmanpr
540a60fca7 Replaced calls to cout from photo module, by CV_Assert 2014-02-25 00:29:07 +01:00
Ilya Lavrenov
653b99c9bd new scheme of sqrSum 2014-02-25 00:38:44 +04:00
Ilya Lavrenov
e1a598c5b3 disabled ABF tests 2014-02-24 23:26:01 +04:00
mlyashko
e75a257f92 changed epsilon for test passing 2014-02-24 17:47:56 +04:00
Andrey Pavlenko
73dfc4cb8c Merge pull request #2402 from ilya-lavrenov:amd_libs 2014-02-24 16:56:40 +04:00
Andrey Pavlenko
3845b96f6c Merge pull request #2388 from alalek:coverity_bug_fix 2014-02-24 16:54:44 +04:00
Andrey Pavlenko
52a339cba5 Merge pull request #2401 from akarsakov:fix_elem_size 2014-02-24 16:22:28 +04:00
Ilya Lavrenov
16bfdbd22a dump AMD Blas/Fft 2014-02-24 15:12:42 +04:00
Alexander Karsakov
6d83048ec3 Fixed incorrect calculation of element size in OCL.(Mul/Div).Mat_Scalar_Scale. 2014-02-24 15:10:00 +04:00
Nghia Ho
ced8e7a813 Typo 2014-02-24 20:06:20 +11:00
Ilya Lavrenov
32eb38ec98 fixed defects from coverity.com 2014-02-23 20:21:08 +04:00
Ilya Lavrenov
0406898b9a int2 -> ulong; to work properly with 3 channels 2014-02-23 15:12:38 +04:00
Ilya Lavrenov
0ef16125ae improved cv::matchTemplate OpenCL part 2014-02-22 14:30:19 +04:00
Rohit Girdhar
fd4461d543 addressed issues 2014-02-22 09:54:16 +05:30
Roman Donchenko
0a90d6dde6 Merge pull request #2266 from vpisarev:ipp_norm_fix 2014-02-21 19:11:57 +04:00
Vadim Pisarevsky
51dafc780b fixed hint type declaration 2014-02-21 18:07:01 +04:00
Roman Donchenko
51421098dd Merge pull request #2201 from mattip:2.4 2014-02-21 17:57:36 +04:00
Matti Picus
dc50dc7254 fix merge 2014-02-21 13:54:58 +02:00
Alexander Alekhin
9b3c76a3db TAPI: coverity bug fix 2014-02-21 14:04:01 +04:00
Matti Picus
f5330a44e8 merge with origin 2014-02-21 11:59:49 +02:00
Ilya Lavrenov
c7857e8c13 small fixes 2014-02-21 12:19:08 +04:00
Rohit Girdhar
347a3dc520 added randomized test 2014-02-21 12:47:01 +05:30
Matti Picus
31c8f2ec57 fix code, it turns out only TIFFReadRGBATile needs buffer pointer mangling 2014-02-20 22:12:22 +02:00
Matti Picus
46d128e073 add test (needs updated opencv_extra repo) 2014-02-20 22:10:22 +02:00
Andrey Pavlenko
9c5bd85247 Merge pull request #2375 from akarsakov:fix_getGradient 2014-02-20 21:41:43 +04:00
Andrey Pavlenko
b96923d5fa Merge pull request #2377 from alalek:tapi_warpers_perf_test 2014-02-20 21:40:28 +04:00
Ilya Lavrenov
aa5311ea9f backport of master-based perf tests for matchTemplate to 2.4 2014-02-20 18:58:32 +04:00
Ilya Lavrenov
804b70b72f ported 2.4 perf tests for matchTemplate 2014-02-20 18:11:56 +04:00
Elena Gvozdeva
7b552c0493 fixed 2014-02-20 17:34:51 +04:00
Rohit Girdhar
ea7b1bb3d2 added test, doc 2014-02-20 17:51:48 +05:30
Elena Gvozdeva
cd68cd43a2 Fixed 2014-02-20 16:13:05 +04:00
mlyashko
10f2a038c2 Optical flow dualt tvl1 ocl-based implementation and tests 2014-02-20 14:23:10 +04:00
Elena Gvozdeva
e013d31715 Added IPP function for resize() 2014-02-20 14:01:22 +04:00
Alexander Karsakov
7e4dea968c Fixed typo with indexes in getGradient(x/y) functions. 2014-02-20 13:58:31 +04:00
Roman Donchenko
ad66233774 Merge pull request #2376 from GrinIara:master 2014-02-20 13:43:22 +04:00
Alexander Alekhin
79eba54a4f some fixes in perf tests 2014-02-20 13:29:11 +04:00
Alexander Alekhin
ddd3c062b5 TAPI: fix perf test for warpers 2014-02-20 13:09:06 +04:00
Vladislav Vinogradov
7fd21d217a fix bug #3562:
add missing __syncthreads to edgesHysteresisLocalKernel
2014-02-20 10:24:52 +04:00
GrinIara
fa0599448d Fixed compilation error due to missing std::. 2014-02-19 17:06:33 +01:00
Rohit Girdhar
b939b4ae3b removed inline, changed interface 2014-02-19 20:58:40 +05:30
Ilya Lavrenov
8bf616e4c7 added color image support via L*a*b* 2014-02-19 18:35:37 +04:00
Ilya Lavrenov
634e8d37cc fixed for 2 channels 2014-02-19 18:18:22 +04:00
Alexander Alekhin
bf4f15fb5f TAPI: fix OpenCL warpers and test 2014-02-19 15:30:43 +04:00