generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "disabled video decoding under linux"

Browse Source 
This reverts commit 889674ef43.
This commit is contained in:
vlad
2012-12-20 13:31:22 +04:00
committed by Vladislav Vinogradov
parent 660d23aa04
commit 11293d071f
17 changed files with 40 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/gpu/test/test_video.cpp
View File

@@ -43,11 +43,11 @@
#ifdef HAVE_CUDA
#ifdef WIN32
//////////////////////////////////////////////////////
// VideoWriter
#ifdef WIN32
PARAM_TEST_CASE(VideoWriter, cv::gpu::DeviceInfo, std::string)
{
cv::gpu::DeviceInfo devInfo;
@@ -107,9 +107,13 @@ INSTANTIATE_TEST_CASE_P(GPU_Video, VideoWriter, testing::Combine(
ALL_DEVICES,
testing::Values(std::string("768x576.avi"), std::string("1920x1080.avi"))));
#endif // WIN32
//////////////////////////////////////////////////////
// VideoReader
#ifdef HAVE_NVCUVID
PARAM_TEST_CASE(VideoReader, cv::gpu::DeviceInfo, std::string)
{
cv::gpu::DeviceInfo devInfo;
@@ -147,6 +151,6 @@ INSTANTIATE_TEST_CASE_P(GPU_Video, VideoReader, testing::Combine(
ALL_DEVICES,
testing::Values(std::string("768x576.avi"), std::string("1920x1080.avi"))));
#endif // WIN32
#endif // HAVE_NVCUVID
#endif // HAVE_CUDA