diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-04-21 14:15:35 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-04-21 14:15:35 -0700 |
| commit | 3d4ed278e68c8d29e7b83260faabc2ecd05b93e9 (patch) | |
| tree | 6aad402fcfbe22808de1bf8b3e8640233c2cbb21 /test | |
| parent | 79303c993ae09390b6e636943f2f44c545f41928 (diff) | |
| download | libvpx-3d4ed278e68c8d29e7b83260faabc2ecd05b93e9.tar libvpx-3d4ed278e68c8d29e7b83260faabc2ecd05b93e9.tar.gz libvpx-3d4ed278e68c8d29e7b83260faabc2ecd05b93e9.tar.bz2 libvpx-3d4ed278e68c8d29e7b83260faabc2ecd05b93e9.zip | |
Reusing vp9_get_interp_kernel() function in unit tests.
Change-Id: Ic24a371817c9dd5c4035a6fe01111bd9ab63f552
Diffstat (limited to 'test')
| -rw-r--r-- | test/convolve_test.cc | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/test/convolve_test.cc b/test/convolve_test.cc index e920de874..37ee0ef2a 100644 --- a/test/convolve_test.cc +++ b/test/convolve_test.cc @@ -306,19 +306,13 @@ TEST_P(ConvolveTest, Copy2D) { << "(" << x << "," << y << ")"; } -const int16_t (*kTestFilterList[])[8] = { - vp9_bilinear_filters, - vp9_sub_pel_filters_8, - vp9_sub_pel_filters_8s, - vp9_sub_pel_filters_8lp -}; -const int kNumFilterBanks = sizeof(kTestFilterList) / - sizeof(kTestFilterList[0]); +const int kNumFilterBanks = 4; const int kNumFilters = 16; TEST(ConvolveTest, FiltersWontSaturateWhenAddedPairwise) { for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) { - const int16_t (*filters)[8] = kTestFilterList[filter_bank]; + const InterpKernel *filters = + vp9_get_interp_kernel(static_cast<INTERP_FILTER>(filter_bank)); for (int i = 0; i < kNumFilters; i++) { const int p0 = filters[i][0] + filters[i][1]; const int p1 = filters[i][2] + filters[i][3]; @@ -345,8 +339,8 @@ TEST_P(ConvolveTest, MatchesReferenceSubpixelFilter) { for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) { - const int16_t (*filters)[8] = kTestFilterList[filter_bank]; - + const InterpKernel *filters = + vp9_get_interp_kernel(static_cast<INTERP_FILTER>(filter_bank)); for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) { for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) { filter_block2d_8_c(in, kInputStride, @@ -399,12 +393,9 @@ TEST_P(ConvolveTest, MatchesReferenceAveragingSubpixelFilter) { } } - const int kNumFilterBanks = sizeof(kTestFilterList) / - sizeof(kTestFilterList[0]); - for (int filter_bank = 0; filter_bank < kNumFilterBanks; ++filter_bank) { - const int16_t (*filters)[8] = kTestFilterList[filter_bank]; - const int kNumFilters = 16; + const InterpKernel *filters = + vp9_get_interp_kernel(static_cast<INTERP_FILTER>(filter_bank)); for (int filter_x = 0; filter_x < kNumFilters; ++filter_x) { for (int filter_y = 0; filter_y < kNumFilters; ++filter_y) { |