Commit Graph

4446 Commits

Author SHA1 Message Date
Vladislav Vinogradov
76e8794e81 fixed warnings on old compute capabilities 2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
e6b1ccdcdf removed old reduce implementation 2012-11-26 11:37:51 +04:00
Vladislav Vinogradov
e8f9762ef3 matrix reduction 2012-11-26 11:37:50 +04:00
Vladislav Vinogradov
fbf3de43a2 SURF 2012-11-26 11:37:38 +04:00
Vladislav Vinogradov
19c87d1c9d ORB 2012-11-26 11:37:38 +04:00
Vladislav Vinogradov
7f97fb481c FastNonLocalMeans 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
1f1e24be3c PyrLKOpticalFlow 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
1b571bde10 StereoConstantSpaceBP 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
0e339dd137 hog 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
0ddd16cf78 calcHist & equalizeHist 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
7e57648ea2 FGDStatModel 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
28716d7f30 Canny 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
e299595667 computeHypothesisScoresKernel 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
05db02fbc8 BruteForceMatcher 2012-11-26 11:37:37 +04:00
Vladislav Vinogradov
7a1874b2cc new reduce and reduceKeyVal implementation 2012-11-26 11:37:36 +04:00
Vladislav Vinogradov
d47c112434 fix abs_func and minimum/maximum functors 2012-11-26 11:37:36 +04:00
marina.kolpakova
7df45c0dcc remove unnecessary copying in SURF 2012-11-25 03:26:50 +04:00
marina.kolpakova
91913364d6 reintegrate warp shuffle based integral 2012-11-25 03:21:51 +04:00
marina.kolpakova
5460cee9e9 fix cascade classifier GFF NMS for empty candidates vector 2012-11-25 03:19:24 +04:00
Andrey Kamaev
23011ffd81 Merge pull request #179 from cuda-geek:usr-bin-env-python 2012-11-24 19:24:01 +04:00
Maria Dimashova
97e36b9375 fix a compile error in case of building without highgui 2012-11-24 18:10:29 +04:00
marina.kolpakova
68d04d28b6 replace offsets in surf to simple copy for better speed 2012-11-24 16:50:29 +04:00
Andrey Kamaev
8daebeac8a run.py: add --check option for easy run of sanity checks 2012-11-24 14:12:32 +04:00
Andrey Kamaev
9db1d9ba13 run.py: improve handling of multiple Android devices
* do not lose auto-selected device while running several tests
* reduce output noise
* list available devices if unable to auto-select device
* fix error message when no devices connected
2012-11-24 14:11:07 +04:00
marina.kolpakova
be0c20b758 align grid by 4 2012-11-24 01:55:03 +04:00
marina.kolpakova
285d6320be add #/usr/bin/env python to all python files 2012-11-23 22:57:22 +04:00
marina.kolpakova
6ccd7aca4c fix tests for arm 2012-11-22 13:26:13 +04:00
Alexander Smorkalov
3282e08f55 Default native library path for native camera updated.
New versions tries to search library in arm-v7a and Manager packages only.
2012-11-22 12:40:25 +04:00
Andrey Kamaev
24af691843 Merge pull request #168 from asmorkalov:android_42_camera_fix 2012-11-21 14:50:53 +04:00
Vadim Pisarevsky
c31f106012 Merge branch 'ParallelVideoStreams' of https://github.com/ilya-lavrenov/opencv into 2.4 2012-11-21 11:43:18 +04:00
Alexander Smorkalov
aa4e6a8a83 Issue #2547 Native camera does not work on Google Nexus 7 with Android 4.2 fixed;
Issue #2506 Unnecessary log printouts in OpenCV::camera fixed;
Native camera for MIPS Android 4.1.1 added.
Build script for camera updated.
2012-11-21 11:37:29 +04:00
Andrey Kamaev
7f542e391a Merge branch 2.4
Conflicts:
	android/service/engine/AndroidManifest.xml - use file from 2.4
	modules/contrib/src/detection_based_tracker.cpp - move #include <pthread.h> as in 2.4
	modules/java/android_test/src/org/opencv/test/OpenCVTestRunner.java - use file from 2.4
2012-11-20 19:12:00 +04:00
Andrey Kamaev
d559c18ee5 Merge pull request #161 from apavlenko:fix/sdk_r21 2012-11-20 19:07:08 +04:00
Andrey Pavlenko
cfd634ca3e Improving compatibility with the latest Android SDK (r21) and NDK (r8c).
- Adding Android SDK/ADT r21 compatibility;
- fixing stl headers path for new ndk;
- fixing native API level for Android projects
2012-11-20 18:40:22 +04:00
Andrey Kamaev
934b623fa9 Merging pull request #169 from taka-no-me:android-ndk-r8c 2012-11-20 17:56:12 +04:00
Andrey Kamaev
04481d9ef4 Fix Android build with clang compiler 2012-11-20 15:20:04 +04:00
Alexander Smorkalov
66a1ea7604 Test execution inside Eclipse fixed;
OpenCV testing via OpenCV Manager implemented.
2012-11-20 10:45:46 +04:00
Ilya Lavrenov
4abf0b3193 thread-safe VideoWriter and VideoCapture 2012-11-19 16:44:23 +04:00
marina.kolpakova
a9f10e5cad fixed compile without cuda 2012-11-14 20:34:17 +04:00
marina.kolpakova
0865227049 check if scaling values changed 2012-11-14 20:28:08 +04:00
marina.kolpakova
c3e4a52fbe soft cascade sample 2012-11-14 20:11:18 +04:00
Andrey Kamaev
2e2d927273 Merge pull request #128 from LeonidBeynenson/fix_args_calcOpticalFlowSF 2012-11-14 17:30:06 +04:00
marina.kolpakova
ee4f003e72 fixed typo 2012-11-14 14:49:38 +04:00
marina.kolpakova
781c04324e refactor: PrefixSum 2012-11-14 14:47:00 +04:00
marina.kolpakova
a30bbda3bd remove hardcoded values 2012-11-14 14:36:59 +04:00
LeonidBeynenson
52a136227d Modified documentation for calcOpticalFlowSF. 2012-11-14 14:27:41 +04:00
marina.kolpakova
8acfbde68e remove debug detect at scale method 2012-11-14 14:22:12 +04:00
marina.kolpakova
72e2b8b370 remove size constraints of input frame 2012-11-14 14:00:02 +04:00
marina.kolpakova
08910e81af integrate pre-Kepler architectures 2012-11-14 12:40:44 +04:00
marina.kolpakova
e3c93ad9cf Revert "Merge pull request #141 from jet47/gpu-pyrlk-fix" because this bug appears only in 2.4
This reverts commit 7e301c5c0e, reversing
changes made to b5e009eb87.
2012-11-13 23:52:18 +04:00
marina.kolpakova
be40bd5c74 Merge remote-tracking branch 'cuda-geek/soft-cascade-cpu' 2012-11-13 23:37:44 +04:00
Alexander Mordvintsev
9cfa51a483 added CV_OUT to StereoVar output paramiter 2012-11-13 23:17:54 +04:00
marina.kolpakova
1edab12068 fix for negative confidence 2012-11-13 23:08:19 +04:00
Andrey Kamaev
9719ea93b6 Merge branch 2.4 2012-11-13 19:54:48 +04:00
Andrey Kamaev
aba5bae400 Merge pull request #147 from taka-no-me/win_warnings 2012-11-13 19:48:59 +04:00
Andrey Kamaev
0938358002 Merge pull requests #136, #142, #150, #152 from asmorkalov/new_framework_tutorial, asmorkalov/fd_package_fix, asmorkalov/java_test_fix and asmorkalov/engine_build_fix 2012-11-13 19:47:16 +04:00
Andrey Kamaev
72a63922d2 Merge pull request #156 from jet47/gpu-hough-lines-fix 2012-11-13 18:24:36 +04:00
Andrey Kamaev
e4fb680566 Merge pull request #155 from jet47/gpu-test-fix 2012-11-13 18:23:52 +04:00
Andrey Kamaev
5bc66ec8e4 Merge pull request #149 from taka-no-me/osx_warnings 2012-11-13 18:21:40 +04:00
Andrey Kamaev
a218507586 Merge pull request #148 from taka-no-me/tutorial_codes 2012-11-13 18:20:49 +04:00
Andrey Kamaev
8ba9289a2c Merge pull request #146 from taka-no-me/win_opengl 2012-11-13 18:19:42 +04:00
Andrey Kamaev
4d6bdc1533 Merge pull request #145 from taka-no-me/vec_print 2012-11-13 18:18:48 +04:00
Andrey Kamaev
c803cbb93b Merge pull request #143 from vpisarev/bug_fixes4 2012-11-13 18:17:33 +04:00
Vladislav Vinogradov
a9919e01d0 fixed bug in gpu::HoughLines 2012-11-13 17:54:17 +04:00
Vladislav Vinogradov
606c23b9aa fixed gpu module tests
uses old CommandLineParser class
2012-11-13 17:50:29 +04:00
Alexander Smorkalov
96e4eed018 Logcat message for disabled test cases added. 2012-11-13 11:41:08 +04:00
Alexander Smorkalov
9f5fcff3ea More common way of test case disabling implemented. 2012-11-13 10:29:49 +04:00
marina.kolpakova
bd9ca48fab export to python/java 2012-11-13 02:49:35 +04:00
Alexander Smorkalov
e06c5b6fd5 Code review comments applied. 2012-11-12 17:47:20 +04:00
marina.kolpakova
aa92be34d6 GK107 Policy 2012-11-12 16:37:18 +04:00
marina.kolpakova
580d8173e5 refactor computing of scaling factor 2012-11-12 11:54:40 +04:00
Vladislav Vinogradov
afff9cf716 Optimized buffers reuse in gpu module:
ensureSizeIsEnough now doesn't reallocate memory, if buffer is small submat of big matrix
fixed createContinous according new changes
2012-11-12 10:30:35 +04:00
Vladislav Vinogradov
810829f32e speedup compilation of row_filter.cu and column_filter.cu
split them into several small files
2012-11-12 10:16:04 +04:00
Vladislav Vinogradov
29f89e8930 moved block.hpp to include folder 2012-11-12 09:51:31 +04:00
marina.kolpakova
d3ac282487 GPU soft cascade documentation 2012-11-10 05:48:06 +04:00
marina.kolpakova
916967cac5 add comments to class declaration 2012-11-10 05:13:37 +04:00
marina.kolpakova
0cbf9eb22a add support for CUDA streams 2012-11-10 05:13:26 +04:00
marina.kolpakova
40600fa504 GPU version becomes algorithm 2012-11-10 05:13:19 +04:00
marina.kolpakova
e6eb1b99e1 fix negative confidence bug 2012-11-10 05:13:01 +04:00
marina.kolpakova
27eb2e27db enable fast integral for Kepler 2012-11-10 05:12:48 +04:00
marina.kolpakova
9b251f8130 remove Sobel normalization 2012-11-10 05:12:38 +04:00
marina.kolpakova
df392cc830 use fast integral for soft cascade 2012-11-10 05:12:27 +04:00
marina.kolpakova
ac5cd48279 add DeviceInfo parameter to the soft cascade tests 2012-11-10 05:12:13 +04:00
marina.kolpakova
fba62c9251 fix compilation problem after rebase 2012-11-10 05:12:01 +04:00
marina.kolpakova
2bd35c4358 add support for precomputed integrals 2012-11-10 05:11:48 +04:00
marina.kolpakova
fa55d51b6a add sanity check to performance tests for soft cascade 2012-11-10 05:11:35 +04:00
marina.kolpakova
ca81628a9a fix retrieval of detections count 2012-11-10 05:11:21 +04:00
marina.kolpakova
022a8b9698 fix rounding bug in Level creation 2012-11-10 05:11:11 +04:00
marina.kolpakova
2bcb8dbd83 refactor performance tests 2012-11-10 05:11:00 +04:00
marina.kolpakova
f196e9fda4 add factory method for Fields structure 2012-11-10 05:10:42 +04:00
marina.kolpakova
0898c3c651 kernel policy 2012-11-10 05:10:35 +04:00
marina.kolpakova
916ba4c0ea refactor preprocessing 2012-11-10 05:10:28 +04:00
marina.kolpakova
fa62e2b72f move preprocessing into separate function 2012-11-10 05:10:13 +04:00
marina.kolpakova
312a58fcec fix performance test 2012-11-10 05:10:03 +04:00
marina.kolpakova
ef431f70b6 fix buggy threshold zeroing if feature has zero area 2012-11-10 05:09:45 +04:00
marina.kolpakova
0424e2c8d2 remove debug code 2012-11-10 05:09:34 +04:00
marina.kolpakova
1b9bccb856 move Level into shared memory 2012-11-10 05:09:15 +04:00
marina.kolpakova
30bce16ad6 optimize roi loads
only one thread load roi for all block
2012-11-10 05:08:56 +04:00
marina.kolpakova
fdef0adf95 Corrects objects matrix in case of the absence of objects 2012-11-10 05:08:43 +04:00
marina.kolpakova
838842cc96 Add performance detection test in ROI; refactored soft cascade performance tests 2012-11-10 05:08:32 +04:00
marina.kolpakova
dd595376ba Add performance test for detection in ROI; refactor soft cascade performance tests 2012-11-10 05:08:09 +04:00
marina.kolpakova
eb91593c08 add roi support 2012-11-10 05:08:03 +04:00
marina.kolpakova
64d6e6a48d add getROISize 2012-11-10 05:07:55 +04:00
marina.kolpakova
672cf1f445 implement different behaviour for up- and down-scaling 2012-11-10 05:07:40 +04:00
marina.kolpakova
56c7ef06e7 integrate Kepler version 2012-11-10 05:07:26 +04:00
marina.kolpakova
7db1323f81 add test that stores detections on the specific scale 2012-11-10 05:07:09 +04:00
marina.kolpakova
b52fea7fae update soft cascade interface: - add class Detection in interface, - split sync- and async- versions, - add support for detecting at the specific scale. 2012-11-10 05:06:54 +04:00
marina.kolpakova
612a258506 kepler specific version 2012-11-10 05:06:44 +04:00
marina.kolpakova
0314e0e5d7 add kind in detection representation 2012-11-10 05:06:30 +04:00
marina.kolpakova
c0359ed5c5 fix test: enough size for detection matrix 2012-11-10 05:06:17 +04:00
marina.kolpakova
72b499df00 add detection storing 2012-11-10 05:06:05 +04:00
marina.kolpakova
8108bd30fe optimize memory usage 2012-11-10 05:05:43 +04:00
marina.kolpakova
b83d4add2e memory optimization 2012-11-10 05:05:25 +04:00
marina.kolpakova
4d9c7c1012 preprocessing ~1.981 ms 2012-11-10 05:05:17 +04:00
marina.kolpakova
1917366528 empty cascade 2012-11-10 05:05:09 +04:00
marina.kolpakova
4881205bae refactor logs 2012-11-10 05:04:52 +04:00
marina.kolpakova
dca27b4622 fix cast bug; add logging 2012-11-10 05:04:36 +04:00
marina.kolpakova
e606a0d651 remove dead code 2012-11-10 05:04:20 +04:00
marina.kolpakova
ba50d19341 first version of soft cascade on GPU 2012-11-10 05:03:59 +04:00
marina.kolpakova
1bf85996b3 add detections vector initialization in tests 2012-11-10 05:03:43 +04:00
marina.kolpakova
08b4e780de add shrinking kernel 2012-11-10 05:03:29 +04:00
marina.kolpakova
1cf7a46f3a fix data paths in performance test 2012-11-10 05:03:05 +04:00
marina.kolpakova
0691dc554f fix compilation 2012-11-10 05:02:52 +04:00
marina.kolpakova
5d15e4ea58 CUDA kernels interface 2012-11-10 05:02:37 +04:00
marina.kolpakova
1a52a322b5 add performance test for GPU soft cascade 2012-11-10 05:02:16 +04:00
marina.kolpakova
14a0dd8c98 fix typo in cascade loading 2012-11-10 05:02:01 +04:00
marina.kolpakova
a3af5ede80 CUDA callers 2012-11-10 05:01:44 +04:00
marina.kolpakova
4aac1444ad integral channel storage are cached as a cascade's field 2012-11-10 05:01:25 +04:00
marina.kolpakova
1ab7af6995 GPU soft cascade: buffers preallocation 2012-11-10 05:01:09 +04:00
marina.kolpakova
2b7ce8b160 precompute feature response for scaling factor 2012-11-10 05:00:53 +04:00
marina.kolpakova
267d140bfe soft cascade: gpu representation 2012-11-10 05:00:33 +04:00
marina.kolpakova
dd9c53497b GPU interface for soft cascade 2012-11-10 05:00:16 +04:00
marina.kolpakova
d65b3e0617 fix warning in CUDA samples 2012-11-10 04:59:55 +04:00
Alexander Smorkalov
baef62b4d2 Java test fix. Eclipse test execution fix. 2012-11-09 11:46:14 +04:00
Andrey Kamaev
a126532cb7 Fix OS X build warnings 2012-11-09 11:29:52 +04:00
Andrey Kamaev
b131dfeecd Build tutorial codes together with other samples
These codes should be included into regular builds.
2012-11-09 10:15:48 +04:00
Andrey Kamaev
0a4ed2bc01 Fix Windows build warnings 2012-11-09 10:10:04 +04:00
Andrey Kamaev
8c9c2b3a03 Fix build on Windows with OpenGl enabled
There was missing windows.h include in OpenGL interop code.
2012-11-09 10:00:24 +04:00
Andrey Kamaev
e5ffbf9498 Fix stream output operator for Vec<uchar,n>
This fixes output for 8U and 8S vector depths.
They were mistakenly printed as characters instead of numbers.
2012-11-09 09:54:43 +04:00
marina.kolpakova
665bf430d5 fix warnings under win 2012-11-09 00:07:32 +04:00
Vadim Pisarevsky
2e54e2a586 fixed problem with LBPHFaceRecognizer::update() without breaking binary compatibility. 2012-11-08 16:15:04 +04:00
Vladislav Vinogradov
bff818afbd fixed static build of gpu module with ffmpeg:
multiple definition of cap_ffmpeg_impl.hpp functions in gpu and highgui
2012-11-08 15:49:56 +04:00
Vadim Pisarevsky
9163471987 improved accuracy of 3x3 invert on poorly-conditioned matrices (bug #2525) 2012-11-08 14:09:43 +04:00
marina.kolpakova
8a3e897999 min and max params become double 2012-11-08 02:34:49 +04:00
marina.kolpakova
e379771c03 git warning 2012-11-08 02:34:49 +04:00
marina.kolpakova
f93cffaa0d fix compilation under win 2012-11-08 02:34:49 +04:00
marina.kolpakova
1022094dc0 fix levels computing 2012-11-08 02:34:49 +04:00
marina.kolpakova
f1e36043e6 clean code 2012-11-08 02:34:49 +04:00
marina.kolpakova
4656872161 fixed typo 2012-11-08 02:34:49 +04:00
marina.kolpakova
5fb9f48360 fix angle scaling 2012-11-08 02:34:49 +04:00