Commit 8b71b8a6 authored by John Koleszar's avatar John Koleszar Committed by Gerrit Code Review
Browse files

Merge "Renaming sb32_coded and sb64_coded fields." into experimental

parents dc12e6c0 dca8ad17
...@@ -271,8 +271,8 @@ typedef struct VP9Common { ...@@ -271,8 +271,8 @@ typedef struct VP9Common {
vp9_prob prob_intra_coded; vp9_prob prob_intra_coded;
vp9_prob prob_last_coded; vp9_prob prob_last_coded;
vp9_prob prob_gf_coded; vp9_prob prob_gf_coded;
vp9_prob sb32_coded; vp9_prob prob_sb32_coded;
vp9_prob sb64_coded; vp9_prob prob_sb64_coded;
// Context probabilities when using predictive coding of segment id // Context probabilities when using predictive coding of segment id
vp9_prob segment_pred_probs[PREDICTION_PROBS]; vp9_prob segment_pred_probs[PREDICTION_PROBS];
......
...@@ -992,7 +992,7 @@ static void decode_sb_row(VP9D_COMP *pbi, VP9_COMMON *pc, ...@@ -992,7 +992,7 @@ static void decode_sb_row(VP9D_COMP *pbi, VP9_COMMON *pc,
for (mb_col = pc->cur_tile_mb_col_start; for (mb_col = pc->cur_tile_mb_col_start;
mb_col < pc->cur_tile_mb_col_end; mb_col += 4) { mb_col < pc->cur_tile_mb_col_end; mb_col += 4) {
if (vp9_read(bc, pc->sb64_coded)) { if (vp9_read(bc, pc->prob_sb64_coded)) {
#ifdef DEC_DEBUG #ifdef DEC_DEBUG
dec_debug = (pc->current_video_frame == 11 && pc->show_frame && dec_debug = (pc->current_video_frame == 11 && pc->show_frame &&
mb_row == 8 && mb_col == 0); mb_row == 8 && mb_col == 0);
...@@ -1018,7 +1018,7 @@ static void decode_sb_row(VP9D_COMP *pbi, VP9_COMMON *pc, ...@@ -1018,7 +1018,7 @@ static void decode_sb_row(VP9D_COMP *pbi, VP9_COMMON *pc,
xd->sb_index = j; xd->sb_index = j;
if (vp9_read(bc, pc->sb32_coded)) { if (vp9_read(bc, pc->prob_sb32_coded)) {
#ifdef DEC_DEBUG #ifdef DEC_DEBUG
dec_debug = (pc->current_video_frame == 11 && pc->show_frame && dec_debug = (pc->current_video_frame == 11 && pc->show_frame &&
mb_row + y_idx_sb == 8 && mb_col + x_idx_sb == 0); mb_row + y_idx_sb == 8 && mb_col + x_idx_sb == 0);
...@@ -1696,8 +1696,8 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) { ...@@ -1696,8 +1696,8 @@ int vp9_decode_frame(VP9D_COMP *pbi, const uint8_t **p_data_end) {
} }
} }
pc->sb64_coded = vp9_read_prob(&header_bc); pc->prob_sb64_coded = vp9_read_prob(&header_bc);
pc->sb32_coded = vp9_read_prob(&header_bc); pc->prob_sb32_coded = vp9_read_prob(&header_bc);
xd->lossless = vp9_read_bit(&header_bc); xd->lossless = vp9_read_bit(&header_bc);
if (xd->lossless) { if (xd->lossless) {
pc->txfm_mode = ONLY_4X4; pc->txfm_mode = ONLY_4X4;
......
...@@ -1690,7 +1690,7 @@ static void write_modes(VP9_COMP *cpi, vp9_writer* const bc, ...@@ -1690,7 +1690,7 @@ static void write_modes(VP9_COMP *cpi, vp9_writer* const bc,
m = m_ptr; m = m_ptr;
for (mb_col = c->cur_tile_mb_col_start; for (mb_col = c->cur_tile_mb_col_start;
mb_col < c->cur_tile_mb_col_end; mb_col += 4, m += 4) { 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) { if (m->mbmi.sb_type == BLOCK_SIZE_SB64X64) {
write_modes_b(cpi, m, bc, tok, tok_end, mb_row, mb_col); write_modes_b(cpi, m, bc, tok, tok_end, mb_row, mb_col);
} else { } else {
...@@ -1704,7 +1704,7 @@ static void write_modes(VP9_COMP *cpi, vp9_writer* const bc, ...@@ -1704,7 +1704,7 @@ static void write_modes(VP9_COMP *cpi, vp9_writer* const bc,
mb_row + y_idx_sb >= c->mb_rows) mb_row + y_idx_sb >= c->mb_rows)
continue; 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) { if (sb_m->mbmi.sb_type) {
assert(sb_m->mbmi.sb_type == BLOCK_SIZE_SB32X32); assert(sb_m->mbmi.sb_type == BLOCK_SIZE_SB32X32);
write_modes_b(cpi, sb_m, bc, tok, tok_end, write_modes_b(cpi, sb_m, bc, tok, tok_end,
...@@ -2494,10 +2494,10 @@ void vp9_pack_bitstream(VP9_COMP *cpi, unsigned char *dest, ...@@ -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]); pc->prob_sb64_coded = get_binary_prob(cpi->sb64_count[0], cpi->sb64_count[1]);
vp9_write_literal(&header_bc, pc->sb64_coded, 8); vp9_write_literal(&header_bc, pc->prob_sb64_coded, 8);
pc->sb32_coded = get_binary_prob(cpi->sb32_count[0], cpi->sb32_count[1]); pc->prob_sb32_coded = get_binary_prob(cpi->sb32_count[0], cpi->sb32_count[1]);
vp9_write_literal(&header_bc, pc->sb32_coded, 8); vp9_write_literal(&header_bc, pc->prob_sb32_coded, 8);
vp9_write_bit(&header_bc, cpi->mb.e_mbd.lossless); vp9_write_bit(&header_bc, cpi->mb.e_mbd.lossless);
if (cpi->mb.e_mbd.lossless) { if (cpi->mb.e_mbd.lossless) {
......
...@@ -1086,7 +1086,7 @@ static void encode_sb_row(VP9_COMP *cpi, ...@@ -1086,7 +1086,7 @@ static void encode_sb_row(VP9_COMP *cpi,
splitmodes_used = pick_mb_modes(cpi, mb_row + y_idx, mb_col + x_idx, splitmodes_used = pick_mb_modes(cpi, mb_row + y_idx, mb_col + x_idx,
tp, &mb_rate, &mb_dist); tp, &mb_rate, &mb_dist);
mb_rate += vp9_cost_bit(cm->sb32_coded, 0); mb_rate += vp9_cost_bit(cm->prob_sb32_coded, 0);
if (cpi->sf.splitmode_breakout) { if (cpi->sf.splitmode_breakout) {
sb32_skip = splitmodes_used; sb32_skip = splitmodes_used;
...@@ -1099,7 +1099,7 @@ static void encode_sb_row(VP9_COMP *cpi, ...@@ -1099,7 +1099,7 @@ static void encode_sb_row(VP9_COMP *cpi,
/* Pick a mode assuming that it applies to all 4 of the MBs in the SB */ /* Pick a mode assuming that it applies to all 4 of the MBs in the SB */
pick_sb_modes(cpi, mb_row + y_idx, mb_col + x_idx, pick_sb_modes(cpi, mb_row + y_idx, mb_col + x_idx,
tp, &sb_rate, &sb_dist); tp, &sb_rate, &sb_dist);
sb_rate += vp9_cost_bit(cm->sb32_coded, 1); sb_rate += vp9_cost_bit(cm->prob_sb32_coded, 1);
} }
/* Decide whether to encode as a SB or 4xMBs */ /* Decide whether to encode as a SB or 4xMBs */
...@@ -1131,13 +1131,13 @@ static void encode_sb_row(VP9_COMP *cpi, ...@@ -1131,13 +1131,13 @@ static void encode_sb_row(VP9_COMP *cpi,
memcpy(cm->above_context + mb_col, &a, sizeof(a)); memcpy(cm->above_context + mb_col, &a, sizeof(a));
memcpy(cm->left_context, &l, sizeof(l)); memcpy(cm->left_context, &l, sizeof(l));
sb32_rate += vp9_cost_bit(cm->sb64_coded, 0); sb32_rate += vp9_cost_bit(cm->prob_sb64_coded, 0);
if (!sb64_skip && if (!sb64_skip &&
!(((cm->mb_cols & 3) && mb_col + 3 >= cm->mb_cols) || !(((cm->mb_cols & 3) && mb_col + 3 >= cm->mb_cols) ||
((cm->mb_rows & 3) && mb_row + 3 >= cm->mb_rows))) { ((cm->mb_rows & 3) && mb_row + 3 >= cm->mb_rows))) {
pick_sb64_modes(cpi, mb_row, mb_col, tp, &sb64_rate, &sb64_dist); pick_sb64_modes(cpi, mb_row, mb_col, tp, &sb64_rate, &sb64_dist);
sb64_rate += vp9_cost_bit(cm->sb64_coded, 1); sb64_rate += vp9_cost_bit(cm->prob_sb64_coded, 1);
} }
/* Decide whether to encode as a SB or 4xMBs */ /* Decide whether to encode as a SB or 4xMBs */
......
...@@ -1374,8 +1374,8 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) { ...@@ -1374,8 +1374,8 @@ VP9_PTR vp9_create_compressor(VP9_CONFIG *oxcf) {
cm->prob_last_coded = 128; cm->prob_last_coded = 128;
cm->prob_gf_coded = 128; cm->prob_gf_coded = 128;
cm->prob_intra_coded = 63; cm->prob_intra_coded = 63;
cm->sb32_coded = 200; cm->prob_sb32_coded = 200;
cm->sb64_coded = 200; cm->prob_sb64_coded = 200;
for (i = 0; i < COMP_PRED_CONTEXTS; i++) for (i = 0; i < COMP_PRED_CONTEXTS; i++)
cm->prob_comppred[i] = 128; cm->prob_comppred[i] = 128;
for (i = 0; i < TX_SIZE_MAX_SB - 1; i++) for (i = 0; i < TX_SIZE_MAX_SB - 1; i++)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment