eltermann [Sat, 4 Oct 2014 22:14:11 +0000 (19:14 -0300)]
Documentation fix on py_tutorials
Maksim Shabunin [Thu, 2 Oct 2014 13:25:06 +0000 (13:25 +0000)]
Merge pull request #3216 from xantares:patch-1
Alexander Alekhin [Tue, 30 Sep 2014 13:39:20 +0000 (13:39 +0000)]
Merge pull request #3223 from vbystricky:oclopt_BgSubMOG2
Alexander Alekhin [Tue, 30 Sep 2014 10:49:14 +0000 (10:49 +0000)]
Merge pull request #3278 from akarsakov:ocl_houghlines_perf_test
xantares [Tue, 30 Sep 2014 09:36:37 +0000 (09:36 +0000)]
Move cmake config files too on non-windows hosts.
Alexander Karsakov [Mon, 29 Sep 2014 09:03:07 +0000 (13:03 +0400)]
Added performance test for OCL version of HoughLines and HoughLinesP
Maksim Shabunin [Mon, 29 Sep 2014 08:42:02 +0000 (08:42 +0000)]
Merge pull request #3277 from a-wi:CMake_FFMPEG_config_v3
Artur Wieczorek [Sun, 28 Sep 2014 22:39:35 +0000 (00:39 +0200)]
Use FFMPEG capture only if HAVE_FFMPEG flag is defined.
Artur Wieczorek [Thu, 25 Sep 2014 10:37:38 +0000 (12:37 +0200)]
Fixed CMake issue with FFMPEG videoio configuration
Vadim Pisarevsky [Sat, 27 Sep 2014 15:25:20 +0000 (15:25 +0000)]
Merge pull request #3269 from asmorkalov:ocv_gstreamer3
Vadim Pisarevsky [Sat, 27 Sep 2014 13:09:24 +0000 (13:09 +0000)]
Merge pull request #3271 from mgeorg:reset_ffmpeg_mutex
Vadim Pisarevsky [Sat, 27 Sep 2014 13:07:11 +0000 (13:07 +0000)]
Merge pull request #3267 from a-wi:MSMF_capture_fixes_v3
Manfred Georg [Fri, 26 Sep 2014 16:44:25 +0000 (09:44 -0700)]
set ffmpeg mutex to NULL on destruction.
Maksim Shabunin [Fri, 26 Sep 2014 09:27:16 +0000 (09:27 +0000)]
Merge pull request #3258 from ilya-lavrenov:neon_convert
Alexander Smorkalov [Fri, 26 Sep 2014 06:50:22 +0000 (10:50 +0400)]
Added test on CAP_PROP_FRAMECOUNT option for cv::VideoCapture
Alexander Smorkalov [Thu, 25 Sep 2014 10:51:34 +0000 (14:51 +0400)]
Fixed compatibility with GStreamer 1.x
Alexander Smorkalov [Thu, 25 Sep 2014 10:40:54 +0000 (14:40 +0400)]
Fixed query of basic VideoCapture properties. Added tests for them.
Artur Wieczorek [Thu, 25 Sep 2014 10:05:54 +0000 (12:05 +0200)]
CMake configuration for MSMF capture
Applied in PR3247 to 2.4 branch.
Artur Wieczorek [Thu, 25 Sep 2014 09:54:15 +0000 (11:54 +0200)]
Fixed MSMF file capture error while opening the file containing unsupported video stream format
Applied in PR3260 to 2.4 branch
Artur Wieczorek [Thu, 25 Sep 2014 09:51:31 +0000 (11:51 +0200)]
Fixed assertion warning in MSMF frame grabber
Applied in PR3251 to 2.4 branch
Artur Wieczorek [Thu, 25 Sep 2014 09:49:31 +0000 (11:49 +0200)]
Fixed MSMF video capture initialization
Applied in PR3251 to 2.4 branch.
Artur Wieczorek [Thu, 25 Sep 2014 09:45:11 +0000 (11:45 +0200)]
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.
Artur Wieczorek [Thu, 25 Sep 2014 09:42:07 +0000 (11:42 +0200)]
Fixed compilation errors under VS 2010 and Win 7
Applied in PR3240 to 2.4 branch.
Ilya Lavrenov [Thu, 25 Sep 2014 07:50:06 +0000 (07:50 +0000)]
correct neon rounding
Vadim Pisarevsky [Wed, 24 Sep 2014 16:58:56 +0000 (16:58 +0000)]
Merge pull request #3249 from mshabunin:java_wrap
Vadim Pisarevsky [Wed, 24 Sep 2014 12:25:18 +0000 (12:25 +0000)]
Merge pull request #3257 from Atanahel:gbt_bugfix_master
Vadim Pisarevsky [Wed, 24 Sep 2014 12:11:53 +0000 (12:11 +0000)]
Merge pull request #3259 from ilya-lavrenov:neon_scale_add_f32
Ilya Lavrenov [Tue, 23 Sep 2014 17:14:42 +0000 (21:14 +0400)]
Neon optimization of cv::scaleAdd (CV_32F)
Ilya Lavrenov [Tue, 23 Sep 2014 14:03:07 +0000 (14:03 +0000)]
Neon optimization of Mat::convertTo
Benoit Seguin [Tue, 23 Sep 2014 12:03:20 +0000 (14:03 +0200)]
Correction of the integer data treated as floating point data bug, already corrected in the 2.4 branch.
Vadim Pisarevsky [Tue, 23 Sep 2014 11:51:24 +0000 (11:51 +0000)]
Merge pull request #3253 from asmorkalov:ocv_gstreamer2
Alexander Smorkalov [Tue, 23 Sep 2014 10:15:36 +0000 (14:15 +0400)]
More accurate selection of color space conversion element for GStreamer 1.x
Alexander Smorkalov [Tue, 23 Sep 2014 10:00:53 +0000 (14:00 +0400)]
Fixed compatibility with GStreamer 1.x.
Vadim Pisarevsky [Tue, 23 Sep 2014 08:43:42 +0000 (08:43 +0000)]
Merge pull request #3252 from GravityJack:point-division
Alexander Smorkalov [Tue, 16 Sep 2014 13:05:36 +0000 (17:05 +0400)]
Fixed GStreamer encoding pipeline frame drop for most cases.
For several muxers and encoders GStreamer still drops the last frame.
Vadim Pisarevsky [Tue, 23 Sep 2014 07:15:24 +0000 (07:15 +0000)]
Merge pull request #3250 from ilya-lavrenov:neon_convert_scale_abs
vbystricky [Fri, 12 Sep 2014 11:32:36 +0000 (15:32 +0400)]
Optimize OpenCL version function BackgroundSubstractionMOG2
Marc Rollins [Mon, 22 Sep 2014 19:07:16 +0000 (12:07 -0700)]
Updating documentation to reflect division operations.
Marc Rollins [Mon, 22 Sep 2014 18:59:11 +0000 (11:59 -0700)]
Adding element-wise division operators to Point3_ class.
Marc Rollins [Mon, 22 Sep 2014 17:58:11 +0000 (10:58 -0700)]
Adding division operators to `Point_` class.
Performs element-wise division.
Vadim Pisarevsky [Mon, 22 Sep 2014 17:32:36 +0000 (17:32 +0000)]
Merge pull request #3248 from ilya-lavrenov:arm_sum
Ilya Lavrenov [Mon, 22 Sep 2014 15:30:12 +0000 (15:30 +0000)]
Neon optimization of cv::convertScaleAbs
Vadim Pisarevsky [Mon, 22 Sep 2014 15:28:42 +0000 (15:28 +0000)]
Merge pull request #3239 from mshabunin:xfeatures2d_fix
xantares [Mon, 22 Sep 2014 15:14:35 +0000 (15:14 +0000)]
Also test for target.
Ilya Lavrenov [Sun, 21 Sep 2014 19:38:02 +0000 (19:38 +0000)]
Neon optimization of cv::sum
Maksim Shabunin [Fri, 19 Sep 2014 11:31:38 +0000 (15:31 +0400)]
Java wrappers now support nested namespaces and classes
- wrapper support python3
- added wrapper log
- generating full name for nested namespaces and classes
Maksim Shabunin [Fri, 19 Sep 2014 11:16:41 +0000 (15:16 +0400)]
Support of bioinspired contrib module wrapping
- added java wrapper
- disabled python wrapper
Vadim Pisarevsky [Fri, 19 Sep 2014 13:35:47 +0000 (13:35 +0000)]
Merge pull request #3237 from mshabunin:java_test_detection
Maksim Shabunin [Fri, 19 Sep 2014 12:41:33 +0000 (16:41 +0400)]
Fix xfeatures2d dependencies
Maksim Shabunin [Fri, 19 Sep 2014 09:10:14 +0000 (13:10 +0400)]
Fixed android test detection and some spaces in CMakeLists.txt
Maksim Shabunin [Fri, 19 Sep 2014 08:09:53 +0000 (12:09 +0400)]
Changed java tests detection procedure
Vadim Pisarevsky [Thu, 18 Sep 2014 17:47:55 +0000 (17:47 +0000)]
Merge pull request #3233 from niebles:master
Juan Carlos Niebles [Thu, 18 Sep 2014 17:00:28 +0000 (12:00 -0500)]
Merge github.com:Itseez/opencv
Juan Carlos Niebles [Thu, 18 Sep 2014 14:39:35 +0000 (09:39 -0500)]
removed setter methods, replaced by CV_PROP_RW macro
Vadim Pisarevsky [Thu, 18 Sep 2014 13:06:54 +0000 (13:06 +0000)]
Merge pull request #3234 from vpisarev:fixed_photo_test_failure
Vadim Pisarevsky [Thu, 18 Sep 2014 12:38:54 +0000 (12:38 +0000)]
Merge pull request #2702 from GregoryMorse:patch-3
Vadim Pisarevsky [Thu, 18 Sep 2014 12:05:24 +0000 (12:05 +0000)]
Merge pull request #2893 from ilya-lavrenov:tapi_vector_width_intel
Vadim Pisarevsky [Thu, 18 Sep 2014 11:48:29 +0000 (11:48 +0000)]
Merge pull request #3232 from Chuanbo-Weng:master
Vadim Pisarevsky [Thu, 18 Sep 2014 11:47:59 +0000 (15:47 +0400)]
make sure ptr<> is called with proper parameter, otherwise the assertion fails
Juan Carlos Niebles [Thu, 18 Sep 2014 00:02:12 +0000 (19:02 -0500)]
fixed whitespaces
Juan Carlos Niebles [Wed, 17 Sep 2014 23:45:48 +0000 (18:45 -0500)]
extended python interface for KalmanFilter
Vadim Pisarevsky [Wed, 17 Sep 2014 12:07:43 +0000 (12:07 +0000)]
Merge pull request #3180 from mshabunin:java_ptr_support
Vadim Pisarevsky [Wed, 17 Sep 2014 12:06:31 +0000 (12:06 +0000)]
Merge pull request #3230 from znah:ipp_median_fix
Chuanbo Weng [Wed, 17 Sep 2014 11:28:07 +0000 (19:28 +0800)]
Use vload to read unaligned data instead of dereference operator.
According to opencl 1.2 spec 6.1.5:
For arguments to a __kernel function declared to be a pointer to a
data type, the OpenCL compiler can assume that the pointee is always
appropriately aligned as required by the data type. The behavior of
an unaligned load or store is undefined, except for the
vloadn, vload_halfn, vstoren, and vstore_halfn functions defined in
section 6.12.7.
Original code read data of type T from address not aligned by multiple
of sizeof(T), so the result is incorrect. With this patch, the cases
./opencv_perf_imgproc
--gtest_filter=OCL_ImgSize_TmplSize_Method_MatType_MatchTemplate.MatchTemplate/*
could work well with beignet 0.9.3.
Signed-off-by: Chuanbo Weng <chuanbo.weng@intel.com>
Vadim Pisarevsky [Wed, 17 Sep 2014 10:53:21 +0000 (10:53 +0000)]
Merge pull request #3231 from vpisarev:reenable_cpp_samples
Vadim Pisarevsky [Wed, 17 Sep 2014 10:02:36 +0000 (10:02 +0000)]
Merge pull request #3229 from the-glu:master
Vadim Pisarevsky [Wed, 17 Sep 2014 09:55:49 +0000 (09:55 +0000)]
Merge pull request #3220 from asmorkalov:ocv_gstreamer
Vadim Pisarevsky [Wed, 17 Sep 2014 09:52:34 +0000 (09:52 +0000)]
Merge pull request #3215 from dmitrygribanov:dg/stitching-wave-correction-bugfix
Vadim Pisarevsky [Wed, 17 Sep 2014 09:52:01 +0000 (09:52 +0000)]
Merge pull request #3226 from whoshuu:patch-1
Vadim Pisarevsky [Wed, 17 Sep 2014 09:50:43 +0000 (09:50 +0000)]
Merge pull request #3227 from PhilLab:patch-3
Vadim Pisarevsky [Wed, 17 Sep 2014 09:49:48 +0000 (13:49 +0400)]
the samples from the main repository should not depend on modules from opencv_contrib
Alexander Mordvintsev [Wed, 17 Sep 2014 09:26:39 +0000 (13:26 +0400)]
fix: ippiFilterMedianBorder sometimes crash when doing in-place filtering
Maximilien Cuony [Wed, 17 Sep 2014 07:32:19 +0000 (09:32 +0200)]
Fix typo in error for extrinsic parameters
Philipp Hasper [Wed, 17 Sep 2014 07:29:17 +0000 (09:29 +0200)]
Doc: Fixing indentation
Huu Nguyen [Tue, 16 Sep 2014 22:30:10 +0000 (15:30 -0700)]
Fix implicit narrowing error in initializer list
The implicit narrowing in the initializer list throws a compiler error for some compilers with C++11 support turned on. The specific error message is: "error: narrowing conversion of 'PyInt_AsLong(((PyObject*)o))' from 'long int' to 'double' inside { }".
Tested on Clang 5.1.0 and Mac OS X 10.9.4.
Alexander Alekhin [Tue, 16 Sep 2014 13:03:45 +0000 (13:03 +0000)]
Merge pull request #3208 from vbystricky:oclopt_Filter2D
Alexander Smorkalov [Tue, 16 Sep 2014 09:57:44 +0000 (13:57 +0400)]
Code review fixes.
Alexander Smorkalov [Wed, 10 Sep 2014 06:38:43 +0000 (10:38 +0400)]
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.
Vadim Pisarevsky [Mon, 15 Sep 2014 07:34:16 +0000 (07:34 +0000)]
Merge pull request #3218 from berak:docfix_colormap_30
Vadim Pisarevsky [Sun, 14 Sep 2014 20:10:36 +0000 (20:10 +0000)]
Merge pull request #3175 from avdmitry:modern_doc_theme
berak [Sun, 14 Sep 2014 08:56:22 +0000 (10:56 +0200)]
small corrections to applyColorMap docs
Vadim Pisarevsky [Sun, 14 Sep 2014 18:57:23 +0000 (18:57 +0000)]
Merge pull request #3126 from avdmitry:move_KDTree_to_ml
Vadim Pisarevsky [Sun, 14 Sep 2014 18:50:33 +0000 (18:50 +0000)]
Merge pull request #3200 from pierriko:master
Vadim Pisarevsky [Sun, 14 Sep 2014 18:49:35 +0000 (18:49 +0000)]
Merge pull request #3201 from PhilLab:patch-3
Vadim Pisarevsky [Sun, 14 Sep 2014 18:48:51 +0000 (18:48 +0000)]
Merge pull request #3206 from stonier:parallel_qt
Vadim Pisarevsky [Sun, 14 Sep 2014 18:47:21 +0000 (18:47 +0000)]
Merge pull request #3209 from PhilLab:patch-5
Vadim Pisarevsky [Sun, 14 Sep 2014 18:44:41 +0000 (18:44 +0000)]
Merge pull request #3205 from parafin:ximea_unix-3.0
Vadim Pisarevsky [Sun, 14 Sep 2014 18:44:06 +0000 (18:44 +0000)]
Merge pull request #3203 from parafin:bug_3858-3.0
Vadim Pisarevsky [Sun, 14 Sep 2014 18:41:05 +0000 (18:41 +0000)]
Merge pull request #3207 from jamoque:more-better-fixes
Vadim Pisarevsky [Sun, 14 Sep 2014 18:39:33 +0000 (18:39 +0000)]
Merge pull request #3213 from mshabunin:png_iccp_strip
xantares [Sat, 13 Sep 2014 13:49:34 +0000 (15:49 +0200)]
Update CMakeLists.txt
Dmitriy Anisimov [Sat, 13 Sep 2014 11:06:07 +0000 (15:06 +0400)]
minor change: moved algorithm type to the end of params
Dmitry Gribanov [Fri, 12 Sep 2014 14:07:54 +0000 (18:07 +0400)]
Feature based stitching's wave correction bugfix.
When we have similar matrices in input, then algorithm returns matrices
with NaN values.
Maksim Shabunin [Fri, 12 Sep 2014 12:24:26 +0000 (16:24 +0400)]
Stripped iCCP chunk from png files
Andrey Pavlenko [Thu, 11 Sep 2014 16:15:25 +0000 (16:15 +0000)]
Merge pull request #3198 from mshabunin:java_test_fix
vbystricky [Wed, 10 Sep 2014 11:02:51 +0000 (15:02 +0400)]
Optimization OpenCL version of Filter2D
Maksim Shabunin [Thu, 11 Sep 2014 07:56:05 +0000 (11:56 +0400)]
Fixed some failing java tests
- fixed lena.png extension
- fixed getTextSize wrapper
- added junit html report generation
Philipp Hasper [Wed, 10 Sep 2014 17:12:06 +0000 (19:12 +0200)]
Visual Studio tutorial: updated library names
GregoryMorse [Sat, 14 Dec 2013 08:53:30 +0000 (16:53 +0800)]
Add support for WinRT in the MF capture framework by removing the disallowed calls to enumerate devices and create a sample grabber sink and adding framework for the MediaCapture interface and a custom sink which interfaces with the sample grabber callback interface. The change requires discussion for making it completely functional as redundancy is required given that if the source is a video file, the old code pathways must be used. Otherwise all IMFMediaSession, IMFMediaSource, and IMFActivate code must use a MediaCapture code path and all sink code must use the CMediaSink custom sink.
Support for the custom sink is extended to non-WinRT not for compatibility as Windows Vista client is a minimum regardless, but because it offers more flexibility, could be faster and is able to be used as an optionally different code path during sink creation based on a future configuration parameter.
My discussion and proposal to finish this change:
Devices are so easily enumerated through WinRT Windows.Devices namespace that wrapping the calls in a library is quite a chore for little benefit though to get the various modes and formats could still be a worthwhile project. For now conditional compilation to remove videodevices and any offending non-video file related activity in videodevice. In my opinion, this is a different , far less fundamental and important change which can possibly be done as a future project and also much more easily implemented in C++/CX.
ImageGrabber has the IMFSampleGrabberSinkCallback replaced with a base class (SharedSampleGrabber) which also be is base class for ImageGrabberRT. This change is necessary as the custom sink does not require a thread to pump events which is done through MediaCapture already. IMFSampleGrabberSinkCallback is the common element between both models and that piece can be shared. Initializing the new ImageGrabberRT is as simple as passing an already initialized MediaCapture object and any video format/encoding parameters.
The concurrency event is necessary to wait for completion and is the way the underlying, IAsyncAction wrappers in the task library work as well. Native WIN32 event objects would be an option if HAVE_CONCURRENCY is not defined. I could even imagine doing it with sleep/thread yield and InterlockedCompareExchange yet I am not enthusiastic about that approach either. Since there is a specific compiler HAVE_ for concurrency, I do not like pulling it in though I think for WinRT it is safe to say we will always have it available though should probably conditionally compile with the Interlocked option as WIN32 events would require HAVE_WIN32.
It looks like C++/CX cannot be used for the IMediaExtension sink (which should not be a problem) as using COM objects requires WRL and though deriving from IMediaExtension can be done, there is little purpose without COM. Objects from C++/CX can be swapped to interact with objects from native C++ as Inspectable* can reinterpret_cast to the ref object IInspectable^ and vice-versa. A solution to the COM class with C++/CX would be great so we could have dual support. Also without #define for every WRL object in use, the code will get quite muddy given that the */^ would need to be ifdef'd everywhere.
Fixed bugs and completed the change. I believe the new classes need to be moved to a header file as the file has become to large and more classes need to be added for handling all the asynchronous problems (one wrapping IAsyncAction in a task and another for making a task out of IAsyncAction). Unfortunately, blocking on the UI thread is not an option in WinRT so a synchronous architecture is considered "illegal" by Microsoft's standards even if implementable (C++/CX ppltasks library throws errors if you try it). Worse, either by design or a bug in the MF MediaCapture class with Custom Sinks causes a crash if stop/start previewing without reinitializing (spPreferredPreviewMediaType is fatally nulled). After decompiling Windows.Media.dll, I worked around this in my own projects by using an activate-able custom sink ID which strangely assigns 1 to this pointer allowing it to be reinitialized in what can only be described as a hack by Microsoft. This would add additional overhead to the project to implement especially for static libraries as it requires IDL/DLL exporting followed by manifest declaration. Better to document that it is not supported.
Furthermore, an additional class for IMFAttributes should be implemented to make clean architecture for passing around attributes as opposed to directly calling non-COM interface calls on the objects and making use of SetProperties which would also be a set up for an object that uses the RuntimeClass activation ID.
The remaining changes are not difficult and will be complete soon along with debug tracing messages.
Update and rename cap_msmf.h to cap_msmf.hpp
Successful test - samples are grabbed
Library updated and cleaned up with comments, marshaling, exceptions and linker settings
Fixed trailing whitespace
VS 2013 support and cleanup consistency plus C++/CX new object fixed
Conflicts:
modules/highgui/src/cap_msmf.cpp
modules/highgui/src/cap_msmf.hpp
modules/highgui/src/ppltasks_winrt.h
Fix merge conflicts
VS 2013 Update 2 library bug fix integrated
a-wi's changed integrated
Vadim Pisarevsky [Wed, 10 Sep 2014 07:57:09 +0000 (07:57 +0000)]
Merge pull request #3189 from mshabunin:python_cross_build