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
