Vadim Pisarevsky
cc1090cf3b
Merge pull request #3521 from ana-GT:registration_openni2
2015-01-21 10:48:23 +00:00
Vadim Pisarevsky
61f111143a
Merge pull request #3599 from a-wi:DShow_COM_interfaces_v3
2015-01-15 13:12:51 +00:00
VBystricky
d5092a6f7c
Add CV_CAP_PROP_POS_FRAMES property to cap_images.cpp
2015-01-15 01:55:17 +04:00
Artur Wieczorek
01717c83d7
Don't define destructors for COM-based interfaces.
2015-01-14 14:06:42 +01:00
Adam Borowski
7b0d1c932e
Get rid of sysctl includes on Linux.
...
The 'sysctl' syscall has been strongly deprecated on Linux for ages.
Currently, on old architectures it will spam syslog whenever used, and on
newer ones it's missing from the headers altogether. Opencv has migrated
away on Linux already, but #includes were left lingering. This commit
removes them on non-__APPLE__, unbreaking x32 (and probably others).
2015-01-13 01:52:56 +01:00
Vadim Pisarevsky
1c8493fb0d
Merge pull request #3549 from mshabunin:sphinx-doc-remove
2014-12-31 09:14:22 +00:00
Vadim Pisarevsky
9c872f5316
Merge pull request #3567 from vbystricky:intelperc_fix
2014-12-31 06:06:18 +00:00
vbystricky
083d8645a5
Fix error of compilation of cap_intelperc.cpp
2014-12-30 15:38:03 +03:00
Joe Howse
2d16026df6
more const correctness in OpenNI2 getProperty
2014-12-27 00:11:14 -04:00
Joe Howse
b7a3204c57
const correctness in OpenNI and OpenNI2 getProperty
2014-12-26 23:54:03 -04:00
Maksim Shabunin
d01bedbc61
Removed Sphinx documentation files
2014-12-26 19:12:19 +03:00
Vadim Pisarevsky
61886a61de
Merge pull request #3504 from a-wi:VideoCapture_get_const_v3
2014-12-26 14:37:47 +00:00
Maksim Shabunin
128e509527
Added enviroment search paths for OpenNI2 for linux and fixed specific warning
2014-12-24 15:07:05 +03:00
Vadim Pisarevsky
c0005fd293
Merge pull request #3520 from JoeHowse:master
2014-12-22 11:14:29 +00:00
Vadim Pisarevsky
432546e4c4
Merge pull request #3512 from vins31:OpenNi2_AsusXtion
2014-12-22 10:39:42 +00:00
Joe Howse
13c04120dd
For Java compatibility, avoiding explicit pseudonym in enum
2014-12-16 21:37:14 -04:00
Ana Huaman Quispe
1ad1b737c2
Fixed registration bug: It was ALWAYS OFF - even after changing the property
2014-12-16 19:45:50 -05:00
Joe Howse
620a969285
Allow BGR, RGB, or gray capture via libv4l
2014-12-16 20:07:37 -04:00
Artur Wieczorek
854a722c70
Implement VideoCapture::get, CvCapture::getProperty, IVideoCapture::getProperty as constant methods.
2014-12-16 16:08:22 +01:00
Ana Huaman Quispe
0b429fee7b
Changed CV_DbgAssert to CV_Assert when setting video modes for OpenNI2. Otherwise, in release mode the default modes never get set
2014-12-15 18:16:25 -05:00
vincentweb
4d12beb723
Added better OpenNI2 support to the Asus Xtion and Occipital Structure
...
sensors which do not have image generators.
2014-12-14 20:52:24 +01:00
Vadim Pisarevsky
f61db41d25
Merge pull request #3453 from mshabunin:doxygen-others
2014-12-02 09:05:32 +00:00
Dmitry-Me
c669b7e4cd
Simplify overengineered code
2014-12-01 17:58:06 +03:00
Maksim Shabunin
03e213ccae
Doxygen documentation: BiB references and fixes
2014-12-01 15:50:55 +03:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
dcae7698ad
Doxygen documentation for: highgui, video, imgcodecs and videoio
2014-12-01 15:47:13 +03:00
Alexander Alekhin
2981ee00d9
OpenNI2: prevent failure of setVideoMode() call with invalid parameters
...
Not all parameters are specified for openni::VideoMode, so
"selected" mode can be unsupported for device.
Replace default VideoMode constructor to result of getVideoMode() call.
2014-11-08 02:21:59 +03:00
Yusuke Suzuki
9cd08c662c
add V4L2_PIX_FMT_RGB24 convert code
2014-11-04 15:21:30 +09:00
Maksim Shabunin
071e78d02e
Disabled videoio_video_prop_fps test
...
This test does not return correct values with some software configurations.
Possible problem with ffmpeg on buildbot's linux-slave.
2014-10-24 11:37:15 +04:00
Vadim Pisarevsky
d767c9df58
Merge pull request #3349 from a-wi:DShow_Strsafe_header_v3
2014-10-20 06:49:18 +00:00
Artur Wieczorek
dcbe797980
Include strsafe.h to compile successfully under MinGW in Debug mode.
2014-10-18 20:38:34 +02:00
Maksim Shabunin
571ebb2373
Fixing iOS clang warnings, part 3
2014-10-17 18:15:21 +04:00
Maksim Shabunin
ef3d02214b
Fixing iOS clang warnings, part 2
2014-10-17 18:14:54 +04:00
Maksim Shabunin
420737e098
Fixing iOS clang warnings, part 1
2014-10-17 18:14:54 +04:00
Maksim Shabunin
630eddf25a
Extracted repeated cmake instruction block
2014-10-17 18:14:53 +04:00
Artur Wieczorek
ec93d103b7
Refactored code responsible for printing debug messages in DShow video capture module to reduce footprint in Release mode.
...
Replace printf function used for diagnostic purposes with dedicated DebugPrintOut function to output debug messages. This function is effective only in Debug mode and its body becomes empty in Release mode to reduce footprint.
2014-10-10 17:49:01 +02:00
Artur Wieczorek
c54928e003
Fixed getting CV_CAP_PROP_FOURCC property value
...
Save selected FCC in order to return proper CV_CAP_PROP_FOURCC property value (currently FCC for RGB24 is always returned).
2014-10-10 08:53:52 +02:00
Artur Wieczorek
efd237b8b8
Fixed media type guid for I420 in DShow capture.
...
FOURCC code bytes should be placed in the reverse order.
2014-10-10 08:53:50 +02:00
Artur Wieczorek
de0b46a765
Fixed selecting media type in DShow video capture.
...
Set correct value of sample size when calling IAMStreamConfig::SetFormat function. For non-RGB media type it can be set to zero value.
(See http://msdn.microsoft.com/en-us/library/windows/desktop/dd373477%28v=vs.85%29.aspx )
2014-10-10 08:53:48 +02:00
Artur Wieczorek
3a0b375104
Remove ATL dependency from MSMF capture code.
...
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
2014-10-01 12:02:28 +02:00
Artur Wieczorek
34533dc569
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
2014-09-29 00:39:35 +02:00
Artur Wieczorek
655b22e050
Fixed CMake issue with FFMPEG videoio configuration
2014-09-29 00:39:05 +02:00
Vadim Pisarevsky
e6f653af44
Merge pull request #3269 from asmorkalov:ocv_gstreamer3
2014-09-27 15:25:20 +00:00
Vadim Pisarevsky
f187fd99da
Merge pull request #3271 from mgeorg:reset_ffmpeg_mutex
2014-09-27 13:09:24 +00:00
Manfred Georg
8d95c91805
set ffmpeg mutex to NULL on destruction.
2014-09-26 09:44:25 -07:00
Alexander Smorkalov
23456d67e5
Added test on CAP_PROP_FRAMECOUNT option for cv::VideoCapture
2014-09-26 10:50:22 +04:00
Alexander Smorkalov
15251056ba
Fixed compatibility with GStreamer 1.x
2014-09-26 10:45:08 +04:00
Alexander Smorkalov
cc6e6aa028
Fixed query of basic VideoCapture properties. Added tests for them.
2014-09-25 14:40:54 +04:00
Artur Wieczorek
302b138aa7
CMake configuration for MSMF capture
...
Applied in PR3247 to 2.4 branch.
2014-09-25 12:05:54 +02:00
Artur Wieczorek
b91bd6716c
Fixed MSMF file capture error while opening the file containing unsupported video stream format
...
Applied in PR3260 to 2.4 branch
2014-09-25 11:54:15 +02:00
