diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-02 18:21:55 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-04-02 18:21:55 -0700 |
| commit | dca8ad178c41ccb185c0240281f4096726359689 (patch) | |
| tree | 61f3c8ad8de4c489e0197bab080f6aa0b543fd99 /vp9/encoder/vp9_bitstream.c | |
| parent | 42db454c7f99ad97d834edb231b94172d4f29b97 (diff) | |
| download | libvpx-dca8ad178c41ccb185c0240281f4096726359689.tar libvpx-dca8ad178c41ccb185c0240281f4096726359689.tar.gz libvpx-dca8ad178c41ccb185c0240281f4096726359689.tar.bz2 libvpx-dca8ad178c41ccb185c0240281f4096726359689.zip | |
Renaming sb32_coded and sb64_coded fields.
Renaming sb32_coded to prob_sb32_coded and sb64_coded to prob_sb64_coded.
Change-Id: I6de5cad00a57c3e066d53467f8c38cb6073dce11
Diffstat (limited to 'vp9/encoder/vp9_bitstream.c')
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 18fc45e7d..d12f39dff 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1690,7 +1690,7 @@ static void write_modes(VP9_COMP *cpi, vp9_writer* const bc, m = m_ptr; for (mb_col = c->cur_tile_mb_col_start; mb_col < c->cur_tile_mb_col_end; mb_col += 4, m += 4) { - vp9_write(bc, m->mbmi.sb_type == BLOCK_SIZE_SB64X64, c->sb64_coded); + vp9_write(bc, m->mbmi.sb_type == BLOCK_SIZE_SB64X64, c->prob_sb64_coded); if (m->mbmi.sb_type == BLOCK_SIZE_SB64X64) { write_modes_b(cpi, m, bc, tok, tok_end, mb_row, mb_col); } else { @@ -1704,7 +1704,7 @@ static void write_modes(VP9_COMP *cpi, vp9_writer* const bc, mb_row + y_idx_sb >= c->mb_rows) continue; - vp9_write(bc, sb_m->mbmi.sb_type, c->sb32_coded); + vp9_write(bc, sb_m->mbmi.sb_type, c->prob_sb32_coded); if (sb_m->mbmi.sb_type) { assert(sb_m->mbmi.sb_type == BLOCK_SIZE_SB32X32); write_modes_b(cpi, sb_m, bc, tok, tok_end, @@ -2494,10 +2494,10 @@ void vp9_pack_bitstream(VP9_COMP *cpi, unsigned char *dest, } } - pc->sb64_coded = get_binary_prob(cpi->sb64_count[0], cpi->sb64_count[1]); - vp9_write_literal(&header_bc, pc->sb64_coded, 8); - pc->sb32_coded = get_binary_prob(cpi->sb32_count[0], cpi->sb32_count[1]); - vp9_write_literal(&header_bc, pc->sb32_coded, 8); + pc->prob_sb64_coded = get_binary_prob(cpi->sb64_count[0], cpi->sb64_count[1]); + vp9_write_literal(&header_bc, pc->prob_sb64_coded, 8); + pc->prob_sb32_coded = get_binary_prob(cpi->sb32_count[0], cpi->sb32_count[1]); + vp9_write_literal(&header_bc, pc->prob_sb32_coded, 8); vp9_write_bit(&header_bc, cpi->mb.e_mbd.lossless); if (cpi->mb.e_mbd.lossless) { |