Commit Graph

480 Commits

Author SHA1 Message Date
Andrey Kamaev
3a1f85d4e8 Remerged the 2.4.0 branch 2012-05-02 20:20:14 +00:00
Vladislav Vinogradov
ca57239618 fixed some problems after r8280 (lost code) 2012-05-02 13:07:30 +00:00
Vadim Pisarevsky
d5a0088bbe merged 2.4 into trunk 2012-04-30 14:33:52 +00:00
Vladislav Vinogradov
f4b4665940 added VideoReader_GPU 2012-04-18 11:18:25 +00:00
Vladislav Vinogradov
70909738f4 added support of different surface formats to VideoWriter_GPU
added key frame handling to ffmpeg wrappers
2012-04-17 11:08:08 +00:00
Vladislav Vinogradov
2bfaf540a1 added VideoWriter_GPU 2012-04-17 07:12:16 +00:00
Vadim Pisarevsky
2fd1e2ea57 merged all the latest changes from 2.4 to trunk 2012-04-13 21:50:59 +00:00
Alexander Shishkov
9bfd50e6ae merged revisions r7802,r7804,r7805 from 2.4 branch 2012-04-03 00:33:33 +00:00
Alexander Reshetnikov
1c616f43ba Fixed compilation error with ffmpeg 0.9.x & 0.10.x 2012-03-31 17:06:35 +00:00
Alexander Reshetnikov
4ec2ad91b9 Removed duplicated includes from ffmpeg wrappers 2012-03-31 15:27:48 +00:00
Alexander Reshetnikov
958d5a0caa Solved a problem with VideoWriter in the new wrapper 2012-03-31 15:12:45 +00:00
Alexander Reshetnikov
ab0fc84781 Fixed compilation error under Ubuntu 11.10; added #if-#else-#endif code for some deprecated functions 2012-03-31 15:10:13 +00:00
Andrey Kamaev
72f2523d0f Fixed ~20 potential errors identified by the MS complier. 2012-03-31 11:09:16 +00:00
Vadim Pisarevsky
1e5a600d13 fixed video capturing on Mac running Windows (ticket #988) 2012-03-31 08:56:48 +00:00
Vadim Pisarevsky
f309bafe9e another fix for cap_dshow.cpp; fixed warning in facerec_demo 2012-03-30 20:06:06 +00:00
Alexander Reshetnikov
3a564d1ae8 Updated displayOverlay's implementation & documentation (ticket #903) 2012-03-30 19:58:44 +00:00
Andrey Kamaev
7a017973bf Fixed Windows build (MSVC 10 Win32)
internal CV_CAP_PROP_ZOOM is renamed to CV_CAP_PROP_ZOOM_DSHOW
internal CV_CAP_PROP_FOCUS is renamed to CV_CAP_PROP_FOCUS_DSHOW
2012-03-30 19:26:15 +00:00
Vadim Pisarevsky
f0b8b81caa applied big patch #1281 by Martin Beckett (various direct show video capture enhancements) 2012-03-30 18:39:03 +00:00
Alexander Reshetnikov
aff34adf1b Updated new ffmpeg wrapper 2012-03-30 16:57:41 +00:00
Alexander Reshetnikov
e00f1e3911 Fixed a problem with CODEC_ID_RAWVIDEO in FFMPEG (ticket #1400) 2012-03-30 14:30:24 +00:00
Vadim Pisarevsky
38f686252c added video stream positioning in QTKit-based VideoCapture backend (patch #1420) 2012-03-30 14:13:21 +00:00
Alexander Reshetnikov
554e0051e8 Fixed error with color space switching for IEEE1394 cameras (patch #766) 2012-03-29 16:15:55 +00:00
Alexander Shishkov
0ac70e6883 fixed #1421 2012-03-29 13:46:54 +00:00
Vadim Pisarevsky
0404b2989e fixed line clipping (ticket #1284) 2012-03-29 13:06:38 +00:00
Alexander Reshetnikov
1564fe9a83 Fixed segfault problem with cap_unicap (ticket #1112) 2012-03-29 12:20:06 +00:00
Alexander Reshetnikov
ee8c4aeb4b Updated close method for ieee1394 cameras 2012-03-29 11:56:53 +00:00
Andrey Kamaev
d46f44b48a #1695 fixed arrow key events with the Qt backend 2012-03-28 22:22:02 +00:00
Alexander Reshetnikov
2a68228b66 changed icvSetVideoSize function (ticket #1067) 2012-03-28 16:14:36 +00:00
Alexander Reshetnikov
cff117c08b Updated saving paths for highgui tests 2012-03-28 15:27:55 +00:00
Alexander Reshetnikov
76852a499d Minor refactoring of video i/o tests: fixed error with indexes 2012-03-28 14:05:26 +00:00
Alexander Reshetnikov
8313095734 Changed saving paths for another highgui tests 2012-03-28 13:49:55 +00:00
Alexander Reshetnikov
07ec83cd1f Updated ffmpeg test for big video writing (changed saving paths + added removing files) 2012-03-28 12:15:25 +00:00
Alexander Reshetnikov
a185302c5d Updated test_video_pos.cpp 2012-03-28 11:33:36 +00:00
Andrey Kamaev
9941cf7c95 Fixed MSCV2005 build with TBB enabled. 2012-03-27 23:17:53 +00:00
Vadim Pisarevsky
8513ed08d0 probably fixed multi-threaded capturing from DShow cameras (ticket #1470) 2012-03-27 12:50:56 +00:00
Maria Dimashova
f70d171cef changed default parameter 2012-03-27 08:37:39 +00:00
Maria Dimashova
550fd8e57c added image and depth synchronization 2012-03-27 07:41:48 +00:00
Alexander Reshetnikov
1d7e09a9d5 Removed duplicated ifdef code from ffmpeg wrappers 2012-03-26 13:51:05 +00:00
Alexander Reshetnikov
1a04d09140 Fixed compilation error for ffmpeg tests 2012-03-26 12:27:00 +00:00
Vladislav Vinogradov
9034a2d6d7 fixed gpu arithm functions (mismatch with cpu version) 2012-03-26 11:02:03 +00:00
Alexander Reshetnikov
0aa74f3846 Updated new video positioning test 2012-03-23 16:41:41 +00:00
Alexander Reshetnikov
c6571249a8 Update FFMPEG wrapper binaries 2012-03-23 10:59:06 +00:00
Alexander Shishkov
84ddd6018d fixed wrapper compilation on Windows (opencv_ffmpeg dlls) 2012-03-23 10:52:36 +00:00
Alexander Reshetnikov
e3d0c6515f Added new video posiitioning test 2012-03-23 08:53:56 +00:00
Alexander Reshetnikov
e83ebde210 Fixed ifdef code mistake 2012-03-22 23:17:04 +00:00
Alexander Reshetnikov
7817e11e01 Fixed compilation error under Windows 2012-03-22 22:26:33 +00:00
Alexander Reshetnikov
6de7064836 Updated ffmpeg test for big video writing 2012-03-22 22:18:43 +00:00
Alexander Reshetnikov
b27d1662e6 Separated ffmpeg codecs and wrappers 2012-03-22 21:28:06 +00:00
Alexander Shishkov
fc68c18c92 unrolled changes from r7601 (problems with Android,...) 2012-03-22 13:36:07 +00:00
Andrey Pavlenko
23619718ed fixing copy/paste typo 2012-03-22 13:23:11 +00:00
Alexander Reshetnikov
ce8c2892d8 Removed OS conditions from highgui tests 2012-03-22 09:38:44 +00:00
Alexander Reshetnikov
0dd4386d77 Updated new ffmpeg wrapper; restored NEW_FFMPEG in the root cmake file 2012-03-21 18:07:34 +00:00
Maria Dimashova
499efec5b0 removed debug log 2012-03-21 14:47:13 +00:00
Maria Dimashova
c1a6cb6221 added oni-files reading 2012-03-21 14:31:40 +00:00
Alexander Reshetnikov
82a2a50f87 Updated new ffmpeg wrapper 2012-03-21 12:54:52 +00:00
Maria Dimashova
fedff0922e removed unnecessary members of CvCapture_OpenNI 2012-03-21 11:58:25 +00:00
Maria Dimashova
67d7669188 switched to use RunXmlScript always (missing '\n' at the end of xml script was a problem) 2012-03-21 08:56:38 +00:00
Alexander Reshetnikov
5d4a8d0889 Updated license text in highgui files 2012-03-20 16:39:02 +00:00
Alexander Reshetnikov
4dff974e8c Refactored new ffmpeg wrapper 2012-03-20 09:17:28 +00:00
Vadim Pisarevsky
3228599a35 fixed some more GCC warnings 2012-03-19 11:21:01 +00:00
Alexander Reshetnikov
484fe1d598 Fixed compiling error for ffmpeg with libavcodec less than 53.4.0 2012-03-19 09:05:55 +00:00
Vadim Pisarevsky
846e37ded5 fixed many warnings from GCC 4.6.1 2012-03-17 09:22:31 +00:00
Vadim Pisarevsky
4985c1b632 fixed hundreds of warnings from MSVC 2010. 2012-03-16 21:21:04 +00:00
Maria Dimashova
baa81de122 renamed property of openni camera 2012-03-16 13:59:08 +00:00
Maria Dimashova
00aca7e77a renamed property of openni camera 2012-03-16 09:08:18 +00:00
Alexander Shishkov
7f2ddf16eb minor changes in wrapper 5 2012-03-15 20:39:11 +00:00
Alexander Shishkov
6546719158 minor changes in wrapper 4 2012-03-15 20:30:21 +00:00
Alexander Shishkov
a12fb7f96c minor changes in wrapper 3 2012-03-15 20:14:59 +00:00
Maria Dimashova
930c7bf20e minor refactoring CvCapture_OpenNI 2012-03-15 15:55:07 +00:00
Alexander Shishkov
538eeeab1d minor changes in wrapper 2 2012-03-15 15:43:14 +00:00
Alexander Shishkov
10b0f29372 minor changes in wrapper 2012-03-15 15:36:14 +00:00
Alexander Shishkov
bf4df828f7 minor changes in wrapper 2012-03-15 15:30:01 +00:00
Alexander Shishkov
7b3ec537b4 minor changes in wrapper 2012-03-15 15:12:52 +00:00
Maria Dimashova
c13febc4d4 minor refactoring CvCapture_OpenNI::CvCapture_OpenNI 2012-03-15 09:59:23 +00:00
Alexander Reshetnikov
36b2ff3cf3 Fixed compiling error under Ubuntu with ffmpeg 0.7.x and advised under Windows 2012-03-15 09:24:03 +00:00
Alexander Shishkov
0ea66a38ff fixed compilation FFMPEG wrapper on Windows 2012-03-15 07:22:31 +00:00
Alexander Reshetnikov
e0b772a392 Added a first version of new ffmpeg wrapper 2012-03-12 17:07:54 +00:00
Alexander Shishkov
6051e27a09 added support of Asus XtionPRO (thanks to Gustav Karlsson for his patches) #1657 2012-03-12 16:07:42 +00:00
Alexander Shishkov
be63ce723f #1672
updated links in cheatsheet
renamed directory for Mat tutorial 
changed links from willow docs to opencv.itseez.com, from Trac to current Redmine
2012-03-11 14:35:46 +00:00
Andrey Kamaev
18dbe6b3e5 cmake scripts are updated to prefer includes from the OpenCV source tree 2012-03-03 15:49:23 +00:00
Alexander Shishkov
d05b788db4 fixed compilation problems with MinGW after rev7353 2012-02-28 12:39:25 +00:00
Alexander Reshetnikov
a92e3dcdad Updated positioning test (removed frame reading) 2012-02-27 14:37:20 +00:00
Andrey Kamaev
8141a5026c Refactored cmake for 3rdparty libs 2012-02-24 13:53:22 +00:00
Andrey Kamaev
216d75ccae Restored missed } 2012-02-24 12:45:23 +00:00
Alexander Reshetnikov
9b5534a6e0 Fixed syntax error in cap_dc1394_v2.cpp 2012-02-24 12:27:20 +00:00
Andrey Kamaev
a8f0c93379 Modified zlib search. Use system zlib on Android by default 2012-02-24 12:23:34 +00:00
Alexander Reshetnikov
b12f18536f Added new VideoCapture properties for ieee1394 cameras 2012-02-24 10:54:52 +00:00
Alexander Reshetnikov
d7763d99de Minor code changes in test_video_io.cpp 2012-02-22 22:10:53 +00:00
Alexander Reshetnikov
23c2275449 Added conditional compiling for video i/o tests in highgui. 2012-02-22 17:12:25 +00:00
Alexander Reshetnikov
8b7edda6ac Added cvShowImage working with handles under Windows. 2012-02-22 13:30:47 +00:00
Alexander Shishkov
50df95650a fixed #924 2012-02-22 12:16:01 +00:00
Alexander Shishkov
f7866677eb fixed #1615 2012-02-22 12:13:56 +00:00
Vladislav Vinogradov
2d30480982 created wrappers for new NPP functions
removed void integral(const GpuMat& src, GpuMat& sum, GpuMat& sqsum, Stream& stream) - it fails with NPP_NOT_IMPLEMENTED error
updated docs, accuracy and performance tests
2012-02-22 10:00:53 +00:00
Andrey Kamaev
e426dfc396 Fixed #1613: removed YUV420i color conversion constants 2012-02-21 15:08:03 +00:00
Alexander Reshetnikov
f83aa74bc4 Updated ffmpeg implementation (setProperty & getProperty methods) 2012-02-18 12:56:00 +00:00
Andrey Kamaev
691d392312 Fixes: Android NDK r7b, android build warnings, build with Visual Studio 2005. 2012-02-16 20:29:35 +00:00
Vadim Pisarevsky
716a5d04ab fixed a few problems detected by Xcode 4.2.1 2012-02-15 19:48:04 +00:00
Alexander Reshetnikov
deee349ba7 removed highgui video tests execution on macos; also minor code changes 2012-02-15 12:06:46 +00:00
Anatoly Baksheev
84db4eb6fa fixed ~200 warnings for windows
minor build system changes (now cuda code in opencv_core is compiled using CUDA_ARCH* cmake variables)
2012-02-14 10:22:34 +00:00
Alexander Reshetnikov
edc9d4f951 fixed compiling error under Windows; updated test_video_io.cpp 2012-02-13 12:41:27 +00:00