diff options
| author | Yaowu Xu <yaowu@google.com> | 2013-04-19 16:28:20 -0700 |
|---|---|---|
| committer | Yaowu Xu <yaowu@google.com> | 2013-04-24 15:58:03 -0700 |
| commit | bcf82cf503ed8c1c4db16d1200beb879434b5de7 (patch) | |
| tree | f3c495f62e441fe78871e8a16ff4e4d1ad74278d /vp9/encoder/vp9_bitstream.c | |
| parent | a2d46434b55dd9ded71b4c7b3560ce7964962bb0 (diff) | |
| download | libvpx-bcf82cf503ed8c1c4db16d1200beb879434b5de7.tar libvpx-bcf82cf503ed8c1c4db16d1200beb879434b5de7.tar.gz libvpx-bcf82cf503ed8c1c4db16d1200beb879434b5de7.tar.bz2 libvpx-bcf82cf503ed8c1c4db16d1200beb879434b5de7.zip | |
Merge two similar functions into one
Function set_mb_row() and set_mb_col() do similar work and are always
called together, this commit merged them into a single function for
clarity and easy maintainence. This was a TODO item.
Change-Id: I956bd9ed6afb8b2b0469b20fd8bc893b26f8a0f3
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 978fdcdfe..df58a9113 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -710,8 +710,7 @@ 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, bh); - set_mb_col(pc, xd, mb_col, bw); + set_mb_row_col(pc, xd, mb_row, bh, mb_col, bw); #ifdef ENTROPY_STATS active_section = 9; @@ -1151,8 +1150,9 @@ 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 << mb_height_log2(m->mbmi.sb_type)); - set_mb_col(&cpi->common, xd, mb_col, 1 << mb_width_log2(m->mbmi.sb_type)); + set_mb_row_col(&cpi->common, xd, mb_row, + 1 << mb_height_log2(m->mbmi.sb_type), + 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); |