diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-12-06 14:19:59 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-12-06 14:19:59 -0800 |
| commit | af04bfa3006518533f2c3919d842dde77bd541de (patch) | |
| tree | 29819e766de9663be4dbb7a5ae84f24765c240d8 /vp9 | |
| parent | 18744fe3ab26abbafc501e02e7ea9a5ce5a5e976 (diff) | |
| parent | 52618d28e16f2d2ec8cffc157155b4316b6c13db (diff) | |
| download | libvpx-af04bfa3006518533f2c3919d842dde77bd541de.tar libvpx-af04bfa3006518533f2c3919d842dde77bd541de.tar.gz libvpx-af04bfa3006518533f2c3919d842dde77bd541de.tar.bz2 libvpx-af04bfa3006518533f2c3919d842dde77bd541de.zip | |
Merge "Replacing b_width_log2 with num_4x4_blocks_wide_lookup."
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_rdopt.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_rdopt.c b/vp9/encoder/vp9_rdopt.c index d7aabf8e7..85cb443c9 100644 --- a/vp9/encoder/vp9_rdopt.c +++ b/vp9/encoder/vp9_rdopt.c @@ -122,7 +122,7 @@ static int raster_block_offset(BLOCK_SIZE plane_bsize, } static int16_t* raster_block_offset_int16(BLOCK_SIZE plane_bsize, int raster_block, int16_t *base) { - const int stride = 4 << b_width_log2(plane_bsize); + const int stride = 4 * num_4x4_blocks_wide_lookup[plane_bsize]; return base + raster_block_offset(plane_bsize, raster_block, stride); } @@ -2452,7 +2452,8 @@ static void joint_motion_search(VP9_COMP *cpi, MACROBLOCK *x, int mi_row, int mi_col, int_mv single_newmv[MAX_REF_FRAMES], int *rate_mv) { - int pw = 4 << b_width_log2(bsize), ph = 4 << b_height_log2(bsize); + const int pw = 4 * num_4x4_blocks_wide_lookup[bsize]; + const int ph = 4 * num_4x4_blocks_high_lookup[bsize]; MACROBLOCKD *xd = &x->e_mbd; MB_MODE_INFO *mbmi = &xd->mi_8x8[0]->mbmi; const int refs[2] = { mbmi->ref_frame[0], |