diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-11-06 14:18:33 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-11-06 14:18:33 -0800 |
| commit | bfdfeb62a738d07df155e8514eedb70403cd29af (patch) | |
| tree | 4a776535439d893ba52b6537489bdccd5ba76f19 /vp9/encoder | |
| parent | 00adebd184975c5af9da638d09557e45aeed55ad (diff) | |
| parent | 7b011c54673eed1bf9fd7a206df5dfaf83ef30ac (diff) | |
| download | libvpx-bfdfeb62a738d07df155e8514eedb70403cd29af.tar libvpx-bfdfeb62a738d07df155e8514eedb70403cd29af.tar.gz libvpx-bfdfeb62a738d07df155e8514eedb70403cd29af.tar.bz2 libvpx-bfdfeb62a738d07df155e8514eedb70403cd29af.zip | |
Merge "Replacing mi_{width,height}_log2 with num_8x8_blocks_{wide,high}_lookup."
Diffstat (limited to 'vp9/encoder')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_firstpass.c | 4 | ||||
| -rw-r--r-- | vp9/encoder/vp9_vaq.c | 4 |
3 files changed, 6 insertions, 5 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 86332bcf9..a45299b59 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1490,7 +1490,8 @@ static void rd_pick_partition(VP9_COMP *cpi, const TileInfo *const tile, return; } } - assert(mi_height_log2(bsize) == mi_width_log2(bsize)); + assert(num_8x8_blocks_wide_lookup[bsize] == + num_8x8_blocks_high_lookup[bsize]); if (bsize == BLOCK_16X16) { set_offsets(cpi, tile, mi_row, mi_col, bsize); diff --git a/vp9/encoder/vp9_firstpass.c b/vp9/encoder/vp9_firstpass.c index c3dbc861d..6a3555d68 100644 --- a/vp9/encoder/vp9_firstpass.c +++ b/vp9/encoder/vp9_firstpass.c @@ -584,9 +584,9 @@ void vp9_first_pass(VP9_COMP *cpi) { xd->mi_8x8[0]->mbmi.ref_frame[0] = INTRA_FRAME; set_mi_row_col(xd, &tile, mb_row << 1, - 1 << mi_height_log2(xd->mi_8x8[0]->mbmi.sb_type), + num_8x8_blocks_high_lookup[xd->mi_8x8[0]->mbmi.sb_type], mb_col << 1, - 1 << mi_width_log2(xd->mi_8x8[0]->mbmi.sb_type), + num_8x8_blocks_wide_lookup[xd->mi_8x8[0]->mbmi.sb_type], cm->mi_rows, cm->mi_cols); if (cpi->sf.variance_adaptive_quantization) { diff --git a/vp9/encoder/vp9_vaq.c b/vp9/encoder/vp9_vaq.c index 3179ae301..1f9cb8709 100644 --- a/vp9/encoder/vp9_vaq.c +++ b/vp9/encoder/vp9_vaq.c @@ -118,8 +118,8 @@ static unsigned int block_variance(VP9_COMP *cpi, MACROBLOCK *x, ((-xd->mb_to_bottom_edge) >> 3) : 0; if (right_overflow || bottom_overflow) { - int bw = (1 << (mi_width_log2(bs) + 3)) - right_overflow; - int bh = (1 << (mi_height_log2(bs) + 3)) - bottom_overflow; + const int bw = 8 * num_8x8_blocks_wide_lookup[bs] - right_overflow; + const int bh = 8 * num_8x8_blocks_high_lookup[bs] - bottom_overflow; int avg; variance(x->plane[0].src.buf, x->plane[0].src.stride, vp9_64_zeros, 0, bw, bh, &sse, &avg); |