diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-21 16:48:34 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-21 16:48:34 -0800 |
| commit | 5925ba08a33cafceb0a2d21ca6d30923dc58f372 (patch) | |
| tree | 3e803d3144dcd275c19b9a430649a0effc818ef8 | |
| parent | ad3333e2cd9ecfcf13a96ef4a176df50bbbba2bf (diff) | |
| parent | 27e6b5b6bd26ee0e9bd4c7f6a56dc2fa885be6f8 (diff) | |
| download | libvpx-5925ba08a33cafceb0a2d21ca6d30923dc58f372.tar libvpx-5925ba08a33cafceb0a2d21ca6d30923dc58f372.tar.gz libvpx-5925ba08a33cafceb0a2d21ca6d30923dc58f372.tar.bz2 libvpx-5925ba08a33cafceb0a2d21ca6d30923dc58f372.zip | |
Merge "Using num_4x4_blocks_* instead of b_{width, height}_log2."
| -rw-r--r-- | test/vp9_subtract_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/vp9_subtract_test.cc b/test/vp9_subtract_test.cc index 332a83992..e4c4cfeff 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 *>( |