mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-30 06:10:02 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,360 Commits 6 Branches 126 Tags 3 GiB
4635356435
Commit Graph

700 Commits

Author SHA1 Message Date
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