mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-02 16:00:17 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity
13,000 Commits 6 Branches 126 Tags 3 GiB
4512d06484
Commit Graph

40 Commits

Author SHA1 Message Date
Roman Donchenko
2bbda9d225 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/cudaimgproc/test/test_color.cpp
	modules/dynamicuda/include/opencv2/dynamicuda/dynamicuda.hpp
	modules/gpu/perf/perf_imgproc.cpp
	modules/gpu/src/imgproc.cpp
	modules/gpu/test/test_core.cpp
	modules/gpu/test/test_imgproc.cpp
	modules/java/generator/src/cpp/VideoCapture.cpp
	samples/gpu/performance/CMakeLists.txt
	samples/tapi/CMakeLists.txt
 2014-02-03 13:23:59 +04:00
Alexander Smorkalov
87935f3560 Highgui test output fixes. 
Useless output to console fixed;
Test output files moved from cwd to temp folder.
 2014-01-31 12:49:10 +04:00
Roman Donchenko
aacf188e83 Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/build_warps.cpp
	modules/ocl/src/color.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_color.cpp
	samples/cpp/3calibration.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping.cpp
	samples/cpp/OpenEXRimages_HDR_Retina_toneMapping_video.cpp
	samples/cpp/Qt_sample/main.cpp
	samples/cpp/camshiftdemo.cpp
	samples/cpp/descriptor_extractor_matcher.cpp
	samples/cpp/distrans.cpp
	samples/cpp/generic_descriptor_match.cpp
	samples/cpp/grabcut.cpp
	samples/cpp/morphology2.cpp
	samples/cpp/segment_objects.cpp
	samples/cpp/stereo_calib.cpp
	samples/cpp/tutorial_code/Histograms_Matching/compareHist_Demo.cpp
	samples/cpp/tutorial_code/core/mat_mask_operations/mat_mask_operations.cpp
	samples/cpp/tutorial_code/introduction/display_image/display_image.cpp
	samples/cpp/tutorial_code/introduction/windows_visual_studio_Opencv/Test.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection.cpp
	samples/cpp/tutorial_code/objectDetection/objectDetection2.cpp
	samples/cpp/video_dmtx.cpp
 2013-11-19 16:21:09 +04:00
Roman Donchenko
405227d531 Replaced the image used in the Highgui_Video.ffmpeg_image test. 
Our prebuilt FFmpeg Windows binaries don't have PNG support enabled
(because that requires zlib), so that makes a PNG image a bad choice
for this test.

When FFmpeg doesn't support PNG, VideoCapture falls back to the
"image sequence" implementation, which doesn't work for single images.
 2013-11-11 18:30:04 +04:00
Roman Donchenko
9c83f6c4fb Merge remote-tracking branch 'origin/2.4' into merge-2.4 
Conflicts:
	cmake/OpenCVDetectCUDA.cmake
	modules/core/include/opencv2/core/version.hpp
	modules/cudacodec/src/ffmpeg_video_source.cpp
	modules/gpu/src/video_writer.cpp
	modules/highgui/test/test_ffmpeg.cpp
	modules/highgui/test/test_video_io.cpp
	modules/highgui/test/test_video_pos.cpp
	modules/ocl/include/opencv2/ocl/ocl.hpp
	modules/ocl/include/opencv2/ocl/private/util.hpp
	modules/ocl/src/arithm.cpp
	modules/ocl/src/blend.cpp
	modules/ocl/src/canny.cpp
	modules/ocl/src/cl_operations.cpp
	modules/ocl/src/filtering.cpp
	modules/ocl/src/haar.cpp
	modules/ocl/src/imgproc.cpp
	modules/ocl/src/kmeans.cpp
	modules/ocl/src/moments.cpp
	modules/ocl/src/safe_call.hpp
	modules/ocl/src/split_merge.cpp
	modules/ocl/test/test_moments.cpp
	samples/ocl/squares.cpp
 2013-11-05 16:38:23 +04:00
Roman Donchenko
1188894133 Fixed indentation in CV_FFmpegWriteBigVideoTest::run. 2013-10-25 14:37:54 +04:00
Roman Donchenko
5a5d569d72 Changed MPEG-2 resolution in the FFmpeg test. 
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e

(cherry picked from commit 424a7b0ab0)

Conflicts:
	modules/highgui/test/test_ffmpeg.cpp
 2013-10-25 14:31:27 +04:00
Roman Donchenko
260c2e0b08 Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp. 
(cherry picked from commit 3f3ae33327)
 2013-10-25 14:29:37 +04:00
Roman Donchenko
424a7b0ab0 Changed MPEG-2 resolution in the FFmpeg test. 
Newer FFmpeg prohibits 4096x4096 MPEG-2, presumably because it violates
the standard.

http://git.videolan.org/gitweb.cgi/ffmpeg.git/?p=ffmpeg.git;a=commit;h=7fb87bc5f24b1be13269109506c05e4c54695b5e
 2013-10-23 17:42:00 +04:00
Roman Donchenko
3f3ae33327 Decoupled test_ffmpeg.cpp from ffmpeg_codecs.hpp. 
This should actually remove the need for the workaround from
the previous commit.
 2013-10-23 14:56:37 +04:00
Andrey Kamaev
0738ea7d0f Make highgui.hpp independent from C API 2013-04-08 15:47:29 +04:00
Andrey Kamaev
67073daf19 Merge branch '2.4' 2013-04-05 21:11:59 +04:00
Alexander Smorkalov
09bc99a0c0 HAVE_WIN32UI and HAVE_VFW checks and defines added. 2013-03-27 08:03:51 -07:00
Alexander Smorkalov
de95a2b278 Video IO tests turned off for ARM WinRT. 2013-03-27 00:45:41 -07:00
Andrey Kamaev
ad5cddc007 Main module headers are moved 1 level up 
e.g. <opencv2/core/core.hpp> become <opencv2/core.hpp>

Also renamed <opencv2/core/opengl_interop.hpp> to <opencv2/core/opengl.hpp>
 2013-03-13 17:26:56 +04:00
Ilya Lavrenov
5512f91d08 removed libstdc++ dependency 2013-02-12 14:20:23 +04:00
Andrey Kamaev
5cae645ba1 Temporary disabled parallel_writers_and_readers test 2013-02-11 16:52:20 +04:00
Andrey Kamaev
3c39e146a3 Make parallel video writer test pass if compiled without threading support 2013-02-04 14:34:44 +04:00
Alexander Smorkalov
8c45b9d03d Video IO perf tests guarded. 2013-01-29 11:09:49 +04:00
Ilya Lavrenov
4abf0b3193 thread-safe VideoWriter and VideoCapture 2012-11-19 16:44:23 +04:00
Marina Kolpakova
162f9fd7ea merged the trunk r8735:8766, r8769, r8777:8780, r8790 and r8800:8811 2012-06-28 17:07:17 +00:00
Vadim Pisarevsky
d60caea559 added test to check #1737 2012-04-27 12:07:56 +00:00
Vadim Pisarevsky
bc3c49518d ok, now positioning seem to work well, at least with ffmpeg 0.10.2 on MacOSX 10.7 2012-04-26 07:07:37 +00:00
Vadim Pisarevsky
b253665f8c added explicit VideoWriter::release(). Fixed video stream finalization (write remaining frames); Fixed occasional crash in the case of odd-width or odd-height videos; Fixed a few problems in ffmpeg tests. Positioning still does not work well. 2012-04-09 23:12:52 +00:00
Vadim Pisarevsky
305b9a25e3 restored resolution in big video writer test 2012-04-06 10:15:52 +00:00
Vadim Pisarevsky
32d72047d5 reduced the video size in video writer tests; retained only most popular codecs. added ffmpeg support on MacOSX. 2012-04-05 18:26:49 +00:00
Alexander Reshetnikov
cff117c08b Updated saving paths for highgui tests 2012-03-28 15:27:55 +00:00
Alexander Reshetnikov
07ec83cd1f Updated ffmpeg test for big video writing (changed saving paths + added removing files) 2012-03-28 12:15:25 +00:00
Alexander Reshetnikov
7817e11e01 Fixed compilation error under Windows 2012-03-22 22:26:33 +00:00
Alexander Reshetnikov
6de7064836 Updated ffmpeg test for big video writing 2012-03-22 22:18:43 +00:00
Andrey Kamaev
4168a698f6 Fixed highgui tests for Android 2011-12-20 07:45:49 +00:00
Vadim Pisarevsky
ff5e97c8e4 added COVAR_ and SORT_ enums to core.hpp; fixed many, many VS2005, VS2010 and MinGW (GCC 4.5.2) warnings 2011-07-19 12:27:07 +00:00
Alexander Shishkov
d40b37dbf3 modified output stream 2011-06-17 11:51:15 +00:00
Andrey Morozov
03c7784186 added several new highgui tests 2011-06-03 08:33:27 +00:00
Andrey Morozov
19900d9894 converted all highgui tests to the format of google test system 2011-06-02 15:23:37 +00:00
Andrey Morozov
da9e3ed6fb commented several tests because it's very slow 2011-06-02 11:43:13 +00:00
Andrey Morozov
de2fd5c430 added a test on read/write images 2011-06-02 09:33:15 +00:00
Andrey Morozov
48514337de minor fix in highgui tests 2011-06-02 08:53:12 +00:00
Andrey Morozov
4b5e53b33b minor fix 2011-06-01 17:41:30 +00:00
Andrey Morozov
abfc5d3405 fixed bugs for windows. added 2 tests for ffmpeg 2011-06-01 16:14:17 +00:00