1c18b1d245
Merge pull request #7370 from souch55:Fixxn
2016-10-01 10:44:56 +00:00
a34fbf7bb1
Fixed identifiers warns
2016-09-30 15:16:29 +05:30
dc3d0cbc22
Merge pull request #7266 from alalek:pr7159
2016-09-16 21:18:26 +00:00
a35bec1e0a
Merge pull request #7293 from Algomorph:master
2016-09-16 09:57:34 +00:00
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
60b33046a7
[Issue #7290 ] Fixes OpenNI and OpenNI2 linking conflict
2016-09-15 17:13:04 +02:00
a4a6ee34bf
Added support for V4L2_PIX_FMT_Y16
2016-09-15 11:06:15 -04:00
32df09c275
Merge pull request #7287 from seanm:master
2016-09-15 10:39:49 +00:00
5357e28a2f
Removed some extra semi-colons
...
Fixes clang -Wextra-semi warnings.
2016-09-14 16:22:35 -04:00
05b15943d6
Merge pull request #7188 from valeriyvan:andfutheriosfixes
2016-09-14 17:05:34 +00:00
d1492eefca
Merge pull request #7181 from valeriyvan:ioscleanup
2016-09-14 17:04:59 +00:00
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
4e918fb987
Merge pull request #7165 from PkLab:doc_videoio
2016-09-09 18:01:41 +00:00
be65701908
Large update of videoio doc and samples following mshabunin comments
2016-09-09 18:46:11 +02:00
f85e33f4af
videoio: refactor AVFoundation code integration
2016-09-09 17:42:41 +03:00
03767340bb
ffmpeg: fill avg_frame_rate
2016-09-08 15:43:34 +03:00
6d54abbd0f
ffmpeg: fix get_fps()
2016-09-08 14:41:57 +03:00
4e8f8922e2
Merge pull request #7170 from alalek:fix_build
2016-08-29 10:15:58 +00:00
5a71bde79a
Changes existential NSStringFromSelector(_cmd) for straightforward __FUCNTION__
2016-08-28 12:48:08 +03:00
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
31e790da33
Fixes spelling in NSLog
2016-08-28 12:29:58 +03:00
69c7eea694
Cleans up ios stuff declaration removing not needed ivars backing properties
2016-08-27 01:10:17 +03:00
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
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
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
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
574f319c74
Fixes spelling in comment
2016-08-23 22:04:41 +03:00
767780a4b2
add VideoCapture / VideoWriter AVFoundation implementation for Mac
2016-08-23 10:51:58 -07:00
30a6cee2fe
Instrumentation for OpenCV API regions and IPP functions;
2016-08-19 18:10:03 +03:00
b9ea59df35
Merge pull request #6995 from PkLab:i6746_naming_videoio_enums
2016-08-15 09:01:24 +00:00
3ea02018b5
Naming some enumerations in videoio
2016-08-11 20:27:42 +02:00
74e997f15b
Merge pull request #7062 from kurenai:return_if_camera_disconnected
2016-08-11 14:07:42 +00:00
c61f4e8863
return false from VideoCapture::grabFrame when camera is disconneted
2016-08-08 20:41:56 +08:00
b42288c2de
Cleaner fix for crash on double-stop of CvVideoCamera
2016-08-04 12:44:07 -04:00
3d19de2b58
Fix crash on double-stop of CvVideoCamera
2016-08-02 17:52:02 -04:00
6b09ada5d4
Merge pull request #6899 from alalek:ffmpeg_update
2016-07-21 07:31:11 +00:00
daf1879a2e
test: ffmpeg: change resolution for H264 test
2016-07-21 00:20:18 +03:00
474868a892
Merge pull request #6884 from alalek:migration
2016-07-18 07:49:38 +00:00
464aa5e555
Merge pull request #6803 from alalek:issue_6720
2016-07-15 13:58:39 +00:00
0e6aa189cb
Merge pull request #6905 from alalek:ffmpeg_fix_get_fps
2016-07-15 12:58:19 +00:00
f3494647c5
Merge pull request #6762 from maff91:master
2016-07-14 16:17:03 +00:00
998c43ffea
videoio: ffmpeg: fix get_fps() implementation
2016-07-14 15:00:54 +03:00
1f26e73478
ffmpeg: try to load ffmpeg wrapper dll from the current module directory
2016-07-12 13:29:36 +03:00
ddc0b42bc3
migration: github.com/opencv/opencv
2016-07-12 12:51:12 +03:00
3f2ab5d3b5
Fix bug #6682 (Can't change resolution for YUY2 camera with DShow)
2016-07-02 18:10:04 +03:00
330e4bb48a
Merge pull request #6734 from PkLab:doc_videoio_enums
2016-07-01 13:24:05 +00:00
5346870920
Merge pull request #6558 from lletourn:master
2016-06-30 13:44:16 +00:00
639c8fc6d6
Merge pull request #5870 from IshankGulati:VideoCapture-fix
2016-06-30 13:20:51 +00:00
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
f274c592e4
Use copydoc for the list of valid property identifier in VideoCapture and VideoWriter docs
2016-06-27 19:17:51 +02:00
Alexander Alekhin
sourin
Vadim Pisarevsky
Gregory Kramida
Luis Roberto Morales Iglesias
stbnps
Sean McBride
Valeriy Van
Maksim Shabunin
PkLab.net
Alexander Alekhin
Valeriy Van
Matthew Self
yoffy
Pavel Vlasov
kurenai
David Wolever
Alexander Alekhin
Maksim Shabunin
Michael Shtutman
Andrey Pavlenko