Commit Graph

494 Commits

Author SHA1 Message Date
Marina Kolpakova
162f9fd7ea merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811 2012-06-28 17:07:17 +00:00
Marina Kolpakova
3def843652 merged the trunk r8719:8731 and 8807 2012-06-28 16:39:53 +00:00
Marina Kolpakova
680a44189c merged the trunk r8704:8716 2012-06-28 16:13:29 +00:00
Andrey Kamaev
f666bd221f Merged the trunk r8595:8668 (except iOS and new gpu functionality) 2012-06-15 13:21:26 +00:00
Andrey Kamaev
bd0e0b5800 Merged the trunk r8589:8653 - all changes related to build warnings 2012-06-15 13:04:17 +00:00
Andrey Kamaev
059b79f7c2 Merged the trunk r8542:8544 2012-06-01 10:59:27 +00:00
Andrey Kamaev
daad7900e2 Merged the trunk r8517:8524 2012-05-31 10:53:28 +00:00
Andrey Kamaev
81a5988015 Merged the trunk r8467:8507 (inclusive) (big bunch of documentation fixes) 2012-05-30 11:13:07 +00:00
Andrey Kamaev
949c4edf41 Merged the trunk r8408:8457 (inclusive) 2012-05-30 08:47:34 +00:00
Andrey Kamaev
7b5a45eac4 Merged the trunk r8384:8407 (inclusive) 2012-05-30 08:04:37 +00:00
Andrey Kamaev
e1c4fd9e1f Merged the trunk r8345:8376 2012-05-18 13:18:37 +00:00
Vadim Pisarevsky
2c88791600 get back to single-version ffmpeg wrapper (no more v2); make sure the library builds and the tests pass on Ubuntu 10.04 that includes pretty old version of ffmpeg 2012-04-30 12:39:22 +00:00
Vadim Pisarevsky
09ca294a76 avoid simultanous reading data from 2 videos Highgui_Video.regression, since earlier versions of ffmpeg (or the way our wrapper uses them) can not handle that properly 2012-04-30 12:07:04 +00:00
Vadim Pisarevsky
5e2df0d6b0 some more fixes in ffmpeg wrapper; now it handles big videos better. 2012-04-28 22:49:13 +00:00
Vadim Pisarevsky
8bab09de07 temporary reverted av_free_packet() patch. 2012-04-28 16:18:39 +00:00
Vadim Pisarevsky
40d8d11f45 fixed RGBD capture with Asus Xtion (by Gary Bradski) 2012-04-28 11:33:01 +00:00
Alexander Reshetnikov
689c1814a5 Fixed VideoCapture memory leak (bug #1481) 2012-04-27 19:23:26 +00:00
Andrey Kamaev
95e657714f Minor improvements: reduced verbosity of positioning tests; run.py - filter out non-executables on windows 2012-04-27 19:13:58 +00:00
Vadim Pisarevsky
7ac713405f put template Distance classes back to features2d, since they are used in GPU; fixed OpenCV build with Xcode 2.3 (which includes new libpng) 2012-04-27 14:11:44 +00:00
Vadim Pisarevsky
d60caea559 added test to check #1737 2012-04-27 12:07:56 +00:00
Vadim Pisarevsky
f87c2e49db added version number to opencv_ffmpeg dlls (it's added only when dll copied to the bin directory); it resolves #1827 2012-04-26 13:32:27 +00:00
Andrey Kamaev
b93d3d7a55 Fixed build warnings 2012-04-26 11:58:06 +00:00
Vadim Pisarevsky
fcbfc030ef avoid use of "AVFrame::best_effort_timestamp" 2012-04-26 07:38:35 +00:00
Vadim Pisarevsky
bc3c49518d ok, now positioning seem to work well, at least with ffmpeg 0.10.2 on MacOSX 10.7 2012-04-26 07:07:37 +00:00
Vadim Pisarevsky
562e404224 fixed HighguiFramecount.regression test (and renamed it to Highgui_Video.framecount) 2012-04-25 14:48:15 +00:00
Vadim Pisarevsky
fb292b1b27 added PSNR function to imgproc; refactored highgui positioning test (which still fails) 2012-04-25 14:31:54 +00:00
Vadim Pisarevsky
c0fcfcc7d8 refactored highgui_specificvideo* tests; fixed repeated libswscale context creation in videocapture & videowriter (ticket #1541) 2012-04-25 12:56:09 +00:00
Alexander Reshetnikov
4b5b7bdb5a Fixed cvRetrieveFrame memory leak under AVFoundation (ticket #1837) 2012-04-23 16:12:24 +00:00
Andrey Kamaev
8dae3431c7 Fixed ffmpeg dll copying under mingw 2012-04-23 10:52:27 +00:00
Alexander Reshetnikov
3d108958e7 Added resources release for AVT cameras (ticket #1814) 2012-04-20 13:29:10 +00:00
Andrey Morozov
720dc231e8 minor fix in calculate bitrate 2012-04-20 12:18:40 +00:00
Andrey Morozov
742668434c minor fix in calculate bitrate 2012-04-20 11:58:31 +00:00
Andrey Kamaev
0905c4f6c6 Minor fix for previous commit 2012-04-18 22:02:17 +00:00
Andrey Kamaev
2bedf5bfd5 Refactored build conditionals in highgui tests 2012-04-18 21:32:56 +00:00
Alexander Shishkov
eb306311f1 fixed FFMPEG wrapper compilation on Windows 2012-04-18 07:48:47 +00:00
Alexander Reshetnikov
4ec74414bb Fixed error in frame positioning (bug #1815) 2012-04-17 17:18:35 +00:00
Andrey Kamaev
24c7bdc3d7 #1809 include unistd.h required for usleep 2012-04-16 18:17:38 +00:00
Ilya Lysenkov
2619221331 Spell checked the documentation with VIM (issue #223) 2012-04-13 19:04:44 +00:00
Alexander Reshetnikov
5d4c194502 Removed stdio include from ffmpeg wrapper 2012-04-13 17:56:45 +00:00
Alexander Reshetnikov
0442b3eae4 Updated diagnostic messages in VideoWriter (for ticket #1736) 2012-04-13 17:39:45 +00:00
Andrey Morozov
5a21ac5ee4 increased bitrate of recorded video on 25% 2012-04-13 10:25:29 +00:00
Andrey Morozov
0c273b867e increased bitrate of recorded video on 25% 2012-04-13 09:57:41 +00:00
Andrey Kamaev
97835a8f32 Fixed 9 more build warnings 2012-04-12 16:21:08 +00:00
Alexander Reshetnikov
7f6c487ae0 Added perf test for video output 2012-04-12 14:52:27 +00:00
Andrey Kamaev
7a3786bad9 Fixed PvApi wrapper build 2012-04-12 13:50:23 +00:00
Alexander Reshetnikov
5042f5daa7 Fixed compilation error under Linux (memset for pvapi was moved to constructor) 2012-04-12 13:35:48 +00:00
Alexander Reshetnikov
6d0c022347 Fixed cameras segfault (patch #1771) 2012-04-12 12:11:43 +00:00
Alexander Reshetnikov
2c3a712b43 Minor refactoring of condition for avformat_find_stream_info (ticket #1790) 2012-04-12 11:29:02 +00:00
Andrey Kamaev
e4ca7118f3 #1782 Threading optimization of OpenNI wrapper is disabled for TBB < 3.0 2012-04-11 13:08:17 +00:00
Alexander Smorkalov
3c08f7a14d Patch #1789 access to Android camera settings applied. 2012-04-11 12:39:58 +00:00