46e457d340
Fixed loop check
2015-07-22 17:54:42 +03:00
14d7b38613
Fixing GCC 4.9 warnings
2015-07-22 16:12:31 +03:00
c1c0f23fd1
Merge pull request #4004 from paroj:camera-api
2015-07-21 15:57:48 +00:00
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
4c1cbffd2a
Merge pull request #4184 from alalek:fix_cmake_status
2015-07-14 10:32:06 +00:00
ed574171bb
Fixed polarity of ImageRegistration mode in setDepthGeneratorProperty function of CvCapture_OpenNI2 class
2015-07-12 18:28:23 -04:00
aa871ca506
fix wrong usage of status(), remove useless message in videoio
2015-07-10 19:18:07 +03:00
b1842a4b89
use simplified API selection logic in cvCreateCameraCapture as well
2015-07-08 13:46:57 +02:00
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
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
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
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
902e381264
fix one dict parameter in ffmpeg implementation (introduced while porting)
2015-06-20 10:17:34 +02:00
e055128d0d
Merge pull request #4099 from sash-kan:fix.2822
2015-06-17 11:58:40 +00:00
3f2666778a
videoio: fix some issues in ffmpeg error processing
2015-06-09 16:30:57 +03:00
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
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
39fdcf4df3
Merge pull request #4083 from mshabunin:java-engine
2015-06-03 17:17:36 +00:00
1f3043f618
videoio: VideoWriter H264/.mp4 support via ffmpeg/libav
2015-06-03 18:35:12 +03:00
caffbaafbe
Updated Manager for Android
2015-06-02 17:33:04 +03:00
535dc1e874
Merge pull request #3998 from msandler:master
2015-05-29 21:38:09 +00:00
f7ad192842
Merge pull request #4063 from Dikay900:2_4_to_master
2015-05-28 14:49:13 +00:00
9aaa27d46b
Adding missing docs for VideoWriter::release
2015-05-27 07:55:41 +02:00
eb40dde688
Fixing XIMEA parameters mapping (issue #4176 )
...
Conflicts:
modules/highgui/src/cap_ximea.cpp
2015-05-26 18:08:29 +02:00
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
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
efa2baed83
TCP instead of UDP
...
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
2015-05-24 14:06:30 +02:00
3c2e12a744
bug fixed
...
Conflicts:
modules/highgui/src/cap_ffmpeg_impl.hpp
2015-05-24 13:31:07 +02:00
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
7ca0557b40
typos in comments
2015-05-23 17:36:45 +02:00
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
f5be8f6c77
Merge pull request #4047 from MSOpenTech:videoio-refactor-contrib
2015-05-23 09:02:11 +00:00
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
6d0407b65e
VideoCapture with digital camera and gPhoto2 library
2015-05-21 00:41:39 +02:00
8b791477df
Merge pull request #3971 from Dikay900:2_4_to_master_3
2015-05-17 00:28:30 +00:00
eb41a574b7
Merge pull request #4005 from MSOpenTech:videoio-contrib
2015-05-16 18:08:28 +00:00
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
d08cb6b357
Added WinRT support for videoio.
...
Signed-off-by: Maxim Kostin <v-maxkos@microsoft.com >
2015-05-15 16:28:47 +03:00
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
cc086b9452
Merge pull request #3979 from ruslo:fix.cxx11
2015-05-15 12:32:46 +00:00
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
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
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
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
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
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
dcf177e372
Merge pull request #3952 from vpisarev:fix_libav_case
2015-04-23 06:25:25 +00:00
30912b49f3
fixed compile warnings; hopefully fixed test failures
2015-04-23 00:39:44 +03:00
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
08925330e0
mjpec_decoder initialize m_movi_start variable
2015-04-22 19:49:11 +03:00
Maksim Shabunin
Alexander Alekhin
Anton V. Shokurov
ultrafro
Pavel Rojtberg
kalistratovag
Dikay900
Vadim Pisarevsky
alexander barakin (aka sash-kan)
Philipp Hasper
Andrew Senin
StevenPuttemans
Ilya Lavrenov
jormansa
Martijn Liem
Ehren Metcalfe
Maxim Kostin
Piotr Dobrowolski
msandler
Vincent Rabaud
Ruslan Baratov
AfterEight
Roman Donchenko