Alexander Alekhin
d5894ef2a8
Merge pull request #5572 from paroj:nov4l1
2015-12-02 16:49:59 +00:00
Vadim Pisarevsky
76f54b51c1
Merge pull request #5661 from mbarann:fix_msmf_write_vertically_flipped_video
2015-11-23 18:34:30 +00:00
Vadim Pisarevsky
d4d1d03455
Merge pull request #5635 from mzajko:xi_update
2015-11-23 13:34:23 +00:00
Alexander Alekhin
e35959fad2
Merge pull request #5671 from PhilLab:patch-7
2015-11-19 10:10:13 +00:00
Maksim Shabunin
e8bf4417ef
New variant of iOS framework building, fixed some warnings for XCode 7.1.1 and cmake 3.3.2
2015-11-17 15:30:01 +03:00
Philipp Hasper
4d3915f69a
Fixed mjpeg frame size attribution
2015-11-16 08:40:09 +01:00
mbarann
b48b2d43b0
MSMF expects a bottom-up video frame, so the buffer pointer must point to the end of the data and the stride needs to be negative
2015-11-12 13:13:45 +01:00
Marian Zajko
1eb9ef6bbf
Fixed downsampling parameter enumerator backward compatibility.
2015-11-10 17:18:10 +01:00
Marian Zajko
286055b0d8
Removed trailing whitespace.
2015-11-10 12:25:57 +01:00
Marian Zajko
2cebe5a3b0
Fixed parameter enumrators list order to retain binary compatibility.
2015-11-10 12:07:19 +01:00
Marian Zajko
2998248dd3
Removed whitespaces reported by buildbot.
2015-11-09 13:30:08 +01:00
Marian Zajko
352b121202
Fixed whitespace issue
...
Removed tabulators from enumerators and ximea adapter source as reported
by precommit docs test.
2015-11-09 12:07:53 +01:00
Pavel Rojtberg
955f489621
make CV_CAP_PROP_FORMAT consider the current channel count
2015-11-08 17:01:03 +01:00
Pavel Rojtberg
05f52b697f
replace uyvy_to_rgb24 by tested and conformant cvtColor
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
ad68b79630
replace yuv420p_to_rgb24 by tested and conformant cvtColor
...
Conversion was not ITU 601 conformant. Also add YVU420 format to allowed
zero copy access.
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
8527d895bb
replace rgb24_to_rgb24 by tested cvtColor
...
internally using ipp this conversion is now roughly 2x faster.
also add RGB/ BGR formats to allowed zero copy access.
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
f50817120e
v4l: remove needless CvCaptureCAM_V4L_CPP wrapper
...
possible source of memory leaks and unneeded complexity
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
93d6e800b6
v4l: Fixed memory leaks and inconsistent status return values
...
by updating to c++ coding conventions
- const correctness
- use bool as return value
- use explicit initialization instead of CLEAR macro/ memset
- use cv namespace
2015-11-08 17:01:02 +01:00
Pavel Rojtberg
a581ddd896
remove support of Video4Linux1 API
...
the last kernel that allowed compiling this code was 2.6.37 which was
released almost 5 Years ago. So probably it does not get much testing
any more. Furthermore even back then one was better off using the V4L2
API.
The only change touching currently used code is the removal of the
global V4L2_SUPPORT variable.
2015-11-08 17:01:02 +01:00
Marian Zajko
691fb1ffae
XIMEA adapter update
...
- replaced m3api/m3apiX64 binaries with latest xiapi32/xiapi64 to
support latest camera models
- added new parameter definitions to videoio_c.h and
SetProperty/GetProperty calls
- added acquisition resetting for specific parmateters in SetProperty
call
- added new error return value evaluators
2015-11-05 15:56:47 +01:00
grundman
f609ddba05
Fix incorrect FPS value returned by cap.get(CV_CAP_PROP_FPS)
...
Current implementation returns NaN for some configs of FFMPEG, call default get_fps() instead (as also used by PROP_POS_MSEC)
2015-10-30 17:48:04 -07:00
Anton V. Shokurov
b9b40a73ba
Exposure and autofocus properties fixed/added.
...
Exposure can now be manually controlled (implemented only in libv4l).
Will work only with a kernel version >= 4.5.
Autofocus can be enabled/disabled.
2015-10-28 07:37:51 -04:00
Pierre Letessier
e6615c5825
Changed CV_FFMPEG_CAP_PROP_SAR_* values
2015-10-24 11:22:18 +02:00
Pierre Letessier
baa21484a1
Added CV_CAP_PROP_SAR properties to videoio module
2015-10-23 21:14:22 +02:00
Alexander Alekhin
9a0beda037
Merge pull request #5489 from paroj:v4l2noconvert
2015-10-23 16:35:36 +00:00
Alexander Alekhin
09e6c82190
Merge pull request #5474 from paroj:v4l2ctrls
2015-10-23 16:28:26 +00:00
Pavel Rojtberg
eac5cab5cb
cap_v4l: implement PROP_CONVERT_RGB
...
allows disabling automatic conversion to RGB for certain formats. If
conversion is disabled the returned image just points to the underlying
buffer, so no memcpy is performed.
Note that we do not check image size in retrieve frame any more as it
can not possibly while the device is streaming.
Furthermore this code was disabled altogether by the wrong ifdef in the
previous commit.
2015-10-18 14:14:20 +02:00
Pavel Rojtberg
5e62e71b13
fix wrong ifdef bracketing
...
in the case of HAVE_CAMV4L2 && !HAVE_CAMV4L there was no body for the if
statement.
2015-10-18 14:13:44 +02:00
Pavel Rojtberg
838947bb8e
replace custom yuyv_to_rgb24 implementation by cvtColor
2015-10-18 13:51:20 +02:00
Pavel Rojtberg
80747088e3
avoid needless copies during mjpeg decoding
2015-10-18 13:51:20 +02:00
Pavel Rojtberg
56dd7eda0d
remove additional V4L2 pixelformat defines
...
they are upstream since at least linux 2.6.8 (10 Years)
http://lxr.oss.org.cn/ident?v=2.6.8&i=V4L2_PIX_FMT_SBGGR8
2015-10-18 13:51:20 +02:00
Pavel Rojtberg
588eba3b37
simplify autosetup_capture_mode_v4l2 by using a for loop
2015-10-18 13:51:20 +02:00
Pavel Rojtberg
5525cc4d09
implement CAP_PROP_MODE, CAP_PROP_FOURCC and CAP_PROP_FORMAT
...
do not use a custom enum instead of the V4L2 fourcc defines for palette.
This way we can easily implement CAP_PROP_FOURCC and CAP_PROP_MODE.
2015-10-18 13:51:20 +02:00
Pavel Rojtberg
c0fe522c9d
allow changing FPS and Image Size using V4L2
...
use logic similar to cap_libv4l: replace icvSetVideoSize by v4l2_reset
as it was not used for V4L1, the actual frame format is negotiated in
try_palette_v4l2 and the stream has to restarted anyway.
2015-10-18 13:51:16 +02:00
Pavel Rojtberg
18034a5138
allow icvGetPropertyCAM_V4L to return zero
...
now icvGetPropertyCAM_V4L behaves the same as in cap_libv4l. This also
fixes passing boolean values.
2015-10-18 13:48:15 +02:00
Pavel Rojtberg
f7981a8ae8
support setting focus and autofocus with V4L2
...
also refactor property range handling and opencv property to V4L2
translation.
2015-10-18 12:56:09 +02:00
Alexander Stohr
7e3d7677ae
not only print file-not-found as a warning but also print the name of the problematic file and the uri used for the open attempt
2015-10-13 16:15:48 +02:00
Alexander Alekhin
56e8827ce0
Merge pull request #5456 from sergiud:ffmpeg-capture-varying-frame-size
2015-10-07 14:42:29 +00:00
Sergiu Dotenco
9da4fe4b02
videoio: fixed segmentation fault at frame size change
2015-10-06 15:09:31 +02:00
Alexander Alekhin
6025738b8b
Merge pull request #5454 from alalek:fix_ffmpeg_priv_data
2015-10-06 10:01:59 +00:00
Alexander Alekhin
7a4b2e18a7
Merge pull request #5441 from alalek:fix_ffmpeg_frame_creation
2015-10-06 10:01:39 +00:00
Alexander Alekhin
4760d32937
ffmpeg: fix invalid NULL pointer access
...
Catched on Ubuntu 12.04 with FFMPEG:
codec: YES (ver 53.35.0)
format: YES (ver 53.21.1)
util: YES (ver 51.22.3)
swscale: YES (ver 2.1.0)
resample: NO
gentoo-style: YES
2015-10-05 19:28:35 +03:00
Pavel Rojtberg
345cd1242f
do not leak GstMapInfo
...
it is new'ed but never deleted. However it does not need to be global or
heap allocated in the first place.
2015-10-05 12:28:47 +02:00
Alexander Alekhin
50a0a167f0
fix ffmpeg frame creation ( fix #5439 )
2015-10-02 18:27:18 +03:00
Alexander Alekhin
d945aff132
Merge pull request #5371 from Dikay900:ports_to_master
2015-09-21 13:52:45 +00:00
Dikay900
55df326589
PR #4003
2015-09-21 13:44:35 +02:00
jisli
f88e9a748a
update ffmpeg support
...
Migration have been done for these ffmpeg/libav changes:
2013-12-11 - 29c83d2 / b9fb59d,409a143 / 9431356,44967ab / d7b3ee9 - lavc 55.45.101 / 55.28.1 - avcodec.h
av_frame_alloc(), av_frame_unref() and av_frame_free() now can and should be
used instead of avcodec_alloc_frame(), avcodec_get_frame_defaults() and
avcodec_free_frame() respectively. The latter three functions are deprecated.
2012-10-08 - ae77266 / 78071a1 - lavu 51.74.100 / 51.42.0 - pixfmt.h
Rename PixelFormat to AVPixelFormat and all PIX_FMT_* to AV_PIX_FMT_*.
To provide backwards compatibility, PixelFormat is now #defined as
AVPixelFormat.
Note that this can break user code that includes pixfmt.h and uses the
'PixelFormat' identifier. Such code should either #undef PixelFormat
or stop using the PixelFormat name.
2015-09-17 20:24:37 +03:00
Alexander Alekhin
b15a9d675e
cmake: use copy_if_different
2015-09-08 22:42:05 +03:00
Maksim Shabunin
771af4f32d
Some changes to support mingw-w64
...
- IPP is disabled by default when compiler is mingw (couldn't make it
work)
- fixed some warnings
- fixed some `__GNUC__` version checks (for correctness and convenience)
- removed UTF-8 BOM from hough.cpp (fixes #5253 )
2015-09-01 00:59:08 +03:00
Vadim Pisarevsky
b33853c5be
Merge pull request #4199 from AVshokurov:master
2015-08-25 18:09:50 +00:00
Vadim Pisarevsky
e2b677ddcf
Merge pull request #5109 from olumby:fix-cvvideocamera-defaultfps
2015-08-25 07:44:29 +00:00
Alexander Alekhin
e866680d96
Merge pull request #5156 from brunomorishita:fix_build
2015-08-14 13:56:45 +00:00
Alexander Duda
fbcf5f0918
cvCreateCameraCapture: fix using preffered interface
...
The provided interface id must be removed from the index. Otherwise, the
underlying implementations are using a wrong camera id.
Example:
VideoCapture(800) fails because PvAPI tries to open a camera
on position 800
2015-08-14 13:40:24 +02:00
Bruno Goncalves
894c2468df
fix build error when both OpenNI and OpenNI2 are supported (issue 4918)
2015-08-09 00:48:49 -03:00
Oliver Lumby
2de3a24f46
fix CvVideoCamera defaultfps
2015-08-01 13:55:28 +02:00
Maksim Shabunin
46e457d340
Fixed loop check
2015-07-22 17:54:42 +03:00
Maksim Shabunin
14d7b38613
Fixing GCC 4.9 warnings
2015-07-22 16:12:31 +03:00
Alexander Alekhin
c1c0f23fd1
Merge pull request #4004 from paroj:camera-api
2015-07-21 15:57:48 +00:00
Anton V. Shokurov
4691d98e19
Adds support for property CV_CAP_PROP_FOCUS in functions cvSetCaptureProperty and cvGetCaptureProperty.
...
In compliance with the Windows (DirectDraw) version autofocus is disabled when either of the abovementioned functions is called.
2015-07-18 15:24:16 +03:00
Alexander Alekhin
4c1cbffd2a
Merge pull request #4184 from alalek:fix_cmake_status
2015-07-14 10:32:06 +00:00
ultrafro
ed574171bb
Fixed polarity of ImageRegistration mode in setDepthGeneratorProperty function of CvCapture_OpenNI2 class
2015-07-12 18:28:23 -04:00
Alexander Alekhin
aa871ca506
fix wrong usage of status(), remove useless message in videoio
2015-07-10 19:18:07 +03:00
Pavel Rojtberg
b1842a4b89
use simplified API selection logic in cvCreateCameraCapture as well
2015-07-08 13:46:57 +02:00
Pavel Rojtberg
2909e07cb2
deny any other interfaces if someone is specified as preference
...
it provides more expectable results to end-users.
based on feedback by Alexander Alekhin
2015-07-08 13:46:56 +02:00
Pavel Rojtberg
41d8c4d879
allow specifying apiPreference in VideoCapture when opening a file. Add
...
a separate function instead of an overload not to change the ABI.
rename VideoCapture paramter 'device' to 'index' in CPP to reflect that
it allows specifying the API.
update comments to explain how to specify the API.
2015-07-08 13:46:56 +02:00
kalistratovag
e2fe0ca835
Removing deadcode blocks, redudant variable & initializing all vars in constructor
...
Adding &31 to bit shift in order to silince coverity BAD_SHIFT defect
add default_stripes_count const
2015-07-06 12:36:21 +03:00
kalistratovag
65e0387aa5
Implementing parallel mjpeg encoder.
...
Fixed errors in parallel_for based on pthreads
Fixing compiler errore & removing whitespaces
Fixing prallel_for_pthreads error and warnings on win
2015-06-30 13:57:37 +03:00
Dikay900
902e381264
fix one dict parameter in ffmpeg implementation (introduced while porting)
2015-06-20 10:17:34 +02:00
Vadim Pisarevsky
e055128d0d
Merge pull request #4099 from sash-kan:fix.2822
2015-06-17 11:58:40 +00:00
Alexander Alekhin
3f2666778a
videoio: fix some issues in ffmpeg error processing
2015-06-09 16:30:57 +03:00
Alexander Alekhin
959d575292
videoio: update ffmpeg backend
...
- fix compilation for old libraries
- update codec/tag selection logic
- add documentation note about MP4 container tags
2015-06-09 16:30:57 +03:00
alexander barakin (aka sash-kan)
0d821f04fd
fix icvCloseCAM_V4L wrong order of code blocks
...
this patch fixes bug http://code.opencv.org/issues/2822 .
based on disussion (in russian):
http://ru.stackoverflow.com/a/428398/178576
Signed-off-by: alexander barakin (aka sash-kan) <alex@barak.in>
2015-06-06 14:41:00 +03:00
Maksim Shabunin
39fdcf4df3
Merge pull request #4083 from mshabunin:java-engine
2015-06-03 17:17:36 +00:00
Alexander Alekhin
1f3043f618
videoio: VideoWriter H264/.mp4 support via ffmpeg/libav
2015-06-03 18:35:12 +03:00
Maksim Shabunin
caffbaafbe
Updated Manager for Android
2015-06-02 17:33:04 +03:00
Vadim Pisarevsky
535dc1e874
Merge pull request #3998 from msandler:master
2015-05-29 21:38:09 +00:00
Vadim Pisarevsky
f7ad192842
Merge pull request #4063 from Dikay900:2_4_to_master
2015-05-28 14:49:13 +00:00
Philipp Hasper
9aaa27d46b
Adding missing docs for VideoWriter::release
2015-05-27 07:55:41 +02:00
Andrew Senin
eb40dde688
Fixing XIMEA parameters mapping (issue #4176 )
...
Conflicts:
modules/highgui/src/cap_ximea.cpp
2015-05-26 18:08:29 +02:00
StevenPuttemans
83723c15be
added extra BUFFERSIZE doc and getter
...
Conflicts:
modules/highgui/doc/reading_and_writing_images_and_video.rst
modules/highgui/src/cap_dc1394_v2.cpp
2015-05-26 18:08:25 +02:00
StevenPuttemans
8454a8f2d1
adding extra buffer parameter
...
Conflicts:
modules/highgui/include/opencv2/highgui/highgui_c.h
modules/highgui/src/cap_dc1394_v2.cpp
fix typo
2015-05-26 18:08:22 +02:00
Ilya Lavrenov
efa2baed83
TCP instead of UDP
...
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
2015-05-24 14:06:30 +02:00
jormansa
3c2e12a744
bug fixed
...
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
2015-05-24 13:31:07 +02:00
Martijn Liem
7e6947a940
Bugfix for bug #3767
...
Fixed a memory leak in cap_dshow.cpp in videoInput::setVideoSettingCamera(). The leak was caused by not releasing an IBaseFilter object created in a call to getDevice(). Tho object is now properly released.
Conflicts:
modules/highgui/src/cap_dshow.cpp
2015-05-24 11:55:46 +02:00
Dikay900
7ca0557b40
typos in comments
2015-05-23 17:36:45 +02:00
Ehren Metcalfe
e9bc9c47c2
Fix resource leak with iOS camera due to failure to remove AVCaptureSession input/outputs on stop (Bug #3389 )
...
Conflicts:
modules/highgui/src/cap_ios_abstract_camera.mm
2015-05-23 17:36:42 +02:00
Vadim Pisarevsky
f5be8f6c77
Merge pull request #4047 from MSOpenTech:videoio-refactor-contrib
2015-05-23 09:02:11 +00:00
Maxim Kostin
4418ee6c77
Refactored internal helpers. Simplified structure. Updated comments. Updates #41
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-22 15:41:50 +03:00
Piotr Dobrowolski
6d0407b65e
VideoCapture with digital camera and gPhoto2 library
2015-05-21 00:41:39 +02:00
Vadim Pisarevsky
8b791477df
Merge pull request #3971 from Dikay900:2_4_to_master_3
2015-05-17 00:28:30 +00:00
Vadim Pisarevsky
eb41a574b7
Merge pull request #4005 from MSOpenTech:videoio-contrib
2015-05-16 18:08:28 +00:00
Maxim Kostin
55f78f8a83
Added configuration changes enabling videoio WinRT support.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-15 16:29:06 +03:00
Maxim Kostin
d08cb6b357
Added WinRT support for videoio.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-15 16:28:47 +03:00
Maxim Kostin
d40eefd5a4
Moved old WinRT related wrappers from highgui to videoio fixing long broken logic.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-05-15 16:28:25 +03:00
Vadim Pisarevsky
cc086b9452
Merge pull request #3979 from ruslo:fix.cxx11
2015-05-15 12:32:46 +00:00
msandler
8e82bed459
updated cap_libv4l.cpp to support CV_CAP_PROP_POS_MSEC, CV_CAP_PROP_POS_FRAMES and CV_CAP_PROP_FPS
2015-05-11 03:25:48 -07:00
Vincent Rabaud
f052b0bc4d
get code to compile on Ubuntu Saucy
...
A define was forgotten for the codecs and there was a typo for
another.
2015-05-07 11:38:59 +00:00
Ruslan Baratov
f148eaace9
Fix errors while compiling with c++11 flag
...
Fix errors in file cap_avfoundation.mm.
Compiled with Xcode 6.2, iOS SDK 8.2
Example:
cap_avfoundation.mm:543:54: error: cannot initialize a parameter of
type 'AVCaptureFocusMode' with an rvalue of type 'int'
if ([mCaptureDevice isFocusModeSupported:(int)value]){
^~~~~~~~~~
2015-05-01 21:29:20 +02:00
AfterEight
f39d351d04
Modified resetCvImage() in cap_ximea.cpp, so that the IplImage* frame is also updated after the resolution has changed via set(CV_CAP_PROP_FRAME_WIDTH, value)/set(CV_CAP_PROP_XI_DOWNSAMPLING, value)
...
Conflicts:
modules/highgui/src/cap_ximea.cpp
2015-04-28 18:07:39 +02:00
Roman Donchenko
5455e38e15
cap_msmf.hpp: fix a warning about nNull being unused
...
The two functions featuring nNull are not particularly needed, so
I simply removed them.
Conflicts:
modules/highgui/src/cap_msmf.hpp
2015-04-25 18:54:54 +02:00