generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #3425 from StevenPuttemans:fix_firewire_buffersize

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-11-16 18:06:20 +00:00
commit 8ebd474c0e
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/highgui/doc/reading_and_writing_images_and_video.rst
View File

@ -410,6 +410,8 @@ Returns the specified ``VideoCapture`` property
* **CV_CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported by DC1394 v 2.x backend currently) * **CV_CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported by DC1394 v 2.x backend currently)
* **CV_CAP_PROP_BUFFERSIZE** Amount of frames stored in internal buffer memory (note: only supported by DC1394 v 2.x backend currently)
**Note**: When querying a property that is not supported by the backend used by the ``VideoCapture`` class, value 0 is returned. **Note**: When querying a property that is not supported by the backend used by the ``VideoCapture`` class, value 0 is returned.
@ -465,6 +467,8 @@ Sets a property in the ``VideoCapture``.
* **CV_CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported by DC1394 v 2.x backend currently) * **CV_CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported by DC1394 v 2.x backend currently)
* **CV_CAP_PROP_BUFFERSIZE** Amount of frames stored in internal buffer memory (note: only supported by DC1394 v 2.x backend currently)
:param value: Value of the property. :param value: Value of the property.

2
modules/highgui/src/cap_dc1394_v2.cpp
View File

@ -686,6 +686,8 @@ double CvCaptureCAM_DC1394_v2_CPP::getProperty(int propId)
break; break;
case CV_CAP_PROP_ISO_SPEED: case CV_CAP_PROP_ISO_SPEED:
return (double) isoSpeed; return (double) isoSpeed;
case CV_CAP_PROP_BUFFERSIZE:
return (double) nDMABufs;
default: default:
if (propId<CV_CAP_PROP_MAX_DC1394 && dc1394properties[propId]!=-1 if (propId<CV_CAP_PROP_MAX_DC1394 && dc1394properties[propId]!=-1
&& dcCam) && dcCam)