diff options
| author | James Zern <jzern@google.com> | 2014-11-18 19:27:06 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-11-19 19:18:25 -0800 |
| commit | 16d269697817f61e35a712e174d8607d166175f2 (patch) | |
| tree | 02af16e8d8ab0a082743ef34cf5c37b5201492db /test | |
| parent | 21db24efcb9978244a5c10e70ce74f7ffcb04444 (diff) | |
| download | libvpx-16d269697817f61e35a712e174d8607d166175f2.tar libvpx-16d269697817f61e35a712e174d8607d166175f2.tar.gz libvpx-16d269697817f61e35a712e174d8607d166175f2.tar.bz2 libvpx-16d269697817f61e35a712e174d8607d166175f2.zip | |
sad_test: fix vp8-only build
ROUND_POWER_OF_TWO() is defined in vp9 headers currently, avoid it in
non-high-bitdepth code
Change-Id: Ic28b8f95ef7964800475ee8b35be5f9cea9afab6
Diffstat (limited to 'test')
| -rw-r--r-- | test/sad_test.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/sad_test.cc b/test/sad_test.cc index 615aad469..114f0afa9 100644 --- a/test/sad_test.cc +++ b/test/sad_test.cc @@ -234,7 +234,7 @@ class SADTestBase : public ::testing::Test { #else const int tmp = second_pred[h * width_ + w] + reference[h * reference_stride_ + w]; - const uint8_t comp_pred = ROUND_POWER_OF_TWO(tmp, 1); + const uint8_t comp_pred = (tmp + 1) >> 1; sad += abs(source[h * source_stride_ + w] - comp_pred); #endif } |