diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-06 13:34:23 -0800 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-11-06 13:34:23 -0800 |
| commit | 7b011c54673eed1bf9fd7a206df5dfaf83ef30ac (patch) | |
| tree | 6539f8cc7b53435dd60b16ee8e164856c7a9f430 /vp9/decoder/vp9_decodemv.c | |
| parent | 2f4bade348e615fbda18dcbe369cd82e0e1c3615 (diff) | |
| download | libvpx-7b011c54673eed1bf9fd7a206df5dfaf83ef30ac.tar libvpx-7b011c54673eed1bf9fd7a206df5dfaf83ef30ac.tar.gz libvpx-7b011c54673eed1bf9fd7a206df5dfaf83ef30ac.tar.bz2 libvpx-7b011c54673eed1bf9fd7a206df5dfaf83ef30ac.zip | |
Replacing mi_{width,height}_log2 with num_8x8_blocks_{wide,high}_lookup.
Change-Id: I04c55daef89bca2b85cb7db0850f9b052abc5a7c
Diffstat (limited to 'vp9/decoder/vp9_decodemv.c')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index 1ca578621..9792d2c6d 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -91,8 +91,8 @@ static TX_SIZE read_tx_size(VP9_COMMON *const cm, MACROBLOCKD *const xd, static void set_segment_id(VP9_COMMON *cm, BLOCK_SIZE bsize, int mi_row, int mi_col, int segment_id) { const int mi_offset = mi_row * cm->mi_cols + mi_col; - const int bw = 1 << mi_width_log2(bsize); - const int bh = 1 << mi_height_log2(bsize); + const int bw = num_8x8_blocks_wide_lookup[bsize]; + const int bh = num_8x8_blocks_high_lookup[bsize]; const int xmis = MIN(cm->mi_cols - mi_col, bw); const int ymis = MIN(cm->mi_rows - mi_row, bh); int x, y; @@ -550,8 +550,8 @@ void vp9_read_mode_info(VP9_COMMON *cm, MACROBLOCKD *xd, int mi_row, int mi_col, vp9_reader *r) { MODE_INFO *const mi = xd->mi_8x8[0]; const BLOCK_SIZE bsize = mi->mbmi.sb_type; - const int bw = 1 << mi_width_log2(bsize); - const int bh = 1 << mi_height_log2(bsize); + const int bw = num_8x8_blocks_wide_lookup[bsize]; + const int bh = num_8x8_blocks_high_lookup[bsize]; const int y_mis = MIN(bh, cm->mi_rows - mi_row); const int x_mis = MIN(bw, cm->mi_cols - mi_col); int x, y, z; |