diff options
Diffstat (limited to 'test/wiener_test.cc')
| -rw-r--r-- | test/wiener_test.cc | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/test/wiener_test.cc b/test/wiener_test.cc index 69df5ea91..d44dd9253 100644 --- a/test/wiener_test.cc +++ b/test/wiener_test.cc @@ -10,6 +10,7 @@ */ #include <tuple> +#include <utility> #include <vector> #include "third_party/googletest/src/googletest/include/gtest/gtest.h" @@ -221,10 +222,12 @@ void WienerTest::RunWienerTest(const int32_t wiener_win, int32_t run_times) { // will always be multiples of 64 when called from non-test code. // If in future any new requirements are added, these lines will // need changing. - const int h_start = (rng_.Rand16() % (MAX_WIENER_BLOCK / 2)) & ~1; + int h_start = (rng_.Rand16() % (MAX_WIENER_BLOCK / 2)) & ~1; int h_end = run_times != 1 ? 256 : (rng_.Rand16() % MAX_WIENER_BLOCK); - const int v_start = rng_.Rand16() % (MAX_WIENER_BLOCK / 2); + if (h_start > h_end) std::swap(h_start, h_end); + int v_start = rng_.Rand16() % (MAX_WIENER_BLOCK / 2); int v_end = run_times != 1 ? 256 : (rng_.Rand16() % MAX_WIENER_BLOCK); + if (v_start > v_end) std::swap(v_start, v_end); const int dgd_stride = h_end; const int src_stride = MAX_DATA_BLOCK; const int iters = run_times == 1 ? kIterations : 2; @@ -551,10 +554,12 @@ void WienerTestHighbd::RunWienerTest(const int32_t wiener_win, // will always be multiples of 64 when called from non-test code. // If in future any new requirements are added, these lines will // need changing. - const int h_start = (rng_.Rand16() % (MAX_WIENER_BLOCK / 2)) & ~1; + int h_start = (rng_.Rand16() % (MAX_WIENER_BLOCK / 2)) & ~1; int h_end = run_times != 1 ? 256 : (rng_.Rand16() % MAX_WIENER_BLOCK); - const int v_start = rng_.Rand16() % (MAX_WIENER_BLOCK / 2); + if (h_start > h_end) std::swap(h_start, h_end); + int v_start = rng_.Rand16() % (MAX_WIENER_BLOCK / 2); int v_end = run_times != 1 ? 256 : (rng_.Rand16() % MAX_WIENER_BLOCK); + if (v_start > v_end) std::swap(v_start, v_end); const int dgd_stride = h_end; const int src_stride = MAX_DATA_BLOCK; const int iters = run_times == 1 ? kIterations : 2; |