generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,939 Commits 3 Branches 47 Tags
Commit Graph

6712 Commits

Author SHA1 Message Date
Vladislav Vinogradov
a984da911b increase epsilons for some sanity tests 
(cherry picked from commit 6a6619ec1eb20e1c78705167c76fad4f0f6b578a)
 2015-04-19 14:06:47 +03:00
Vladislav Vinogradov
df55be3c3d fix BruteForceMatcher resource distribution 
added launch bounds attributes for all CUDA kernels
(cherry picked from commit d22516872cab0fa7c9b661f85e1eb1d36b2ff7cb)
 2015-04-19 14:06:36 +03:00
Vladislav Vinogradov
55339de684 make NVIDIA tests verbose by default 
(cherry picked from commit 17608f7ade9f31f2363bcf1d15153b75868b8f15)
 2015-04-19 14:06:25 +03:00
Vladislav Vinogradov
f08dd510fa fixed a bug in scanRows CUDA kernel (part of nppStIntegral) 
uninitialized value
(cherry picked from commit 81ebe28c24df70fe06bbebe650eea0585bada0cd)
 2015-04-19 14:06:11 +03:00
Vladislav Vinogradov
d308ed3712 fix GPU WARP border mode in CUDA 7.0 and Maxwell architecture 
(cherry picked from commit 27302c367cdd8636a0cd0dd290cc0fbfe0555f6b)
 2015-04-19 14:02:54 +03:00
Vladislav Vinogradov
6d0f8aa893 fix tests for gpu HOG 
initialize HOG after CUDA device switch
(cherry picked from commit c849492dfa07c6a35dfbd3c44a42c1c6a4fc0d60)
 2015-04-19 14:01:16 +03:00
Vladislav Vinogradov
4539607ab1 fix gpu HOG implementation: 
move hog::set_up_constants from constructor to compute method

if user changed CUDA device between constructor and computation,
some variables were uninitialized
(cherry picked from commit 21bbed7bafd25114ff15d8012f3f8619d258d0c1)
 2015-04-19 13:57:37 +03:00
Vladislav Vinogradov
b320138dba fix GpuMat::setTo implementation 
previous implementation was not thread/stream safe, since it used constant
memory

new implementation doesn't use any global objects, so it is thread/stream safe
(cherry picked from commit 4f5d30a865bd45f144cc70aed1057ac500a72e0c)
 2015-04-19 13:57:23 +03:00
Vladislav Vinogradov
95ea12588e set epsilon for gpu OpticalFlowBM to 1e-6, since it uses floating point arithmetic 
(cherry picked from commit c147ab1e8574bf5adc6847a9700d9d6718dc8a2f)
 2015-04-19 13:57:03 +03:00
Roman Donchenko
c259590b26 Fix a memory leak in CvCapture_FFMPEG::close 
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.

(cherry picked from commit 77578d415f4d2b22a4ee1989ef0afda73c9d649b)
 2015-04-19 13:41:22 +03:00
Vladislav Vinogradov
ef347aa6a4 disable gpu::matchTemplate tests 
(cherry picked from commit 7bb8c50080045dd350441e8ce744b1aa5f29cee8)
 2015-04-19 13:38:20 +03:00
Vijay Pradeep
39ac84ff04 Fixing race condition by expanding resultsMutex lock section 
(cherry picked from commit 042ff210d57bba264639bcfe8974d0b3304d18a7)
 2015-04-19 13:36:17 +03:00
Vladislav Vinogradov
fcbefaff86 fix tests for gpu::matchTemplate: 
use ASSERT_FLOAT_EQ to compare float values, it is more robust for
large values
(cherry picked from commit d00f36ec7585d98c7cab26430c55e9c82b97ed49)
 2015-04-19 13:32:24 +03:00
Roman Donchenko
bf2256fb89 cvOpenFileStorage: reduce the scope of xml_buf and make sure it's freed... 
... before any exceptions occur.

(cherry picked from commit 08da247a871ed40b868119a999af538da6526c6d)
 2015-04-19 13:31:52 +03:00
Vladislav Vinogradov
b0b2fc9e3f get rid of cuda.h usage 
(cherry picked from commit eeb997261d1d22e8c69af777c86e21cce2d04f87)
 2015-04-19 13:29:45 +03:00
Roman Donchenko
1ccd64e102 Fix uninitialized memory reads and memory leaks in StereoGC 
(cherry picked from commit 7d8e5f623a9f1f971c45aa4912dc4679f5165f43)
 2015-04-19 13:27:55 +03:00
Vicente Olivert Riera
23bf3e337a superres: Fix return value VideoFrameSource_GPU 
superres module fails to compile with the following error messages:

[100%] Building CXX object modules/superres/CMakeFiles/opencv_superres.dir/src/super_resolution.cpp.o
/opencv-2.4.10/modules/superres/src/frame_source.cpp: In function 'cv::Ptr<cv::superres::FrameSource> cv::superres::createFrameSource_Video_GPU(const string&)':
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected type-specifier before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: could not convert '(int*)operator new(4ul)' from 'int*' to 'cv::Ptr<cv::superres::FrameSource>'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:16: error: expected ';' before 'VideoFrameSource'
/opencv-2.4.10/modules/superres/src/frame_source.cpp:263:41: error: 'VideoFrameSource' was not declared in this scope
/opencv-2.4.10/modules/superres/src/frame_source.cpp:264:1: error: control reaches end of non-void function [-Werror=return-type]
cc1plus: some warnings being treated as errors
make[3]: *** [modules/superres/CMakeFiles/opencv_superres.dir/src/frame_source.cpp.o] Error 1
make[3]: *** Waiting for unfinished jobs....

This is caused because the return value of the createFrameSource_Video_GPU function should be a VideoFrameSource_GPU object.
(cherry picked from commit 2e393ab83362743ba1825ad4b31d4a2925c606b4)
 2015-04-19 13:25:16 +03:00
Alexander Smorkalov
67635c6d65 Version++. 2014-11-05 08:46:55 +03:00
Vladislav Vinogradov
a26e496d00 minor fix for StereoCSBP data cost compute kernel and test 
(cherry picked from commit 84f33d0578d3a836c8384608363ef5e2c24030fa)
 2014-11-04 10:19:38 +03:00
Vladislav Vinogradov
d579d3e596 increase epsilons for some tests, which functions use floating point arithm 
(cherry picked from commit 5c07e0b6d3f120c964ce8fac58bd2ab0ede96562)
 2014-11-04 10:19:18 +03:00
Vladislav Vinogradov
5a77176654 avoid pointer arithmetic on register memory in color conversion 
(cherry picked from commit e0827069c1c242ad9fceede43c642f8dfad0ef99)
 2014-11-04 10:18:58 +03:00
Andrey Pavlenko
7018f94959 Merge pull request #3288 from StevenPuttemans:fix_ts_dependencies 2014-10-01 07:33:36 +00:00
Andrey Pavlenko
533fde66e3 Merge pull request #3281 from a-wi:MSMF_remove_ATL_dependency 2014-10-01 07:26:25 +00:00
Andrey Pavlenko
5bd18155be Merge pull request #3290 from asmorkalov:android_disable_fisheye.rectify_for_tegra 2014-10-01 07:26:04 +00:00
Alexander Smorkalov
ca40a749b6 Turn off superres accuracy tests if video i/o is not supported. 2014-10-01 09:15:24 +04:00
Roman Donchenko
d54d580f79 Merge pull request #3275 from asmorkalov:ocv_gstreamer_backport 2014-09-30 15:55:26 +00:00
Alexander Smorkalov
71c4e96e17 Test fisheye.rectify disabled for Tegra. 2014-09-30 14:49:33 +04:00
StevenPuttemans
60fd5c2a3a fixing dependencies 2014-09-30 11:53:46 +02:00
Alexander Smorkalov
8271c4e9c4 Highgui_Video.prop_fps disabled as fails with FFmpeg in Ubuntu 14.04. 2014-09-30 13:35:19 +04:00
Alexander Smorkalov
1f4fe3bb27 GStreamer 1.0 backport from master branch. 2014-09-30 12:30:09 +04:00
Alexander Smorkalov
a0431acb37 OpenCV Manager version++. 2014-09-30 12:05:46 +04:00
Artur Wieczorek
e3f1d722e7 Remove ATL dependency from MSMF capture code 
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
 2014-09-30 01:35:59 +02:00
Maksim Shabunin
a160158cb3 Merge pull request #3272 from mgeorg:reset_ffmpeg_mutex_2_4 2014-09-29 12:07:22 +00:00
Vadim Pisarevsky
6a53cb9307 Merge pull request #3266 from mshabunin:arm_warning 2014-09-27 13:06:44 +00:00
Vadim Pisarevsky
1920232268 Merge pull request #3260 from a-wi:MSMF_file_error 2014-09-27 13:06:18 +00:00
Manfred Georg
7f4eb4f6c6 set ffmpeg mutex to NULL on destruction. 
The Mutex manager registered with ffmpeg must reset the mutex to NULL after destruction, otherwise ffmpeg will give the invalid mutex to the next mutex manager when it asks it to CREATE a new mutex.
See ffmpeg code: http://git.videolan.org/?p=ffmpeg.git;a=blob;f=libavcodec/utils.c;h=28c5785398fcf11a3d3c70a8cd09e9df798e2734;hb=HEAD#l3423

Cherry picked from head (file has moved but issue is the same).
Conflicts:
	modules/videoio/src/cap_ffmpeg_impl.hpp
 2014-09-26 10:19:34 -07:00
Maksim Shabunin
e88a36621e Fixed warning during cross compile for ARM 2014-09-25 12:27:48 +04:00
Vadim Pisarevsky
467f5fc90f Merge pull request #3261 from a-wi:CMake_FFMPEG_config 2014-09-24 17:03:08 +00:00
Artur Wieczorek
93d1ceae43 Use FFMPEG capture only if HAVE_FFMPEG flag is defined. 2014-09-24 02:11:59 +02:00
Artur Wieczorek
073a7ff95a Fixed CMake issue with FFMPEG highgui configuration 
Currently, FFMPEG source files are included in highgui project file regardless of CMake WITH_FFMPEG option.
After applying this PR FFMPEG files are included only if WITH_FFMPEG option is enabled.
 2014-09-23 23:46:03 +02:00
Artur Wieczorek
5bf1a4c08c Fixed MSMF file capture error while opening the file containing unsupported video stream format 2014-09-23 20:21:53 +02:00
bhack
32f6e1a554 Fix for bug #3469 CV_XADD failing in clang+nvcc combination 
Taken from 3f0765523113ae7fc1b300f27dd78c642bb2b6c7
 2014-09-23 12:39:16 +02:00
Vadim Pisarevsky
10bbcca11e Merge pull request #3251 from a-wi:MSMF_camera_errors 2014-09-23 08:42:57 +00:00
Vadim Pisarevsky
19b3aab23f Merge pull request #3244 from tstellarAMD:2.4-ocl-inline-fix-v2 2014-09-23 07:19:38 +00:00
Vadim Pisarevsky
df28bb5ccd Merge pull request #3190 from StevenPuttemans:fix_simpleblobdetector 2014-09-23 07:18:01 +00:00
StevenPuttemans
d4ec359f11 Fixing errors 2014-09-22 22:12:27 +02:00
Artur Wieczorek
3603102c89 Fixed assertion warning in MSMF frame grabber 2014-09-22 19:38:04 +02:00
Artur Wieczorek
a615102947 Fixed MSMF video capture initialization 2014-09-22 19:35:36 +02:00
Vadim Pisarevsky
9c91d0103f Merge pull request #3247 from a-wi:CMake_MSMF_configuration 2014-09-22 15:31:09 +00:00
StevenPuttemans
03662c0589 fix blobdetector 2014-09-22 13:58:45 +02:00