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
Vadim Pisarevsky
d825b7ee9a
fixed mjpeg encoder so that libjpeg-based decoder does not complain on extra bytes in the end of stream
2015-04-23 14:40:44 +03:00
Vadim Pisarevsky
dcf177e372
Merge pull request #3952 from vpisarev:fix_libav_case
2015-04-23 06:25:25 +00:00
Vadim Pisarevsky
30912b49f3
fixed compile warnings; hopefully fixed test failures
2015-04-23 00:39:44 +03:00
Vadim Pisarevsky
2b2e3ee93c
make sure opencv builds fine with the recent versions of libav (e.g. from Ubuntu 14.10)
2015-04-22 21:57:29 +03:00
kalistratovag
08925330e0
mjpec_decoder initialize m_movi_start variable
2015-04-22 19:49:11 +03:00
Philipp Hasper
0b20ce696a
Fixed markdown: **Note** -> @note
2015-04-22 08:08:10 +02:00
Nisarg Thakkar
0fd1203b3b
Fixed Doc Errors Bug#4282
2015-04-21 10:37:50 +05:30
kalistratovag
740ae3581c
Initial commit of avi mjpeg decoder
...
std::streams removed
debug code removed
whitespaces removed
stdint.h added and trailing whitespaces removed
trailing whitespaces removed
warnings on windows fix
warnings on windows fix pt 2
Refactoring performed: AviMjpegStream class introduced. CAP_PROP_FRAME_WIDTH and CAP_PROP_FRAME_HEIGHT properties support added.
Windows warnings & uninitialized variable fix
Windows warning fix
Win32 warning fix
2015-04-10 14:16:43 +03:00
Andrew Senin
58f20a3b7f
Ximea camera fix (see issue #4235 )
2015-04-03 22:49:50 +03:00
Vadim Pisarevsky
559dfa297d
Merge pull request #3813 from hahne:iss1915
2015-04-03 10:16:30 +00:00
Vadim Pisarevsky
602d2c33c0
added video writer quality, which user may change dynamically in the case of motion jpeg; enabled NEON intrinsics in the encoder
2015-03-27 15:15:59 +03:00
Vadim Pisarevsky
8d1232cc7a
fixed warnings; transpose qtab to make it compatible with neon branch
2015-03-26 15:59:49 +03:00
Vadim Pisarevsky
3df6b6fdcf
added self-contained motion jpeg encoder (filename should end with .avi; fourcc should be "MJPG"
2015-03-26 00:39:29 +03:00
Vadim Pisarevsky
903f10c237
Merge pull request #3804 from polarfuchs99:master
2015-03-17 11:12:49 +00:00
Roman Donchenko
34ad2e0fa4
Fix a memory leak in CvCapture_FFMPEG::close
...
FFmpeg now requires that frames allocated with avcodec_alloc_frame are
freed with avcodec_free_frame.
(cherry picked from commit 77578d415f
)
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
2015-03-10 12:48:46 +03:00
hahne
1af4521239
fix for issue 1915
2015-03-09 16:19:47 +01:00
Nils Plath
ee55e4595c
- Fixed compile error that appeared with Clang 5.1 on Mac 10.8.5:
...
modules/videoio/src/cap_gstreamer.cpp:577:31: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
filename = "v4lsrc ! "COLOR_ELEM" ! appsink";
^
modules/videoio/src/cap_gstreamer.cpp:585:32: error: invalid suffix on literal; C++11 requires a space between literal and identifier [-Wreserved-user-defined-literal]
filename = "v4l2src ! "COLOR_ELEM" ! appsink";
2015-03-08 00:23:38 +01:00
Prof. Dr. Rudolf Haussmann
5e3d986ad8
Merge remote-tracking branch 'upstream/master'
2015-03-07 13:10:41 +01:00
Prof. Dr. Rudolf Haussmann
9f1eb70dbc
Changes to be committed:
...
(use "git reset HEAD <file>..." to unstage)
modified: modules/java/generator/gen_java.py
modified: modules/videoio/include/opencv2/videoio.hpp
modified: modules/videoio/include/opencv2/videoio/videoio_c.h
modified: modules/videoio/src/cap_dshow.cpp
modified: modules/videoio/src/cap_pvapi.cpp
Following changes have been made:
1. Some minor bugs have been removed.
2. In the PvAPI module the option CAP_PROP_MONOCROME has been removed because
this option does not make sense and causes an error if a color camera is used.
3. Instead the new option CAP_PROP_PVAPI_PIXELFORMAT has been added which allows
to activate the different pixel formats (color modes) of an AVT camera.
4. Since there were two identical defines
CAP_PROP_MONOCROME = 19
CAP_PROP_MONOCHROME = 19
which were also used in the other module DSHOW, the first one with an orthographic
error has been removed in favor of the second one.
2015-03-07 12:53:32 +01:00
Vadim Pisarevsky
4701b22e14
Merge pull request #3607 from soyersoyer:yuyv_pixfmt
2015-03-03 18:15:50 +00:00
Vadim Pisarevsky
6820292256
Merge pull request #3700 from MSOpenTech:winrt-cmake-contrib
2015-03-03 12:52:03 +00:00
Maxim Kostin
cdd23440c9
Adding support for WinRT(WinPhone 8/8.1 and Win Store) via CMake 3.1
...
- Substituted HAVE_WINRT with WINRT
- Fixed compilation issues in ocl.cpp and parallel.cpp
- Fixed compiler issue for WP8: "C2678: binary '+' : no operator found which takes a left-hand - Fixed gitignore
- Added #ifdef HAVE_OPENCL to remove compiler warnings in ocl.cpp
- Used NO_GETENV similar to '3rdparty\libjpeg\jmemmgr.c;
- Added ole32.lib for core module (for WindowsStore 8.0 builds)
- Made OpenCV_ARCH aware of ARM
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com>
2015-03-02 22:26:43 +03:00
Maksim Shabunin
37c74e38f4
Python support
2015-03-02 18:13:00 +03:00
Maksim Shabunin
457123027e
Modified java wrapping mechanism
2015-03-02 18:12:30 +03:00
Andrew Senin
8c7b3b91fa
Fixing XIMEA parameters mapping (issue #4176 )
2015-02-07 00:50:23 +03:00
Vadim Pisarevsky
cc1090cf3b
Merge pull request #3521 from ana-GT:registration_openni2
2015-01-21 10:48:23 +00:00
soyer
d84d3a519b
Allow YUYV capture via libv4l
2015-01-15 15:10:15 +01:00
Vadim Pisarevsky
61f111143a
Merge pull request #3599 from a-wi:DShow_COM_interfaces_v3
2015-01-15 13:12:51 +00:00
VBystricky
d5092a6f7c
Add CV_CAP_PROP_POS_FRAMES property to cap_images.cpp
2015-01-15 01:55:17 +04:00
Artur Wieczorek
01717c83d7
Don't define destructors for COM-based interfaces.
2015-01-14 14:06:42 +01:00
Adam Borowski
7b0d1c932e
Get rid of sysctl includes on Linux.
...
The 'sysctl' syscall has been strongly deprecated on Linux for ages.
Currently, on old architectures it will spam syslog whenever used, and on
newer ones it's missing from the headers altogether. Opencv has migrated
away on Linux already, but #includes were left lingering. This commit
removes them on non-__APPLE__, unbreaking x32 (and probably others).
2015-01-13 01:52:56 +01:00
Vadim Pisarevsky
1c8493fb0d
Merge pull request #3549 from mshabunin:sphinx-doc-remove
2014-12-31 09:14:22 +00:00
Vadim Pisarevsky
9c872f5316
Merge pull request #3567 from vbystricky:intelperc_fix
2014-12-31 06:06:18 +00:00
vbystricky
083d8645a5
Fix error of compilation of cap_intelperc.cpp
2014-12-30 15:38:03 +03:00
Joe Howse
2d16026df6
more const correctness in OpenNI2 getProperty
2014-12-27 00:11:14 -04:00
Joe Howse
b7a3204c57
const correctness in OpenNI and OpenNI2 getProperty
2014-12-26 23:54:03 -04:00
Maksim Shabunin
d01bedbc61
Removed Sphinx documentation files
2014-12-26 19:12:19 +03:00
Vadim Pisarevsky
61886a61de
Merge pull request #3504 from a-wi:VideoCapture_get_const_v3
2014-12-26 14:37:47 +00:00
Maksim Shabunin
128e509527
Added enviroment search paths for OpenNI2 for linux and fixed specific warning
2014-12-24 15:07:05 +03:00
Vadim Pisarevsky
c0005fd293
Merge pull request #3520 from JoeHowse:master
2014-12-22 11:14:29 +00:00
Vadim Pisarevsky
432546e4c4
Merge pull request #3512 from vins31:OpenNi2_AsusXtion
2014-12-22 10:39:42 +00:00
Joe Howse
13c04120dd
For Java compatibility, avoiding explicit pseudonym in enum
2014-12-16 21:37:14 -04:00
Ana Huaman Quispe
1ad1b737c2
Fixed registration bug: It was ALWAYS OFF - even after changing the property
2014-12-16 19:45:50 -05:00
Joe Howse
620a969285
Allow BGR, RGB, or gray capture via libv4l
2014-12-16 20:07:37 -04:00
Artur Wieczorek
854a722c70
Implement VideoCapture::get, CvCapture::getProperty, IVideoCapture::getProperty as constant methods.
2014-12-16 16:08:22 +01:00
Ana Huaman Quispe
0b429fee7b
Changed CV_DbgAssert to CV_Assert when setting video modes for OpenNI2. Otherwise, in release mode the default modes never get set
2014-12-15 18:16:25 -05:00
vincentweb
4d12beb723
Added better OpenNI2 support to the Asus Xtion and Occipital Structure
...
sensors which do not have image generators.
2014-12-14 20:52:24 +01:00
Vadim Pisarevsky
f61db41d25
Merge pull request #3453 from mshabunin:doxygen-others
2014-12-02 09:05:32 +00:00
Dmitry-Me
c669b7e4cd
Simplify overengineered code
2014-12-01 17:58:06 +03:00
Maksim Shabunin
03e213ccae
Doxygen documentation: BiB references and fixes
2014-12-01 15:50:55 +03:00
Maksim Shabunin
1523fdcc1c
Doxygen documentation: more fixes and cleanups
2014-12-01 15:50:36 +03:00
Maksim Shabunin
dcae7698ad
Doxygen documentation for: highgui, video, imgcodecs and videoio
2014-12-01 15:47:13 +03:00
Alexander Alekhin
2981ee00d9
OpenNI2: prevent failure of setVideoMode() call with invalid parameters
...
Not all parameters are specified for openni::VideoMode, so
"selected" mode can be unsupported for device.
Replace default VideoMode constructor to result of getVideoMode() call.
2014-11-08 02:21:59 +03:00
Yusuke Suzuki
9cd08c662c
add V4L2_PIX_FMT_RGB24 convert code
2014-11-04 15:21:30 +09:00
Maksim Shabunin
071e78d02e
Disabled videoio_video_prop_fps test
...
This test does not return correct values with some software configurations.
Possible problem with ffmpeg on buildbot's linux-slave.
2014-10-24 11:37:15 +04:00
Vadim Pisarevsky
d767c9df58
Merge pull request #3349 from a-wi:DShow_Strsafe_header_v3
2014-10-20 06:49:18 +00:00
Artur Wieczorek
dcbe797980
Include strsafe.h to compile successfully under MinGW in Debug mode.
2014-10-18 20:38:34 +02:00
Maksim Shabunin
571ebb2373
Fixing iOS clang warnings, part 3
2014-10-17 18:15:21 +04:00
Maksim Shabunin
ef3d02214b
Fixing iOS clang warnings, part 2
2014-10-17 18:14:54 +04:00
Maksim Shabunin
420737e098
Fixing iOS clang warnings, part 1
2014-10-17 18:14:54 +04:00
Maksim Shabunin
630eddf25a
Extracted repeated cmake instruction block
2014-10-17 18:14:53 +04:00
Artur Wieczorek
ec93d103b7
Refactored code responsible for printing debug messages in DShow video capture module to reduce footprint in Release mode.
...
Replace printf function used for diagnostic purposes with dedicated DebugPrintOut function to output debug messages. This function is effective only in Debug mode and its body becomes empty in Release mode to reduce footprint.
2014-10-10 17:49:01 +02:00
Artur Wieczorek
c54928e003
Fixed getting CV_CAP_PROP_FOURCC property value
...
Save selected FCC in order to return proper CV_CAP_PROP_FOURCC property value (currently FCC for RGB24 is always returned).
2014-10-10 08:53:52 +02:00
Artur Wieczorek
efd237b8b8
Fixed media type guid for I420 in DShow capture.
...
FOURCC code bytes should be placed in the reverse order.
2014-10-10 08:53:50 +02:00
Artur Wieczorek
de0b46a765
Fixed selecting media type in DShow video capture.
...
Set correct value of sample size when calling IAMStreamConfig::SetFormat function. For non-RGB media type it can be set to zero value.
(See http://msdn.microsoft.com/en-us/library/windows/desktop/dd373477%28v=vs.85%29.aspx )
2014-10-10 08:53:48 +02:00
Artur Wieczorek
3a0b375104
Remove ATL dependency from MSMF capture code.
...
Use _com_ptr_t instead of CComPtr in ComPtr wrapper to avoid ATL dependency.
2014-10-01 12:02:28 +02:00
Artur Wieczorek
34533dc569
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
2014-09-29 00:39:35 +02:00
Artur Wieczorek
655b22e050
Fixed CMake issue with FFMPEG videoio configuration
2014-09-29 00:39:05 +02:00
Vadim Pisarevsky
e6f653af44
Merge pull request #3269 from asmorkalov:ocv_gstreamer3
2014-09-27 15:25:20 +00:00
Vadim Pisarevsky
f187fd99da
Merge pull request #3271 from mgeorg:reset_ffmpeg_mutex
2014-09-27 13:09:24 +00:00
Manfred Georg
8d95c91805
set ffmpeg mutex to NULL on destruction.
2014-09-26 09:44:25 -07:00
Alexander Smorkalov
23456d67e5
Added test on CAP_PROP_FRAMECOUNT option for cv::VideoCapture
2014-09-26 10:50:22 +04:00
Alexander Smorkalov
15251056ba
Fixed compatibility with GStreamer 1.x
2014-09-26 10:45:08 +04:00
Alexander Smorkalov
cc6e6aa028
Fixed query of basic VideoCapture properties. Added tests for them.
2014-09-25 14:40:54 +04:00
Artur Wieczorek
302b138aa7
CMake configuration for MSMF capture
...
Applied in PR3247 to 2.4 branch.
2014-09-25 12:05:54 +02:00
Artur Wieczorek
b91bd6716c
Fixed MSMF file capture error while opening the file containing unsupported video stream format
...
Applied in PR3260 to 2.4 branch
2014-09-25 11:54:15 +02:00
Artur Wieczorek
8f334b4e41
Fixed assertion warning in MSMF frame grabber
...
Applied in PR3251 to 2.4 branch
2014-09-25 11:51:31 +02:00
Artur Wieczorek
7c00b17085
Fixed MSMF video capture initialization
...
Applied in PR3251 to 2.4 branch.
2014-09-25 11:49:31 +02:00
Artur Wieczorek
25cf51637d
Fix linking error under Win 7 - do not import MinCore_Downlevel.lib if target is Win 7 or earlier.
...
Applied in PR3243 to 2.4 branch.
2014-09-25 11:45:11 +02:00
Artur Wieczorek
6ad3427426
Fixed compilation errors under VS 2010 and Win 7
...
Applied in PR3240 to 2.4 branch.
2014-09-25 11:43:13 +02:00
Vadim Pisarevsky
ecbec7235f
Merge pull request #3253 from asmorkalov:ocv_gstreamer2
2014-09-23 11:51:25 +00:00
Alexander Smorkalov
0518455163
More accurate selection of color space conversion element for GStreamer 1.x
2014-09-23 14:18:44 +04:00
Alexander Smorkalov
aa57634213
Fixed compatibility with GStreamer 1.x.
2014-09-23 14:04:53 +04:00
Alexander Smorkalov
a419b64347
Fixed GStreamer encoding pipeline frame drop for most cases.
...
For several muxers and encoders GStreamer still drops the last frame.
2014-09-23 12:31:51 +04:00
Vadim Pisarevsky
1578dd1027
Merge pull request #2702 from GregoryMorse:patch-3
2014-09-18 12:38:54 +00:00
Vadim Pisarevsky
4a0364ded5
Merge pull request #3220 from asmorkalov:ocv_gstreamer
2014-09-17 09:55:49 +00:00
Alexander Smorkalov
38887e6ea9
Code review fixes.
2014-09-16 14:52:41 +04:00
Alexander Smorkalov
3ea8be7292
Several fixes for GStreamer support in OpenCV
...
- Accurate ASYC task handling for both GStreamer generations.
- Correct video duration request for videos.
- More accurate pipeline destruction.
- Correct color space conversion plugin for GStreamer 1.0.
2014-09-15 13:47:09 +04:00
Vadim Pisarevsky
8d61ecbc4d
Merge pull request #3205 from parafin:ximea_unix-3.0
2014-09-14 18:44:41 +00:00
Igor Kuzmin
ed402c5be6
XIMEA cam support: allow on OS X too
2014-09-09 19:25:14 +04:00
Igor Kuzmin
4d45a2c43f
XIMEA cam support: use correct library for 64 bit Linux
2014-09-09 19:24:16 +04:00
Igor Kuzmin
74827c35ff
fix for issue 3858 (remove unneeded #include's)
...
also use correct include path on Linux
2014-09-09 19:22:20 +04:00
berak
5f9d5c483c
adding fourcc to VideoWriter docs
...
underline
2014-09-04 16:09:22 +02:00
PhilLab
a0e4600364
VideoCapture did not detect an unopened camera
2014-08-26 09:42:46 +02:00
Alexander Alekhin
d47a2988a9
Merge pull request #3128 from asmorkalov:android_tegra_optimizations_build_fix
2014-08-21 15:48:10 +00:00
Alexander Smorkalov
f38ebba34d
Build fix for NVIDIA Tegra optimizations integration.
2014-08-19 11:40:25 +04:00
Vadim Pisarevsky
e9729a9601
multiple yet minor fixes to make most of the tests pass on Mac with Iris graphics
2014-08-16 00:29:10 +04:00
Vadim Pisarevsky
30111a786a
Merge pull request #3085 from nickdademo:pvapi_fix_decimation_enum
2014-08-13 10:51:46 +00:00
Nick D'Ademo
91676de638
Change decimation enum values so they can be used in resolution calculations.
...
BUGFIX: Fixed bugged when setting PVAPI property CV_CAP_PROP_FRAME_HEIGHT.
2014-08-12 15:18:11 +02:00
Vadim Pisarevsky
f937f4d951
Merge pull request #3077 from kenlck:master
2014-08-11 16:41:30 +00:00
Vadim Pisarevsky
6df1198e8b
Merge pull request #3071 from mshabunin:stitch-fix
2014-08-11 16:08:40 +00:00
Low Chin Kian
911e1bd1e4
Allow full range IPv4 support, up to 255.255.255.255
...
Signed-off-by: Low Chin Kian <kenlck1990@gmail.com>
2014-08-11 21:08:37 +08:00
Nick D'Ademo
2b94bcffb9
Added get and set for additional PVAPI properties: DecimationHorizontal, DecimationVertical, BinningX, BinningY
2014-08-11 13:30:36 +02:00
mshabunin
c54b8f9b00
Merge remote-tracking branch 'master' into stitch-fix
...
* 'master' of github.com:itseez/opencv: (82 commits)
moved part of video to contrib/{outflow, bgsegm}; moved matlab to contrib
added some basic functionality needed by the new face module (moved from the old "contrib")
moved to the new opencv_contrib/face module
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
Fixed review comment from Vadim Pisarevsky
modified farneback sample to use T-API
ECC patch by the author (G. Evangelidis); fixed some OCL Farneback optical flow test failures on Mac
small fix for GaussianBlur ocl test
fix binary package build
small fix for ocl_resize
fix IOS framework
fixed test ocl_MatchTemplate for sparse matrix
Fixed typos
fixing error, wrong template method param.
fixing Mac build
some formal changes (generally adding constness)
Fixed choice of kercn and rowsPerWI for non-Intel device.
fixed nDiffs for CalcBackProject
fixed tests for ocl_filter2d, ocl_matchTemplate, ocl_histogram.cpp
Fixed issue: Mat::copyTo(UMat) if device copy is obsolete. Added test.
...
Conflicts:
modules/core/include/opencv2/core/mat.inl.hpp
2014-08-11 14:50:08 +04:00
Vadim Pisarevsky
05e7c29de5
fixed various warnings and obvious errors reported by clang compiler and the coverity tool.
2014-08-10 00:10:05 +04:00
Alexander Alekhin
03435c0d74
fix IOS framework
2014-08-08 15:57:54 +04:00
Alexander Alekhin
55188fe991
world fix
2014-08-05 20:12:35 +04:00
Roman Donchenko
983e75e5de
Merge remote-tracking branch 'origin/master' into merge-2.4
2014-08-01 15:01:41 +04:00
Vadim Pisarevsky
18de8dee62
Merge pull request #3009 from vpisarev:ios_experiments
2014-07-31 18:20:07 +00:00
Vadim Pisarevsky
4dfb613c3e
optimized Bayer=>RGB/RGBA/Gray conversion using Neon intrinsics. Fixed recently introduced build error in iOS framework.
2014-07-28 14:54:41 +04:00
Sander Mathijs van Veen
facb2f9a81
Reset class members to NULL after gst_*_unref()
2014-07-23 19:15:16 +02:00
Sander Mathijs van Veen
f8442da945
Initialize all pointers of CvCapture_GStreamer correctly
2014-07-23 14:41:17 +02:00
Vadim Pisarevsky
7bd7c85b1d
Merge pull request #2919 from larshg:Openni2Support
2014-07-23 11:23:48 +00:00
VBystricky
cc703b01df
Fix build errors with cap_v4l on Linux
2014-07-20 18:27:14 +04:00
Lars Glud
1242a66119
Openni2 support
2014-07-20 15:04:11 +02:00
Lars Glud
4dcd37f699
Merge remote-tracking branch 'origin/master' into Openni2Support
...
Conflicts:
modules/highgui/CMakeLists.txt
modules/highgui/include/opencv2/highgui.hpp
modules/highgui/include/opencv2/highgui/highgui_c.h
2014-07-20 14:28:10 +02:00
VBystricky
ca307669d4
Refresh code. Fix merge conflict
2014-07-14 23:30:50 +04:00
vbystricky
d58f736935
Split highgui module to videoio and highgui
2014-07-14 23:16:47 +04:00