Alexander Alekhin
61c870ae09
Merge pull request #12080 from mshabunin:fix-static-3
2018-07-31 14:53:28 +00:00
Alexander Alekhin
0bef42ba12
videoio: add note about image BGR format VideoWriter::write()
2018-07-28 09:08:09 +00:00
Maksim Shabunin
dd8e990451
Fixed several issues found by static analysis, GStreamer backend
2018-07-27 18:41:39 +03:00
Maksim Shabunin
e031bada7d
Fixed several issues found by static analysis, Windows-specific
2018-07-27 18:25:55 +03:00
Alexander Alekhin
9787ab598b
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-24 22:48:54 +03:00
Alexander Alekhin
5336b9ad19
Merge pull request #12048 from mshabunin:fix-static-2
2018-07-24 19:45:27 +00:00
Alexander Alekhin
8a2ce75d96
Merge pull request #12020 from alalek:videoio_backends_query_api
2018-07-24 19:43:49 +00:00
Maksim Shabunin
cbb1e867e5
More issues found by static analysis
2018-07-24 16:04:42 +03:00
Maksim Shabunin
e0603bb45f
Fixed several issues found by static analysis tools
2018-07-23 17:22:47 +03:00
Alexander Alekhin
b117302bca
Merge pull request #12016 from tyl12:fix_videoio_static_para
2018-07-21 03:50:58 +00:00
Teng Yiliang
dadde75ef0
use struct member width_set/height_set to replace static width/height.
...
the static variables will cause race-condition when operating in
multithread scenarios.
Signed-off-by: Teng Yiliang <ylteng@outlook.com>
Signed-off-by: Teng Yiliang <yiliang.teng@weimob.com>
2018-07-21 07:27:17 +08:00
Alexander Alekhin
270cc3bcbc
videoio: add routines to query information about backends API
...
into cv::videoio_registry namespace
2018-07-19 17:27:37 +03:00
Maksim Shabunin
a2a9a01e05
AVI container: verbose error messages
2018-07-18 15:22:42 +03:00
Alexander Alekhin
4560909a5e
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-17 19:27:48 +03:00
Maksim Shabunin
53eb27f508
AVI container: use C++ streams for file operations, check some operations for overflow
2018-07-16 13:46:28 +03:00
Alexander Alekhin
2da96be217
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-09 19:44:51 +03:00
Alexander Alekhin
b09a4a98d4
opencv: Use cv::AutoBuffer<>::data()
2018-07-04 19:11:29 +03:00
Alexander Alekhin
9a66331984
Merge pull request #11882 from alalek:videoio_vfw_lower_priority
2018-07-03 14:54:54 +00:00
Alexander Alekhin
f545aee66d
videoio(VFW): lower priority (after DSHOW)
2018-07-03 15:54:45 +03:00
Alexander Alekhin
b3578710cf
videoio(MSMF): fix 32-bit build crash
2018-07-03 15:28:55 +03:00
Alexander Alekhin
3165baa1f1
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-07-02 14:58:29 +03:00
Alexander Alekhin
5a27f7c81f
Merge pull request #11856 from alalek:videoio_msmf_fix_check
2018-06-30 04:52:36 +00:00
Alexander Alekhin
6ce26b72b1
Merge pull request #11860 from alalek:videoio_msmf_remove_cxx11_code
2018-06-30 04:51:20 +00:00
Alexander Alekhin
2dbaba077a
videoio(msmf): avoid using of C++11 code
...
build fails with MSVS 2012 without additional flags
2018-06-29 20:48:58 +00:00
Alexander Alekhin
7a2448672c
videoio(MSMF): avoid OpenCV load failure on Win7 machines
...
OpenCV binaries are compiled on Win10 environment
2018-06-29 20:22:26 +00:00
Alexander Alekhin
c3a90ccbad
videoio(MSMF): remove "always true" check
2018-06-29 15:23:48 +03:00
Vadim Pisarevsky
67259d7082
Merge pull request #11768 from alalek:videoio_msmf_async_live_capture
2018-06-27 18:12:10 +00:00
Florian Echtler
17888ce0fd
add support for 8-bit greyscale format
2018-06-27 15:31:53 +02:00
Vitaly Tuzov
67b67003c5
Disable MSMF VideoCapture fallback to existing camera in case provided index is out of range.
2018-06-26 14:04:02 +03:00
Alexander Alekhin
b39cd06249
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-06-25 22:03:17 +03:00
Rostislav Vasilikhin
18bc2a1a93
Kinect2 support added to OpenNI2 backend ( #11794 )
...
* Kinect2 support added to OpenNI2 backend
* more fixes for OpenNI2 backend
* whitespace fixed
* libfreenect2 support added
* const cast added
* mutable removed
2018-06-25 13:19:20 +03:00
Alexander Alekhin
2195f0cc62
Merge pull request #11795 from paroj:realsensev2
2018-06-23 18:50:43 +00:00
Pavel Rojtberg
2047abd9c3
videoio: realsense - add cvtColor as the pixel-format is only a hint
2018-06-19 17:55:09 +02:00
Alexander Alekhin
64f2b1b250
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-06-17 16:26:48 +03:00
Alexander Alekhin
8622b1254e
Merge pull request #11774 from adamrankin:cap_dshow_autofocus
2018-06-16 14:11:44 +00:00
Adam Rankin
ecf4b639e1
Adding the ability to toggle autofocus on/off for DirectShow webcams
2018-06-15 12:32:12 -04:00
Alexander Alekhin
9629af1aa9
videoio: MSMF async reader for camera stream
...
Synchronized reading from camera with heavy frame processing
provides bad effects (huge frame latency, processing frames from the past).
Generally, there is no way to process each frame and some frames will be dropped.
Allow preventive frame dropping to reduce lag of processed frames.
This mode is applied to cameras only (opened by 'index').
2018-06-14 18:37:05 +03:00
Alexander Alekhin
2bb5d1bca3
videoio(msmf): cleanup unused methods from ComPtr wrapper
...
Use Win32 TRUE/FALSE in SetUINT32() calls for bool parameters
2018-06-14 14:15:09 +03:00
Alexander Alekhin
8f24db048c
Merge pull request #11735 from alalek:videoio_msmf_fix_configureHW_reopen_condition
2018-06-14 09:57:39 +00:00
Alexander Alekhin
0d6518aaa0
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
OpenCV FFmpeg wrapper download links are preserved from ffmpeg/master branch
2018-06-13 19:34:44 +03:00
Alexander Alekhin
09c63e4f00
videoio(msmf): fix reopen condition in configureHW()
...
`camid` value is always -1 after close().
2018-06-13 16:29:45 +03:00
Alexander Alekhin
0d249c7448
videoio(msmf): replace custom debug print function
2018-06-09 17:38:32 +03:00
Alexander Alekhin
f72633b9f5
Merge pull request #11727 from alalek:videoio_msmf_use_Lock2D
2018-06-08 19:01:40 +00:00
Pavel Rojtberg
bfc227b8d4
videoio: update librealsense to API 2.0
...
this enables the usage of current sensors, while dropping support for
legacy devices, see:
https://github.com/IntelRealSense/librealsense#overview
Given limited resources, and that the legacy sensors where not that
great, I think we should focus on v2.
2018-06-08 18:23:00 +02:00
Vitaly Tuzov
cb4b6bb2dc
Fixed setting of frame size properties for MSMF-based VideoCapture
2018-06-08 18:55:06 +03:00
Alexander Alekhin
c64f6b3c22
videoio(MSMF): refactor grabFrame() / retrieveFrame() methods
...
- no behavior changes in grabFrame()
- added Lock2D() support into retrieveFrame()
2018-06-08 17:20:47 +03:00
Vadim Pisarevsky
7c3090ddcf
Merge pull request #11683 from alalek:videoio_ffmpeg_cleanup_dead_code
2018-06-06 12:21:00 +00:00
Alexander Alekhin
b0ae357cfb
Merge pull request #11687 from alalek:gstreamer_write_pipeline
2018-06-05 20:06:55 +00:00
Alexander Alekhin
277e9279cc
videoio(gstreamer): support dumping of VideoWriter pipeline
2018-06-04 18:39:20 +00:00
Alexander Alekhin
d041b0a599
videoio: fix capture modes
2018-06-04 19:48:51 +03:00
Alexander Alekhin
45dd575ed2
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
...
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch"
This reverts commit 9ba9358ecb
.
Revert "documentation: avoid links to 'master' branch from 3.4 maintenance branch (2)"
This reverts commit f185802489
.
2018-06-04 19:26:10 +03:00
Alexander Alekhin
2628662586
videoio(ffmpeg): cleanup, remove dead code
2018-06-04 19:07:22 +03:00
Alexander Alekhin
ec30b1294f
Merge pull request #11636 from alalek:cmake_ffmpeg_find_package
2018-06-04 14:37:36 +00:00
Alexander Alekhin
5d68c8dbe7
videoio(test): fixup information dump
2018-05-31 18:54:43 +03:00
Alexander Alekhin
b934702c7f
cmake: support find_package(FFMPEG)
...
Use "OPENCV_FFMPEG_USE_FIND_PACKAGE" variable to specify find_package() parameters
2018-05-31 18:27:01 +03:00
Alexander Alekhin
c94fe0c7e7
videoio(v4l): eliminate global variable
2018-05-31 15:11:20 +03:00
Alexander Alekhin
83d915eca1
videoio(v4l): don't pre-scan or cache list of available cameras
2018-05-31 15:11:20 +03:00
Alexander Alekhin
22f435ff4d
videoio(v4l): fix code indentation, tabs
2018-05-31 15:11:20 +03:00
Alexander Alekhin
ddba772297
videoio: fix isOpened() method for legacy APIs, fix "index" API list
2018-05-31 14:07:22 +03:00
Alexander Alekhin
133e9f2012
Merge pull request #11618 from alalek:ffmpeg_debug_log
2018-05-30 15:36:42 +00:00
Alexander Alekhin
8f28817373
Merge pull request #11617 from alalek:ffmpeg_fix_time_base
2018-05-29 15:19:13 +00:00
Alexander Alekhin
83ec0f526c
videoio(ffmpeg): add option to enable debug logs
2018-05-29 12:40:52 +00:00
Alexander Alekhin
cd9e43704e
videoio: backends priority list
2018-05-29 12:06:45 +00:00
Alexander Alekhin
5128c1ff1f
videoio(ffmpeg): specify stream->time_base
...
Using codec->time_base is deprecated to specify muxer settings.
Resolves issue with FPS value for AVI files with FFmpeg 4.0.
Related FFmpeg commits:
- 194be1f43e
- 91736025b2
2018-05-29 11:42:50 +00:00
Alexander Alekhin
0f298a4203
Merge remote-tracking branch 'upstream/3.4' into merge-3.4
2018-05-28 11:22:55 +00:00
Alexander Alekhin
0a6d190095
Merge pull request #11396 from terfendail:msmf_icapture
2018-05-24 18:30:09 +00:00
Alexander Alekhin
5a706eee8a
Merge pull request #11578 from alalek:build_warnings
2018-05-23 15:02:32 +00:00
Vitaly Tuzov
9622ca0e37
MSMF-based VideoCapture and VideoWriter backend changed to C++ interface
2018-05-23 17:54:08 +03:00
Alexander Alekhin
39b60f9b17
fix build warnings
2018-05-23 16:04:41 +03:00
Maksim Shabunin
1a15136536
GStreamer backend: fixed memory leak and version check
2018-05-23 10:48:13 +03:00
Alexander Alekhin
ba1bd64bf9
Merge pull request #11532 from paroj:realsense
2018-05-21 15:59:46 +00:00
Alexander Alekhin
e21c01708a
videoio: fix lifetime management of data of input frames
2018-05-21 12:29:24 +03:00
Pavel Rojtberg
936d2963a2
videoio: add rudimentary librealsense 1.x support
...
it is reusing CAP_INTELPERC* enums as Intel PerC is deprecated and
librealsense replaces it.
2018-05-17 11:56:52 +02:00
Vitaly Tuzov
aeed43ec90
FFMPEG-based VideoCapture and VideoWriter backend changed to C++ interface
2018-05-16 17:19:18 +03:00
shengyu
70455a959d
tab to space
2018-05-09 21:15:51 +08:00
Damien Picard
ba000bf8ea
Fixes 11480 : allow to force the video codec used to read videos
...
with the ffmpeg backend
2018-05-08 15:02:01 +02:00
Alexander Alekhin
e7adce851c
Merge pull request #11314 from terfendail:msmf_camera
2018-04-27 19:34:29 +03:00
Vitaly Tuzov
1dc73281f8
Added precise seek to MSMF-based VideoCapture::set(CAP_PROP_POS_FRAMES)
2018-04-26 16:15:23 +03:00
Alexander Alekhin
8e15c6fd78
videoio(openni2): fix CV_CAP_PROP_OPENNI2_SYNC property
2018-04-26 14:16:03 +03:00
Alexander Alekhin
84db82a329
build: fix warnings
2018-04-24 16:15:22 +03:00
Alexander Alekhin
ef2548778c
build: -Wimplicit-fallthrough warning for GCC 7+ only
2018-04-24 16:03:40 +03:00
Alexander Alekhin
6b581c4e51
build: unreachable code after CV_Error() (part 2)
2018-04-24 16:03:40 +03:00
Vitaly Tuzov
80600e5cdc
Added DXVA hardware acceleration to MSMF-based VideoCapture
2018-04-24 13:42:49 +03:00
Vitaly Tuzov
916f094ce6
Integrated camera and file MSMF-based VideoCaptures and implemented configuration properties get/set
2018-04-24 12:13:20 +03:00
Vitaly Tuzov
b0b2d8de44
Remove unused code
2018-04-24 12:13:19 +03:00
Vitaly Tuzov
44848d3241
MSMF-based CameraCapture reworked to use SourceReader
2018-04-23 17:04:54 +03:00
Vitaly Tuzov
65c46d0cc6
Removed WINRT related code
2018-04-23 17:04:53 +03:00
Maksim Shabunin
5309832308
VideoIO: prettier test console output, gstreamer capture backend changed to C++ interface
2018-04-23 13:21:37 +03:00
Vadim Pisarevsky
9615f8c994
Merge pull request #11358 from mshabunin:enable-xine
2018-04-23 10:09:29 +00:00
Simon Que
705464258e
Merge pull request #11353 from eecsninja:3.4
...
* Fix CV_Asserts with negation of strings
{!"string"} causes some compilers to throw a warning.
The value of the string is not that important -- it's only for printing
the assertion message.
Replace these calls with:
CV_Error(Error::StsError, "string")
to suppress the warning.
* remove unnecessary 'break' after CV_Error()
2018-04-20 15:31:47 +03:00
Maksim Shabunin
a9bdf75c5b
videoio: refactored XINE backend
2018-04-20 15:20:46 +03:00
Alexander Alekhin
12e8e33144
build: enable -Wimplicit-fallthrough warning for OpenCV modules
2018-04-19 19:54:03 +03:00
Alexander Alekhin
d2d9fd6945
build: fix MSVS build problems
...
with 'CL=/permissive-'
2018-04-10 14:50:56 +03:00
Alexander Alekhin
86488ac1bc
Merge pull request #11130 from allnes:gst_test_pipeline
2018-04-09 18:21:11 +00:00
Alexander Nesterov
c0d6f3d23e
Added tests for gstreamer pipeline
2018-04-10 02:33:26 +03:00
Alexander Alekhin
b76ce0e0a4
Merge pull request #11253 from mshabunin:decrease-tbb-dependency
2018-04-09 16:03:34 +00:00
tlanclos
a2c7afad77
V4L Buffer: Support CV_CAP_PROP_BUFFERSIZE in cap_v4l ( #11047 )
2018-04-09 17:34:00 +03:00
Vitaly Tuzov
24bd44f088
MSMF-based VideoCapture reworked to use SourceReader
2018-04-06 17:39:56 +03:00
Maksim Shabunin
b88609a921
Reduced direct TBB dependencies
2018-04-06 14:21:15 +03:00
Vitaly Tuzov
628f04ae96
Merge pull request #11092 from terfendail:msmf_videocapture
...
Update for MSMF-based VideoCapture and VideoWriter (#11092 )
* MSMF based VideoCapture updated to handle video stream formats different from RGB24
* MSMF based VideoWriter updated to handle video frame top-bottom line ordering regardless of output format
* Fixed race condition in MSMF based VideoCapture
* Refactored MSMF based VideoCapture and VideoWriter
* Disabled frame rate estimation for MP43
* Removed test for unsupported avi container from MSMF VideoWriter tests
* Enabled MSMF-based VideoIO by default
2018-04-05 13:55:42 +03:00
Arkadiusz Raj
619e4c94d5
Protection to not run Eth config when USB camera is connected
2018-04-01 15:37:10 +02:00
Alexander Alekhin
177be2adda
Merge pull request #11174 from corleypc:master
2018-03-29 13:50:44 +00:00
Alexander Alekhin
8f0669c300
videoio: apply CV_OVERRIDE/CV_FINAL
2018-03-28 17:57:59 +03:00
corley
a4b9ce764c
Fixed silent failures in getting and setting properties
2018-03-28 00:05:54 +03:00
corley
f441515357
Fixed a couple of memory leaks in videoInput::getDevice() when multiple devices are present in the system
2018-03-27 00:54:48 +03:00
Anthony Wertz
c6cf7f8080
Sets a higher limit on videoio's AVI container's maximum chunk size, and adds an explanation of the assertion. Closes #11126
2018-03-23 12:03:46 -04:00
miqlas
f3a9f13cb4
Merge pull request #10984 from extrowerk:advanced_haiku_patches
...
* Haiku supporting patches
* Revert uneeded changes
* Whitespace cleanup
2018-03-14 17:09:10 +03:00
Alexander Alekhin
8edc2e5aaf
Merge pull request #10928 from Mehanik:fix_timeout
2018-03-07 12:34:09 +00:00
Eugene Mikhantiev
c790299906
Fix return code in case of timeout
2018-03-07 17:26:34 +07:00
Tomoaki Teshima
a9f3a7de39
add workaround of old gstreamer
2018-03-05 19:27:49 +09:00
Maksim Shabunin
fbb2cabe77
Use fixed size types in AVIContainer structs
2018-02-22 17:11:25 +03:00
Alexander Alekhin
9819ebc095
videoio: add missing CAP_PROP_SAR_NUM/DEN propepties into .hpp file
...
reuse av_guess_sample_aspect_ratio() if available in ffmpeg
2018-02-21 19:14:04 +03:00
Alexander Alekhin
2aa15ab3ff
ffmpeg: fix 'uchar' error
...
> cap_ffmpeg_impl.hpp:1710:11: error: 'uchar' does not name a type
2018-02-20 13:15:41 +03:00
Tomoaki Teshima
bcce25900b
read in gray scale mode when writing a gray scale video
2018-02-19 18:33:05 +09:00
Alexander Nesterov
df8f61877e
Added avi-container with tests
2018-02-15 17:34:49 +03:00
luz.paz
d05714995c
Misc. modules/ cont. pt2
...
Found via `codespell`
2018-02-13 11:28:11 -05:00
Alexander Alekhin
4a297a2443
ts: refactor OpenCV tests
...
- removed tr1 usage (dropped in C++17)
- moved includes of vector/map/iostream/limits into ts.hpp
- require opencv_test + anonymous namespace (added compile check)
- fixed norm() usage (must be from cvtest::norm for checks) and other conflict functions
- added missing license headers
2018-02-03 19:39:47 +00:00
Alexander Alekhin
73316e10a0
java(test): fix test names
2018-01-12 19:14:00 +00:00
Stanislaw Halik
c8794c89c7
modules/videoio: fix PS3Eye camera property window
...
v2: fix stray trailing whitespace
v3: only allow for up to one property window at the time
Opening multiple windows in the same process will just confuse
the camera filter or outright crash.
Suggested-by: @alalek
Also return whether a dialog was opened at the time.
2018-01-11 16:37:02 +01:00
Maksim Shabunin
f0b606ff77
Changed VA device in MediaSDK session initialization
2017-12-28 14:10:36 +03:00
Tomoaki Teshima
fe7b3f1228
clean up the code
...
* disable the warning in CMake, not int the code using pragma
2017-12-22 08:42:21 +09:00
Maksim Shabunin
7349b8f5ce
Build for embedded systems
2017-12-11 13:27:37 +03:00
Alexander Alekhin
66e09bc9a4
Merge pull request #10260 from native-api:ffmpeg_load_from_package
2017-12-08 20:58:17 +00:00
Ivan Pozdeev
4bee238cf8
GetModuleFileName() doesn't reset last error on success
2017-12-08 21:11:41 +03:00
Riyuzakii
8f1345091e
Remove typo/repeated code block
2017-12-08 12:10:00 +05:30
Maksim Shabunin
800294ad4b
Merge pull request #10060 from allnes:videoio_tests_backend
2017-12-01 09:38:19 +00:00
Maksim Shabunin
7eb1065944
Fixed/disabled warnings produced by GCC 7
2017-11-29 17:21:22 +03:00
Vadim Pisarevsky
bc547c4290
Merge pull request #10124 from zhongwuzw:master
2017-11-28 10:53:00 +00:00
Alexander Alekhin
559235ac74
videoio(ffmpeg): more workarounds for sws_scale() crash
...
Prevents access data after the end of input buffer near 4K page boundaries
2017-11-23 18:56:19 +03:00
Maksim Shabunin
6f48dc2482
Fixed GStreamer pipeline building on Ubuntu 17
2017-11-23 15:03:20 +03:00
Alexander Nesterov
8082011546
Update videoio tests
2017-11-23 14:57:38 +03:00
Maksim Shabunin
7628c143f4
videoio: fixed capture open order, added apiPrefernce to FFMPEG tests
2017-11-23 13:33:48 +03:00
zhongwuzw
01b581048d
Fix customPreviewLayer layout issue when rotateVideo is NO in iOS
2017-11-21 12:56:23 +08:00
Jonathan Viney
b1d208891b
Merge pull request #10011 from jviney:master
...
Fix build with FFmpeg master. Some deprecated APIs have been removed. (#10011 )
* Fix build with FFmpeg master.
* ffmpeg: update AVFMT_RAWPICTURE support removal
2017-11-18 21:08:41 +03:00
Alexander Alekhin
981009ac1f
Merge pull request #9999 from mshabunin:fix-gcc72-warnings
2017-11-07 13:37:25 +00:00
Alexander Alekhin
96aebbe7f9
Merge pull request #9970 from mshabunin:media-sdk-convert
2017-11-07 13:37:07 +00:00
Maksim Shabunin
184daa155f
Fixed minor issues reported by GCC 7.2
2017-11-03 18:06:39 +03:00
Alexander Alekhin
b1b2528e50
videoio: improve condition for MJPEG gstreamer sink
2017-11-02 18:27:30 +03:00
Maksim Shabunin
0c79f4a00f
MediaSDK: fixed Linux build, improved BGR<->NV12 conversions
2017-11-01 14:14:45 +03:00
Vitaly Tuzov
ad051cdd99
Fixed CAP_PROP_FORMAT evaluation in case CvCaptureCAM_V4L returns CV_16U image
2017-10-19 20:51:00 +03:00
Maksim Shabunin
83655ba9be
MediaSDK video backend: Windows support
2017-10-11 16:33:37 +03:00
Maksim Shabunin
ef332dc550
Fixed and suppressed warnings produced by GCC 6.3.0
2017-10-09 13:52:07 +03:00
Vadim Pisarevsky
87595a6b3a
Merge pull request #9779 from Lightricks:feature/assetslibrary-remove-link
2017-10-06 11:45:36 +00:00
Yaron Inger
0d979a741b
videoio: remove AssetsLibrary dependency.
...
The entire AssetsLibrary framework is deprecated since iOS 8.0. The code
used in the camera example code can use UIKit to save videos to the
camera instead, which allows to avoid linking with PhotoKit instead to
prevent increasing the iOS deployment target.
2017-10-05 20:22:56 +03:00
Adam Rankin
fb8143d55d
Using environment variable to store capture options ( #9292 )
...
* Using environment variable to store options parsed by av_dict_parse_string(ENV{OPENCV_FFMPEG_CAPTURE_OPTIONS}, ";", "|")
* Adding missing mandatory flags parameter
* Guarding against missing function via LIBAVUTIL version
* Code review fixes
Copy/paste error due to coder mistake reverted
Proper version checking for LIBAVUTIL_BUILD
2017-09-19 13:29:43 +03:00
Vladislav Sovrasov
32bf712102
cmake: disable implicit-fallthrough by default
2017-09-11 16:04:00 +03:00
Maksim Shabunin
235b00b6ee
Fixed MediaSDK tests and build warnings
2017-08-31 16:50:42 +03:00
Alexander Alekhin
80519a0278
Merge pull request #9326 from sovrasov:video_cap_new_check
2017-08-30 14:29:48 +00:00
Vadim Pisarevsky
048feeb3f0
Merge pull request #9416 from eruffaldi:f_9411_mingw_videoio
2017-08-28 20:22:56 +00:00
Vadim Pisarevsky
d861c03366
Merge pull request #9479 from alalek:issue_9477
2017-08-28 20:10:32 +00:00
Alexander Alekhin
52a60526f1
Merge pull request #9492 from paroj:ximea_serial
2017-08-28 19:33:54 +00:00
Pavel Rojtberg
01acb08c7b
videoio: ximea - allow opening capture by serial number
2017-08-28 16:58:22 +02:00
Alexander Alekhin
897b071b97
videoio(v4l): move MJPEG/JPEG to the end of probe list
2017-08-27 10:26:05 +03:00
Emanuele Ruffaldi
588ca5d126
videoio for mingw32: added STRSAFE_NO_DEPRECATE and realpath
2017-08-19 23:51:02 +02:00
Alexander Alekhin
b6949c5088
cmake: CMP0022 NEW
2017-08-19 15:15:05 +00:00
Vladislav Sovrasov
2b8f888ea4
videoio: remove throw lists since they are deprecated in cxx11 (and gcc7 produces a warning)
2017-08-18 12:07:24 +03:00
Vladislav Sovrasov
651a1d2869
videoio: don't pass zero fps to 3rd-party codecs
2017-08-08 15:17:42 +03:00
Alexander Alekhin
c95a97389d
Merge pull request #9235 from sturkmen72:patch-3
2017-08-03 17:04:28 +00:00
Suleyman TURKMEN
89480801b8
some improvements on tutorials
2017-07-29 20:08:19 +03:00
Alexander Alekhin
402a77e7f7
Merge pull request #9237 from alalek:fix_winrt_build
2017-07-26 10:42:49 +00:00
Alexander Alekhin
602f047fe8
build: replace WIN32 => _WIN32
2017-07-25 13:30:48 +03:00
Alexander Alekhin
e45d5446f2
cleanup unused 3rdparty files
2017-07-21 15:20:13 +03:00
Alexander Alekhin
49e1f6b161
Merge pull request #9091 from alalek:update_ffmpeg
2017-07-14 17:25:35 +00:00
Alexander Alekhin
1a4c22fc46
Merge pull request #9095 from alalek:fix_gstreamer
2017-07-14 17:24:14 +00:00
Alexander Alekhin
d07eb9ad60
Merge pull request #9157 from zhmu:opencv-dshow-allow-enable-disable-of-debug-messages
2017-07-14 17:18:31 +00:00
Alexander Alekhin
5a54acef4e
Merge pull request #9130 from alalek:android_define
2017-07-14 17:17:24 +00:00
Satoshi Tanaka
96a3c7954d
Merge pull request #8914 from stnk20:gstreamer_yuv
...
Add gstreamer capture capability for some YUV formats (#8914 )
* Add gstreamer capture capability for some YUV formats.(only for gstreamer-1.0)
* avoid cross initialization error
* add checking if pipeline is manualpipeline, for compatibility.
2017-07-14 17:11:30 +00:00
Rink Springer
df7fb00c21
dshow: Only show debugging messages if environment variable OPENCV_DSHOW_DEBUG is explicitly set to non-zero
...
Based on discussion at: https://github.com/opencv/opencv/pull/9051
2017-07-13 11:44:20 +02:00
Maksim Shabunin
02db592014
Fixed several issues found by static analysis (Windows specific)
2017-07-10 23:14:02 +03:00
Alexander Alekhin
a4a47b538c
build: detect Android via '__ANDROID__' macro
...
https://sourceforge.net/p/predef/wiki/OperatingSystems
2017-07-10 12:43:59 +03:00
Alexander Alekhin
cc862e996e
videoio: fixes for GStreamer support
...
- emulated frame counter (with autodetection of GStreamer broken behavior)
- skip 'seek' tests if seeking is not supported by backend
- update 'fps' and total frames checks (increase error tolerance)
- update synthetic image generation
2017-07-05 16:52:48 +03:00
Alexander Alekhin
6833b46a05
videoio(test): fix message
2017-07-05 13:45:34 +03:00
Maksim Shabunin
638a01a014
Merge pull request #9038 from mshabunin:fix-static-4
2017-06-30 10:39:36 +00:00
Maksim Shabunin
e0393f8557
Fixed some issues found by static analysis (4th round)
2017-06-30 12:26:53 +03:00
Neil Shipp
3f72ff215e
Fix WinRT build breaks in highgui and videoio.
2017-06-29 17:56:09 -07:00
Maksim Shabunin
a769d69a9d
Fixed several issues found by static analysis
2017-06-28 18:06:18 +03:00
Alexander Alekhin
82ec76c123
Merge pull request #8990 from mshabunin:fix-static-2
2017-06-27 14:53:26 +00:00
Alexander Alekhin
a87d6b098f
videoio: synchronize ffmpeg open() call
2017-06-27 16:32:32 +03:00
Maksim Shabunin
32d4af36e2
Fixing some static analysis issues
2017-06-27 14:30:26 +03:00
Alexander Alekhin
006966e629
trace: initial support for code trace
2017-06-26 17:07:13 +03:00
Maksim Shabunin
8c27ceb9de
Merge pull request #8981 from alalek:port_8979
2017-06-26 09:25:23 +00:00
Alexander Alekhin
d7597a8610
videoio: do not mix CV_CAP
and CAP_
APIs enum values
2017-06-25 23:35:33 +03:00
Alexander Alekhin
460e9bf0af
videoio: drop changes from legacy C-API header
2017-06-25 23:25:56 +03:00
Alexander Alekhin
23f4bff742
videoio: update VideoWriter apiPreference parameter position
2017-06-25 22:57:24 +03:00
Alexander Alekhin
35a2f2fef9
videoio(macosx): fix array access exception in AVFoundation
2017-06-24 11:07:57 +03:00
Maksim Shabunin
87b569d812
Rewritten some tests in videoio and imgcodecs modules
...
general:
- all iterative tests have been replaced with parameterized tests
- old-style try..catch tests have been modified to use EXPECT_/ASSERT_ gtest macros
- added temporary files cleanup
- modified MatComparator error message formatting
imgcodecs:
- test_grfmt.cpp split to test_jpg.cpp, test_png.cpp, test_tiff.cpp, etc.
videoio:
- added public HAVE_VIDEO_INPUT, HAVE_VIDEO_OUTPUT definitions to cvconfig.h
- built-in MotionJPEG codec could not be tested on some platforms (read_write test was disabled if ffmpeg is off, encoding/decoding was handled by ffmpeg otherwise).
- image-related tests moved to imgcodecs (Videoio_Image)
- several property get/set tests have been combined into one
- added MotionJPEG test video to opencv_extra
2017-06-20 18:20:41 +03:00
Maksim Shabunin
c06f3d63e8
Initial version of MediaSDK integration:
...
- cmake dependencies search (WITH_MFX option)
- raw H264, H265, MPEG2 encoding and decoding
- tests for supported formats
2017-06-20 12:15:10 +03:00
Maksim Shabunin
68d01972fe
Merge pull request #8883 from abratchik:DNN.java.wrappers.fix
2017-06-20 09:05:53 +00:00
Vladislav Sovrasov
f1c16f42b4
video: add one more constructor for VideoWriter
2017-06-19 12:11:14 +03:00
abratchik
037d8fbdcd
Refactor OpenCV Java Wrapping
2017-06-15 20:35:12 +04:00
Maksim Shabunin
7cefb52fda
V4L: do not return frame if it can not be retrieved
2017-05-23 18:03:17 +03:00
Vadim Pisarevsky
2a791ea676
Merge pull request #8745 from Neio:aravis_bayer_gr_8
2017-05-23 10:40:33 +00:00
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
Alexander Alekhin
34957bcfed
Merge pull request #5832 from alalek:python_samples
2015-12-18 11:38:27 +00:00
Vadim Pisarevsky
97dc5be841
Merge pull request #5821 from alalek:build_framework
2015-12-18 10:12:55 +00:00
Alexander Alekhin
323e24e3ef
change links from samples/python2 to samples/python
2015-12-18 11:00:30 +03:00
Gregory Morse
af5bec70cd
merge Win10/VS2015 changes
2015-12-17 21:15:59 +01:00
Alexander Alekhin
be23846c4e
update osx and ios build_framework.py
2015-12-17 16:17:31 +03:00
Dan
46ec9c386b
Gstreamer 1.0 on windows.
2015-12-09 09:11:45 -05:00
Gregory Morse
1ab7acf015
Update CMakeLists.txt
...
Fix C++/CX support for all WINRT and bring back native-mode only support which was removed
2015-12-09 03:42:25 +01:00
Alexander Alekhin
d86d8ed909
Merge 2.4 into master
...
PR #2968 : cce2d99
8578f9c
Fixed bug which caused crash of GPU version of feature matcher in stitcher
The bug caused crash of GPU version of feature matcher in stitcher when
we use ORB features.
PR #3236 : 5947519
Check sure that we're not already below required leaf false alarm rate before continuing to get negative samples.
PR #3190
fix blobdetector
PR #3562 (part): 82bd82e
TBB updated to 4.3u2. Fix for aarch64 support.
PR #3604 (part): 091c7a3
OpenGL interop sample reworked not ot use cvconfig.h
PR #3792 : afdf319
Add -L for CUDA libs path to pkg-config
Add all dirs from CUDA_LIBS_PATH as -L linker options to
OPENCV_LINKER_LIBS. These will end up in opencv.pc.
PR #3893 : 122b9f8
Turn ocv_convert_to_lib_name into a function
PR #5490 : ec5244a
fixed memory leak in findHomography tests
PR #5491 : 0d5b739
delete video readers
PR #5574
PR #5202
2015-12-08 10:24:54 +03:00