third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
19,184 Commits 3 Branches 0 Tags
adcdab394bb82c1dca34cc37fe2ccb928172ee08
Commit Graph

48 Commits

Author SHA1 Message Date
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
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
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 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
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 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
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
Pierre Letessier baa21484a1 Added CV_CAP_PROP_SAR properties to videoio module 2015-10-23 21:14:22 +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
Dikay900 55df326589 PR #4003 2015-09-21 13:44:35 +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 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
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
Maksim Shabunin caffbaafbe Updated Manager for Android 2015-06-02 17:33:04 +03: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
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
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
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
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
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 3df6b6fdcf added self-contained motion jpeg encoder (filename should end with .avi; fourcc should be "MJPG" 2015-03-26 00:39:29 +03: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
soyer d84d3a519b Allow YUYV capture via libv4l 2015-01-15 15:10:15 +01:00
Vadim Pisarevsky 61886a61de Merge pull request #3504 from a-wi:VideoCapture_get_const_v3 2014-12-26 14:37:47 +00: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
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
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
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
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
Nick D'Ademo 2b94bcffb9 Added get and set for additional PVAPI properties: DecimationHorizontal, DecimationVertical, BinningX, BinningY 2014-08-11 13:30:36 +02:00
Lars Glud 1242a66119 Openni2 support 2014-07-20 15:04:11 +02:00
vbystricky d58f736935 Split highgui module to videoio and highgui 2014-07-14 23:16:47 +04:00