Merge pull request #2684 from ElenaGvozdeva:ippiDFT
authorAlexander Alekhin <alexander.alekhin@itseez.com>
Wed, 7 May 2014 13:57:17 +0000 (17:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 7 May 2014 13:57:17 +0000 (17:57 +0400)
1  2 
modules/core/perf/perf_dft.cpp
modules/core/src/dxt.cpp

@@@ -27,37 -28,10 +30,40 @@@ PERF_TEST_P(Size_MatType_FlagsType_Nzer
  
      declare.in(src, WARMUP_RNG).time(60);
  
-     TEST_CYCLE() dft(src, dst, flags);
+     if (isNzeroRows)
+         nonzero_rows = sz.height/2;
+     TEST_CYCLE() dft(src, dst, flags, nonzero_rows);
  
      SANITY_CHECK(dst, 1e-5, ERROR_RELATIVE);
 +}
 +
 +///////////////////////////////////////////////////////dct//////////////////////////////////////////////////////
 +
 +CV_ENUM(DCT_FlagsType, 0, DCT_INVERSE , DCT_ROWS, DCT_INVERSE|DCT_ROWS)
 +
 +typedef std::tr1::tuple<Size, MatType, DCT_FlagsType> Size_MatType_Flag_t;
 +typedef perf::TestBaseWithParam<Size_MatType_Flag_t> Size_MatType_Flag;
 +
 +PERF_TEST_P(Size_MatType_Flag, dct, testing::Combine(
 +                                    testing::Values(cv::Size(320, 240),cv::Size(800, 600),
 +                                                    cv::Size(1024, 768), cv::Size(1280, 1024),
 +                                                    sz1080p, sz2K),
 +                                    testing::Values(CV_32FC1, CV_64FC1), DCT_FlagsType::all()))
 +{
 +    Size sz = get<0>(GetParam());
 +    int type = get<1>(GetParam());
 +    int flags = get<2>(GetParam());
 +
 +    Mat src(sz, type);
 +    Mat dst(sz, type);
 +
 +    declare
 +        .in(src, WARMUP_RNG)
 +        .out(dst)
 +        .time(60);
 +
 +    TEST_CYCLE() dct(src, dst, flags);
 +
 +    SANITY_CHECK(dst, 1e-5, ERROR_RELATIVE);
  }
Simple merge