From: James Zern <jzern@google.com>
Date: Wed, 19 Nov 2014 03:27:06 +0000 (-0800)
Subject: sad_test: fix vp8-only build
X-Git-Tag: v1.4.0~484^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=16d269697817f61e35a712e174d8607d166175f2;p=libvpx

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
---

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
       }