diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-04-10 16:50:01 -0700 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2013-04-10 17:38:57 -0700 |
| commit | 8fb5be48a600bc75ee0e0b720c3ffe680d11db53 (patch) | |
| tree | 6c76cc48f6bb05c895c854a622cad8592e25055a /vp9/encoder/vp9_bitstream.c | |
| parent | b4f6098ef772e381c174581eca324e9d9ff1b87e (diff) | |
| download | libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.tar libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.tar.gz libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.tar.bz2 libvpx-8fb5be48a600bc75ee0e0b720c3ffe680d11db53.zip | |
Make usage of sb_type independent of literal values.
Change-Id: I0d12f9ef9d960df0172a1377f8e5236eb6d90492
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 7fc33c00c..b43288449 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -763,7 +763,8 @@ static void pack_inter_mode_mvs(VP9_COMP *cpi, MODE_INFO *m, const MV_REFERENCE_FRAME rf = mi->ref_frame; const MB_PREDICTION_MODE mode = mi->mode; const int segment_id = mi->segment_id; - const int mb_size = 1 << mi->sb_type; + const int bw = 1 << mb_width_log2(mi->sb_type); + const int bh = 1 << mb_height_log2(mi->sb_type); int skip_coeff; int mb_row = pc->mb_rows - mb_rows_left; @@ -775,8 +776,8 @@ static void pack_inter_mode_mvs(VP9_COMP *cpi, MODE_INFO *m, // These specified to 8th pel as they are always compared to MV // values that are in 1/8th pel units - set_mb_row(pc, xd, mb_row, mb_size); - set_mb_col(pc, xd, mb_col, mb_size); + set_mb_row(pc, xd, mb_row, bh); + set_mb_col(pc, xd, mb_col, bw); #ifdef ENTROPY_STATS active_section = 9; @@ -1002,7 +1003,7 @@ static void pack_inter_mode_mvs(VP9_COMP *cpi, MODE_INFO *m, vp9_write(bc, sz != TX_4X4, pc->prob_tx[0]); if (sz != TX_4X4 && mode != I8X8_PRED && mode != SPLITMV) { vp9_write(bc, sz != TX_8X8, pc->prob_tx[1]); - if (mi->sb_type && sz != TX_8X8) + if (mi->sb_type >= BLOCK_SIZE_SB32X32 && sz != TX_8X8) vp9_write(bc, sz != TX_16X16, pc->prob_tx[2]); } } @@ -1080,7 +1081,7 @@ static void write_mb_modes_kf(const VP9_COMP *cpi, vp9_write(bc, sz != TX_4X4, c->prob_tx[0]); if (sz != TX_4X4 && ym <= TM_PRED) { vp9_write(bc, sz != TX_8X8, c->prob_tx[1]); - if (m->mbmi.sb_type && sz != TX_8X8) + if (m->mbmi.sb_type >= BLOCK_SIZE_SB32X32 && sz != TX_8X8) vp9_write(bc, sz != TX_16X16, c->prob_tx[2]); } } @@ -1649,8 +1650,8 @@ static void write_modes_b(VP9_COMP *cpi, MODE_INFO *m, vp9_writer *bc, MACROBLOCKD *const xd = &cpi->mb.e_mbd; xd->mode_info_context = m; - set_mb_row(&cpi->common, xd, mb_row, (1 << m->mbmi.sb_type)); - set_mb_col(&cpi->common, xd, mb_col, (1 << m->mbmi.sb_type)); + set_mb_row(&cpi->common, xd, mb_row, 1 << mb_height_log2(m->mbmi.sb_type)); + set_mb_col(&cpi->common, xd, mb_col, 1 << mb_width_log2(m->mbmi.sb_type)); if (cm->frame_type == KEY_FRAME) { write_mb_modes_kf(cpi, m, bc, cm->mb_rows - mb_row, cm->mb_cols - mb_col); |