From: Dmitry Kovalev <dkovalev@google.com>
Date: Thu, 21 Nov 2013 23:53:06 +0000 (-0800)
Subject: Using num_4x4_blocks_* instead of b_{width, height}_log2.
X-Git-Tag: v1.4.0~2974^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=27e6b5b6bd26ee0e9bd4c7f6a56dc2fa885be6f8;p=platform%2Fupstream%2Flibvpx.git

Using num_4x4_blocks_* instead of b_{width, height}_log2.

Change-Id: I9ea3946c17b19f511565cd771037abe7db8b3ddb
---

diff --git a/test/vp9_subtract_test.cc b/test/vp9_subtract_test.cc
index 332a839..e4c4cfe 100644
--- a/test/vp9_subtract_test.cc
+++ b/test/vp9_subtract_test.cc
@@ -41,8 +41,8 @@ TEST_P(VP9SubtractBlockTest, SimpleSubtract) {
   // FIXME(rbultje) split in its own file
   for (BLOCK_SIZE bsize = BLOCK_4X4; bsize < BLOCK_SIZES;
        bsize = static_cast<BLOCK_SIZE>(static_cast<int>(bsize) + 1)) {
-    const int block_width  = 4 << b_width_log2(bsize);
-    const int block_height = 4 << b_height_log2(bsize);
+    const int block_width = 4 * num_4x4_blocks_wide_lookup[bsize];
+    const int block_height = 4 * num_4x4_blocks_high_lookup[bsize];
     int16_t *diff = reinterpret_cast<int16_t *>(
         vpx_memalign(16, sizeof(*diff) * block_width * block_height * 2));
     uint8_t *pred = reinterpret_cast<uint8_t *>(