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
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
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
Valeriy Van
574f319c74
Fixes spelling in comment
2016-08-23 22:04:41 +03:00
Pavel Vlasov
30a6cee2fe
Instrumentation for OpenCV API regions and IPP functions;
2016-08-19 18:10:03 +03: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
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
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
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
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