kvaghel1
6fd9edc50f
Fix frame timestamp in VideoCapture::get
2017-05-22 21:22:35 -04:00
Neio Zhou
7faf8cd06e
Aravis: support Bayer GR 8 raw format.
2017-05-17 08:31:24 -07:00
Vadim Pisarevsky
0d60c0e8c4
Merge pull request #8712 from grundman:patch-5
2017-05-17 15:02:45 +00:00
Arek
9edcd9b4ef
Merge pull request #8711 from ArkadiuszRaj:aravis_autoexposure_correction
...
Aravis: Use of std::fabs, added support for 16-bit mono files and exposure compensation (#8711 )
* Use of std::fabs, added support for 16-bit mono files
* Correction in priority2 stage & adding exposure compensation
2017-05-12 23:46:46 +03:00
Matthias Grundmann
0e64e68d31
Update cap_mjpeg_encoder.cpp
...
Avoid shifting by 32bits; undefined behavior according to c - standard
2017-05-10 13:29:02 -07:00
Vadim Pisarevsky
05387b3921
Merge pull request #8271 from ziggy90127:avfoundation-bugfix1
2017-05-03 12:59:44 +00:00
brian-armstrong-discord
9e054d3880
Merge pull request #8492 from brian-armstrong-discord:exif_inmemory
...
autorotate in-memory jpegs (#8492 )
* autorotate in-memory jpegs
* correct indentation (4 spaces)
* imgcodecs: don't apply EXIF rotation for unloaded images
* videoio: don't try to rotate MJPEG stream
* imgcodecs: ByteStreamBuffer::seekoff support all seek "dir"
* imgcodecs: fix condition: "off == egptr() - eback()" is valid offset
2017-04-14 23:12:07 +03:00
orisano
550ca10ec6
Remove stdout log when destructor called.
2017-04-12 17:12:25 +09:00
Pavel Rojtberg
d92d82d194
cap_v4l: SetProperty - do not return false while setting video size
2017-04-04 15:07:02 +02:00
Maksim Shabunin
e72d353b45
Download cache
2017-03-24 16:19:56 +03:00
Alexander Alekhin
3e2b05b096
Merge pull request #8274 from abratchik:mser.brisk.3.0.0-rc1
2017-03-06 10:22:29 +00:00
Vadim Pisarevsky
f46fa6e096
Merge pull request #8283 from ramele1907:master
2017-03-02 05:54:06 +00:00
abratchik
276e47afae
fix #7833
2017-02-26 15:14:34 +04:00
ziggy90127
d69b3e385e
Add AVMediaTypeMuxed capture devices to AVFoundation, just as QTKit does.
2017-02-26 01:36:26 -07:00
ziggy90127
0aadab0941
Add AVMediaTypeMuxed capture devices to AVFoundation, just as QTKit does.
2017-02-25 15:48:09 -07:00
Alexander Alekhin
0c00242f7a
Merge pull request #8235 from berak:fix_dshow_leak
2017-02-24 11:11:20 +00:00
ionut
a41d877fe6
Change the value of bit/pixel from channels to 8*channels because videos encoded
...
by cap_mjpeg_encoder.cpp don't play on windows media player.
Issue number #8113
2017-02-21 19:15:40 +02:00
berak
d7240d1a28
fix leaking handle in cap_dshow.cpp
2017-02-21 14:27:12 +01:00
Alexander Alekhin
eaba0e6358
cmake: append '-framework UIKit' for videoio/imgcodecs module
2017-02-21 13:37:37 +03:00
Alexander Alekhin
8633ef451e
cmake: cleanup unused defines
2017-02-10 15:18:29 +03:00
PkLab
ece3fac7ef
Merge pull request #8112 from PkLab:Fix_7898
...
CoInitialize/CoUninitialize in VFW classes (#8112 )
2017-02-01 14:37:24 +00:00
PkLab.net
eb768514c3
Fix misplaced description CAP_PROP_SETTINGS and others minor changes in videoio doc
2017-01-26 17:10:32 +01:00
Dal Rupnik
c10283b2b6
Replaced macro with built-in OpenCV export
2017-01-24 10:26:19 +01:00
Dal Rupnik
a50efda49d
Added export functions for ObjC classes
2017-01-23 17:15:17 +01:00
Dal Rupnik
e71ff78f7f
Merge pull request #8009 from Legoless:master
...
CMake: Building Dynamic Framework on iOS (#8009 )
* Updated python script with dynamic parameter
Updated python script to build static library by default
Updated python script to include bitcode flag
Added bitcode flag to c flags
Fixed directories and targets with static
Bitcode parameter fixed
Fixed script for static library
Fixed parameters in build function
Updated cmake common toolchain
Added changes to OpenCV Utils
Updates to cmake
Added cache internal
Updates to common toolchain
Fixed path in framework destination and added UIKit dependency
Dynamic plist for framework
Lib version removed hardcoded value
Removed trailing whitespace in toolchain
* Removed trailing whitespace
* Fixed typo in comment
* Renamed bitcode variable to bitcodedisabled
* Fixed target device family
2017-01-20 19:16:01 +03:00
Alexander Alekhin
d0f883524e
cmake(osx): fix CoreImage error ( #7916 )
2016-12-23 11:30:17 +03:00
chacha21
166d75e3c5
Fix for unhandled error cases when using Media Foundation
...
Some function calls to Media Foundation can fail and retrun null
pointers. They should be checked before being dereferenced to avoid a
crash.
2016-12-13 10:40:06 +01:00
Alexander Alekhin
3ae1990727
Merge pull request #7769 from alalek:cmake_ffmpeg_cleanup
2016-12-01 20:24:05 +00:00
Alexander Alekhin
39ff8a0d26
cmake: cleanup ffmpeg detection
2016-12-01 19:33:27 +03:00
Alexander Alekhin
5985d71657
Merge pull request #7757 from mshabunin:tbb-search
2016-12-01 15:42:53 +00:00
mshabunin
695c518384
Updated TBB search script and code checks
2016-12-01 16:58:38 +03:00
Alexander Alekhin
e547bbbc3f
videoio: preserve conflict with common properties
...
Usage:
writer.set(cv::CAP_PROP_IMAGES_BASE + cv::IMWRITE_JPEG_QUALITY, 80);
2016-12-01 15:37:12 +03:00
Alexander Alekhin
c560ff23ad
videoio: images: fix buffer overflow problem
2016-12-01 15:24:36 +03:00
Tsukasa Sugiura
e4985f604a
Add support image save parameters in VideoWriter
...
Add support image save parameters in cv::VideoWriter.
This change will become available setting same parameters as
cv::imwrite() to cv::VideoWriter::set( cv::IMWRITE_*, value ).
2016-12-01 00:55:00 +09:00
Simmo Saan
6c524e8444
Allow V4L, V4L2 to be used as preferred capture API
2016-11-29 21:31:34 +02:00
Vadim Pisarevsky
9638dfcd85
Merge pull request #7641 from alalek:warnings
2016-11-22 13:31:26 +00:00
Arek
866f8eb1e7
Merge pull request #7695 from ArkadiuszRaj:aravis-release-bug-fix
...
* Aravis: fixing releasing object when no communication with camera is possible
* Removing unnecessary include
2016-11-21 04:22:43 +03:00
Alexander Alekhin
40aa8aa862
ffmpeg: check return value
2016-11-18 13:26:19 +03:00
sourin
94b5a74067
Fixed with review comments.
2016-11-15 12:16:15 +05:30
panxiaochun
bec3479f9e
fix the problem:repeatedly stop cause app crash
2016-10-28 15:50:37 +08:00
panxiaochun
f888f47102
remove self. in release method
2016-10-28 14:48:49 +08:00
panxiaochun
03a9fd46c7
fix the problem: leak memory when repeatedly start and stop
2016-10-28 11:18:33 +08:00
Arek
e77bc24b96
Merge pull request #7518 from ArkadiuszRaj:aravis-buffer-status
...
Aravis several updates
* Fix adressing camera with id=0
* Aravis buffer property control & status added
* Modify of autoexposure algorith, ream frame ID from aravis + new properites
* Change of macro name
* VideoCapture now returns no frame on camera disconnecion
* Allow aravis-0.4 usage, proper camera object release.
2016-10-22 19:07:55 +03:00
Sean McBride
943ac96526
Eliminated use of obsolete 'register' keyword
...
Fixes clang warnings about uses of this obsolete keyword.
2016-10-20 20:19:14 -04:00
Jake Kesinger
bd50553149
videoio: Fix for valgrind warning in icvGetPropertyCAM_V4L
...
https://github.com/opencv/opencv/issues/7380
2016-10-18 14:18:35 -04:00
Guillaume Jacob
df2b591896
videoio: fix segfault if CONVERT_RGB is false (issue #7465 )
2016-10-17 23:01:30 +02:00
Arek
4ea27061ee
Merge pull request #7472 from ArkadiuszRaj:aravis-autoexposure
...
Aravis SDK: Basic software based autoexposure control
* Basic software based autoexposure control
* Aravis autoexposure: skip frame taken while changing exposure setup
2016-10-16 19:14:58 +03:00
ArkadiuszRaj
19bc3f4d17
Chenge arv_camera_abort_acquisition to arv_camera_stop_acquisition
2016-10-09 20:40:00 +02:00
ArkadiuszRaj
8bd595acfe
fourcc support, improved buffer handling, check if exposure, gain & fps properties are available
2016-10-09 16:58:30 +02:00
ArkadiuszRaj
48ae99ecef
Support for MONO8 & MONO12 pixel formats
2016-10-08 13:01:01 +02:00
ArkadiuszRaj
d80fd0c85c
Missing declaration
2016-10-07 22:22:46 +02:00
ArkadiuszRaj
70c12e5407
Basic support for GigE cameras via Aravis SDK
2016-10-07 21:55:49 +02:00
Vadim Pisarevsky
83f2eb79f1
make sure that the empty mat is copied to UMat properly - i.e. UMat becomes empty. Before the patch such copy operation crashed
2016-10-05 14:07:50 +03:00
Alexander Alekhin
1c18b1d245
Merge pull request #7370 from souch55:Fixxn
2016-10-01 10:44:56 +00:00
sourin
a34fbf7bb1
Fixed identifiers warns
2016-09-30 15:16:29 +05:30
Vadim Pisarevsky
dc3d0cbc22
Merge pull request #7266 from alalek:pr7159
2016-09-16 21:18:26 +00:00
Alexander Alekhin
a35bec1e0a
Merge pull request #7293 from Algomorph:master
2016-09-16 09:57:34 +00:00
Gregory Kramida
0d626c8fef
v4l2 backend: Y16 default behavior fixed & FOURCC setting added
...
1) Cameras started with Y16 (V4L2_PIX_FMT_Y16) format via v4l2 backend will now exhibit default camera behavior, i.e. convert the 16-bit image to BGR as with all other formats. 16-bit 1-channel output will now only be produced for Y16 if CV_CAP_PROP_CONVERT_RGB is set to "false" using VideoCap::set method.
2) v4l2 videoio backend now supports setting CV_CAP_PROP_FOURCC explicitly (icvSetPropertyCAM_V4L function in cap_v4l.cpp), allowing users to manually set the codec on cameras that support multiple codecs.
2016-09-15 21:02:24 -04:00
Luis Roberto Morales Iglesias
60b33046a7
[Issue #7290 ] Fixes OpenNI and OpenNI2 linking conflict
2016-09-15 17:13:04 +02:00
stbnps
a4a6ee34bf
Added support for V4L2_PIX_FMT_Y16
2016-09-15 11:06:15 -04:00
Alexander Alekhin
32df09c275
Merge pull request #7287 from seanm:master
2016-09-15 10:39:49 +00:00
Sean McBride
5357e28a2f
Removed some extra semi-colons
...
Fixes clang -Wextra-semi warnings.
2016-09-14 16:22:35 -04:00
Alexander Alekhin
05b15943d6
Merge pull request #7188 from valeriyvan:andfutheriosfixes
2016-09-14 17:05:34 +00:00
Alexander Alekhin
d1492eefca
Merge pull request #7181 from valeriyvan:ioscleanup
2016-09-14 17:04:59 +00:00
Valeriy Van
f1dcf71dd7
Merge pull request #7178 from valeriyvan:iosfixes
...
* Changes delegate property from assign to weak
In modern Objective-C delegate should be weak. In very rare conditions you might want delegate be strong.
Assign for delegate is sign of legacy code.
This change prevents crash when you forget nil delegate in dealloc and makes rush with nilling delegate unnecessary.
This change shouldn't break any existing code.
* Adds implementation for setters and getters for weak delegate properties for non ARC Obj-C files
For whatever reason compiler can't synthesize these.
And yes, it's time to convert all Objective-C stuff to ARC.
2016-09-14 14:48:41 +03:00
Maksim Shabunin
4e918fb987
Merge pull request #7165 from PkLab:doc_videoio
2016-09-09 18:01:41 +00:00
PkLab.net
be65701908
Large update of videoio doc and samples following mshabunin comments
2016-09-09 18:46:11 +02:00
Alexander Alekhin
f85e33f4af
videoio: refactor AVFoundation code integration
2016-09-09 17:42:41 +03:00
Alexander Alekhin
03767340bb
ffmpeg: fill avg_frame_rate
2016-09-08 15:43:34 +03:00
Alexander Alekhin
6d54abbd0f
ffmpeg: fix get_fps()
2016-09-08 14:41:57 +03:00
Alexander Alekhin
4e8f8922e2
Merge pull request #7170 from alalek:fix_build
2016-08-29 10:15:58 +00:00
Valeriy Van
5a71bde79a
Changes existential NSStringFromSelector(_cmd) for straightforward __FUCNTION__
2016-08-28 12:48:08 +03:00
Valeriy Van
517be4bfa9
Changes [error localizedDescription] for [error description] in NSLog
...
There's no sense to log error messages in user’s locale.
Imagine you’re trying to guess what's going on decrypting logs in hebrew, arabic, slavic. localizedDescription is for end user messages, not for logs.
2016-08-28 12:34:50 +03:00
Valeriy Van
31e790da33
Fixes spelling in NSLog
2016-08-28 12:29:58 +03:00
Valeriy Van
69c7eea694
Cleans up ios stuff declaration removing not needed ivars backing properties
2016-08-27 01:10:17 +03:00
Valeriy Van
f1db065c10
Unifies Obj-C property attributes changing retain to strong
...
strong and retain are synonymous but using strong along with obsolete synonym retain in one file is negligent
2016-08-25 21:40:16 +03:00
Alexander Alekhin
5383a625a7
fix Win build, change default WINNT macro to WinXP
...
Returning to Win2k value is possible via this CMake option:
cmake -DOPENCV_EXTRA_FLAGS="/D_WIN32_WINNT=0x0500" ...
2016-08-25 16:21:52 +03:00
Matthew Self
0882936707
Fix buffer release issue
...
CvVideoWriter_AVFoundation_Mac had a serious buffer release bug.
Also made writeFrame() block until isReadyForMoreMediaData rather than
return an error.
2016-08-23 12:38:14 -07:00
Matthew Self
a92da54e79
Add support for CAP_PROP_MODE
...
Support setting CAP_PROP_MODE to capture grayscale or YUV frames much
faster from CV_CAP_AVFOUNDATION_MAC.
2016-08-23 12:38:10 -07:00
Valeriy Van
574f319c74
Fixes spelling in comment
2016-08-23 22:04:41 +03:00
yoffy
767780a4b2
add VideoCapture / VideoWriter AVFoundation implementation for Mac
2016-08-23 10:51:58 -07:00
Pavel Vlasov
30a6cee2fe
Instrumentation for OpenCV API regions and IPP functions;
2016-08-19 18:10:03 +03:00
Maksim Shabunin
b9ea59df35
Merge pull request #6995 from PkLab:i6746_naming_videoio_enums
2016-08-15 09:01:24 +00:00
PkLab.net
3ea02018b5
Naming some enumerations in videoio
2016-08-11 20:27:42 +02:00
Alexander Alekhin
74e997f15b
Merge pull request #7062 from kurenai:return_if_camera_disconnected
2016-08-11 14:07:42 +00:00
kurenai
c61f4e8863
return false from VideoCapture::grabFrame when camera is disconneted
2016-08-08 20:41:56 +08:00
David Wolever
b42288c2de
Cleaner fix for crash on double-stop of CvVideoCamera
2016-08-04 12:44:07 -04:00
David Wolever
3d19de2b58
Fix crash on double-stop of CvVideoCamera
2016-08-02 17:52:02 -04:00
Vadim Pisarevsky
6b09ada5d4
Merge pull request #6899 from alalek:ffmpeg_update
2016-07-21 07:31:11 +00:00
Alexander Alekhin
daf1879a2e
test: ffmpeg: change resolution for H264 test
2016-07-21 00:20:18 +03:00
Maksim Shabunin
474868a892
Merge pull request #6884 from alalek:migration
2016-07-18 07:49:38 +00:00
Maksim Shabunin
464aa5e555
Merge pull request #6803 from alalek:issue_6720
2016-07-15 13:58:39 +00:00
Alexander Alekhin
0e6aa189cb
Merge pull request #6905 from alalek:ffmpeg_fix_get_fps
2016-07-15 12:58:19 +00:00
Alexander Alekhin
f3494647c5
Merge pull request #6762 from maff91:master
2016-07-14 16:17:03 +00:00
Alexander Alekhin
998c43ffea
videoio: ffmpeg: fix get_fps() implementation
2016-07-14 15:00:54 +03:00
Alexander Alekhin
1f26e73478
ffmpeg: try to load ffmpeg wrapper dll from the current module directory
2016-07-12 13:29:36 +03:00
Alexander Alekhin
ddc0b42bc3
migration: github.com/opencv/opencv
2016-07-12 12:51:12 +03:00
Michael Shtutman
3f2ab5d3b5
Fix bug #6682 (Can't change resolution for YUY2 camera with DShow)
2016-07-02 18:10:04 +03:00
Andrey Pavlenko
330e4bb48a
Merge pull request #6734 from PkLab:doc_videoio_enums
2016-07-01 13:24:05 +00:00
Alexander Alekhin
5346870920
Merge pull request #6558 from lletourn:master
2016-06-30 13:44:16 +00:00
Alexander Alekhin
639c8fc6d6
Merge pull request #5870 from IshankGulati:VideoCapture-fix
2016-06-30 13:20:51 +00:00
PkLab.net
adcdab394b
Merge branch 'master' of git://github.com/Itseez/opencv into doc_videoio_enums
...
# Resolved Conflicts:
# modules/videoio/include/opencv2/videoio.hpp
2016-06-28 16:40:30 +02:00
PkLab.net
f274c592e4
Use copydoc for the list of valid property identifier in VideoCapture and VideoWriter docs
2016-06-27 19:17:51 +02:00
PkLab.net
6c3d8abe2c
Doxygen documentation for CAP_* enums (using current comments in code)
2016-06-27 19:09:23 +02:00
Dmitry Trifonov
f9e6741807
added support for OpenNI2 IR stream #4366
2016-06-27 10:04:59 -07:00
Adam Rankin
2577194c70
Correcting return type from videoDevice::findType to be int thus allowing detection of failed device init request
2016-06-07 15:18:40 -04:00
Louis Letourneau
c03d778ec7
This fixes the seeking in h264 B-Frame enabled video issue. #4890
2016-06-02 11:24:37 -04:00
Dmitry Trifonov
688ebd8960
add support for multiple OpenNI2 devices
2016-05-12 18:12:51 -07:00
Julien Nabet
a29c814bd8
cppcheck: fix some reports
...
All of these: (performance) Prefer prefix ++/-- operators for non-primitive types.
[modules/calib3d/src/fundam.cpp:1049] -> [modules/calib3d/src/fundam.cpp:1049]: (style) Same expression on both sides of '&&'.
2016-04-29 15:41:39 +02:00
Alexander Alekhin
67a734ce73
Merge branch '2.4' into master
...
Commits:
67fe57a
add fixed video
db0ae2c
Restore 2.4 source branch for bug fix 6317.
97ac59c
Fix a memory leak indirectly caused by cvDestroyWindow
eb40afa
Add a workaround for FFmpeg's color conversion accessing past the end of the buffer
421fcf9
Rearrange CvVideoWriter_FFMPEG::writeFrame for better readability
912592d
Remove "INSTALL_NAME_DIR lib" target property
bb1c2d7
fix bug on border at pyrUp
2016-04-21 20:15:08 +03:00
Alexander Alekhin
289b6ff2a5
Merge pull request #6393 from paroj:v4l_exposure
2016-04-18 15:14:21 +00:00
Alexander Alekhin
9e9165c25e
Merge pull request #5516 from AVshokurov:master
2016-04-18 15:13:14 +00:00
Alexander Alekhin
169b5e9fde
Merge pull request #6359 from alalek:videocapture_exceptions
2016-04-17 09:30:43 +00:00
StevenPuttemans
88c0d64b4e
fixing gstreamer cap
2016-04-14 14:16:05 +02:00
Alexander Alekhin
fc55e54aa1
Merge pull request #6318 from paroj:gst_cap_props
2016-04-13 10:05:40 +00:00
Alexander Alekhin
9744073b95
videoio: give chance for all enabled backends
...
"Eat" unexpected backend exceptions
2016-04-12 20:05:21 +03:00
Alexander Alekhin
2b29db860c
Merge pull request #6391 from virtuald:v4l-device-name
2016-04-12 12:57:21 +00:00
Pavel Rojtberg
91678ff828
cap_v4l: allow manually controlling exposure
2016-04-12 12:10:54 +02:00
Dustin Spicuzza
e489f29d0f
v4l/libv4l: allow opening device by name
...
- Allows using non-default device names such as /dev/v4l/by-path/pci-0000:00:1d.0-usb-0:1.1:1.0-video-index0
2016-04-12 01:25:34 -04:00
Andreas Franek
1b3a967223
Enable directly writing jpeg-encoded streams with GStreamer
...
CvVideoWriter_GStreamer assumes a JPEG encoded stream if the height of
the given frame size is 1.
2016-04-11 17:10:57 +02:00
shengyu
2d41321ca0
fix quote
2016-04-06 14:31:06 +08:00
Alexander Alekhin
7d9a480597
ffmpeg: interrupt callback fix
2016-04-04 13:17:04 +03:00
Alexander Alekhin
ee123b8a9e
Merge pull request #6311 from peters:master
2016-03-26 19:55:17 +00:00
Pavel Rojtberg
9dc14b3efc
cap_gst: inspect sink instead of videoconvert to find out properties
...
videoconvert might not be present on a manual pipeline, but appsink must
be.
2016-03-23 16:24:10 +01:00
Lucas Solomon
d2d5d32fe0
remove trailing whitespace
2016-03-22 22:31:16 -07:00
Lucas Solomon
688b4d9d7a
return 0 from VideoCapture::read() when cannot connect to camera
2016-03-22 19:03:28 -07:00
Peter Rekdal Sunde
278747ba45
Add support for ffmpeg 3.0.
2016-03-22 22:52:35 +01:00
Alexander Alekhin
a4e35d83ff
Merge pull request #6267 from dtmoodie:issue_5918
2016-03-21 09:37:11 +00:00
Dan
da189ce1e0
Fixed regression in cv::VideoCapture with gstreamer back end that prevented viewing of rtsp streams.
2016-03-17 13:03:48 -04:00
Alexander Alekhin
2f4e38c831
Merge pull request #6283 from jlubawy:vfw-surface4-fix
2016-03-17 11:08:12 +00:00
Josh Lubawy
1bd8bcbdd9
Remove cstdio debug
2016-03-17 01:00:49 -07:00
Josh Lubawy
f715e5b0b2
Add support for YUV 4:2:0 NV12 frame format in VFW camera capture
2016-03-16 23:38:17 -07:00
Krishnaraj Bhat
9b8013d193
gcc6: fix misleading indentation warning
...
cosmetic changes to fix this warning.
real bugs not found
2016-03-07 17:06:16 +05:30
Alexander Alekhin
88a33a4e4f
Merge pull request #6201 from paroj:gst_noconvert
2016-03-03 11:36:05 +00:00
Pavel Rojtberg
ff77f4d9ef
GStreamer: allow reading raw MJPEG data
2016-03-02 17:31:20 +01:00
Péter Trombitás
410eb30c26
Fix for #6192 (Mismatching delete)
2016-03-01 21:40:05 +01:00
Marian Zajko
e55a053d71
ximea new param
...
- added CAP_PROP_XI_SENSOR_BOARD_TEMP parameter
- added acquisition resetting for paramters that require it
2016-02-17 11:18:49 +01:00
Alexander Alekhin
80102b76f9
Merge pull request #6074 from alalek:ffmpeg_interrupt_callback_compatibility
2016-02-11 15:00:52 +00:00
Alexander Alekhin
2c4ed7f8a5
Merge pull request #6051 from mshabunin:fix-cap-qtkit
2016-02-10 17:35:20 +00:00
Marian Zajko
c21657336b
ximea interface update
...
- fixed getProperty call definition
- added new parameter defitions
removed whitespaces
Reworked enumerators to keep values from previous commit
ximea enums fixes
- fixed whitespaces issue
- fixed duplicate enum values error
ximea enum definitions update
- fixed videioio.hpp code style
- fixed ABI violation in enums
- added new parameter handlers to cpp
XIMEA setProperty update
Added acquisition resetting to buffer size adjustment parameters.
2016-02-09 10:36:22 +01:00
Alexander Alekhin
c09b6000c6
ffmpeg: compatibility guard for interrupt callback feature
2016-02-06 15:20:36 +03:00
Peter Rekdal Sunde
da48061910
Add interrupt callback with default timeout of 30s. Fixes #5730 .
...
Fix docs build failure by re-indenting with spaces instead of tabs.
Trailing whitespace fixes. http://pullrequest.opencv.org/buildbot/builders/precommit_docs/builds/5152/steps/whitespace/logs/stdio
mingw build fix.
2016-02-04 18:09:14 +01:00
Maksim Shabunin
a2bda99921
MacOSX / QTKit capture: trying to fix invalid timer call
2016-02-02 14:30:37 +03:00
Philippe FOUBERT
43a1874e33
Bug correction:
...
The "CvCaptureCAM_XIMEA::getProperty" method had not the same signature as "CvCapture::getProperty" so it was not called when we use the "VideoCapture::get" method (the "const" specifier was missing).
2016-02-01 19:19:52 +01:00
Marian Zajko
a387d6fa26
- removed whitespaces
2016-01-25 13:13:13 +01:00
Marian Zajko
34c006fcc4
Fixed ximea cmake settings
...
Fixed ximea cmake settings for 32bit win build and linux.
2016-01-25 11:05:55 +01:00
Alexander Alekhin
285eb0a539
videoio ffmpeg: fix buffer allocation for unaligned frame sizes
2016-01-12 17:57:43 +03:00
HMM@T430s-x64
6b4d4a85b5
solve videoio/src/cap_mjpeg_decoder.cpp compiling problem using VS 2008
...
fixes #5878
2015-12-25 13:57:26 +03:00
Ishank gulati
e607a85df6
png-image-compatibility
2015-12-23 23:37:32 +05:30
Alexander Alekhin
3ee90a1ff4
ffmpeg: install both 32/64-bit versions (required for java/python 32/64-bit bindings)
2015-12-18 15:59:02 +03:00