Index: source/libvpx/vp9/encoder/vp9_bitstream.c |
=================================================================== |
--- source/libvpx/vp9/encoder/vp9_bitstream.c (revision 251189) |
+++ source/libvpx/vp9/encoder/vp9_bitstream.c (working copy) |
@@ -33,11 +33,6 @@ |
#include "vp9/encoder/vp9_tokenize.h" |
#include "vp9/encoder/vp9_write_bit_buffer.h" |
- |
-#if defined(SECTIONBITS_OUTPUT) |
-unsigned __int64 Sectionbits[500]; |
-#endif |
- |
#ifdef ENTROPY_STATS |
vp9_coeff_stats tree_update_hist[TX_SIZES][PLANE_TYPES]; |
extern unsigned int active_section; |
@@ -109,13 +104,13 @@ |
} |
} |
-static int write_skip_coeff(const VP9_COMP *cpi, int segment_id, MODE_INFO *m, |
- vp9_writer *w) { |
+static int write_skip(const VP9_COMP *cpi, int segment_id, MODE_INFO *m, |
+ vp9_writer *w) { |
const MACROBLOCKD *const xd = &cpi->mb.e_mbd; |
if (vp9_segfeature_active(&cpi->common.seg, segment_id, SEG_LVL_SKIP)) { |
return 1; |
} else { |
- const int skip = m->mbmi.skip_coeff; |
+ const int skip = m->mbmi.skip; |
vp9_write(w, skip, vp9_get_skip_prob(&cpi->common, xd)); |
return skip; |
} |
@@ -124,8 +119,8 @@ |
void vp9_update_skip_probs(VP9_COMMON *cm, vp9_writer *w) { |
int k; |
- for (k = 0; k < MBSKIP_CONTEXTS; ++k) |
- vp9_cond_prob_diff_update(w, &cm->fc.mbskip_probs[k], cm->counts.mbskip[k]); |
+ for (k = 0; k < SKIP_CONTEXTS; ++k) |
+ vp9_cond_prob_diff_update(w, &cm->fc.skip_probs[k], cm->counts.skip[k]); |
} |
static void update_switchable_interp_probs(VP9_COMP *cpi, vp9_writer *w) { |
@@ -258,7 +253,7 @@ |
const MV_REFERENCE_FRAME sec_rf = mi->ref_frame[1]; |
const MB_PREDICTION_MODE mode = mi->mode; |
const int segment_id = mi->segment_id; |
- int skip_coeff; |
+ int skip; |
const BLOCK_SIZE bsize = mi->sb_type; |
const int allow_hp = cm->allow_high_precision_mv; |
@@ -278,14 +273,14 @@ |
} |
} |
- skip_coeff = write_skip_coeff(cpi, segment_id, m, bc); |
+ skip = write_skip(cpi, segment_id, m, bc); |
if (!vp9_segfeature_active(seg, segment_id, SEG_LVL_REF_FRAME)) |
vp9_write(bc, rf != INTRA_FRAME, vp9_get_intra_inter_prob(cm, xd)); |
if (bsize >= BLOCK_8X8 && cm->tx_mode == TX_MODE_SELECT && |
!(rf != INTRA_FRAME && |
- (skip_coeff || vp9_segfeature_active(seg, segment_id, SEG_LVL_SKIP)))) { |
+ (skip || vp9_segfeature_active(seg, segment_id, SEG_LVL_SKIP)))) { |
write_selected_tx_size(cpi, m, mi->tx_size, bsize, bc); |
} |
@@ -387,14 +382,14 @@ |
if (seg->update_map) |
write_segment_id(bc, seg, m->mbmi.segment_id); |
- write_skip_coeff(cpi, segment_id, m, bc); |
+ write_skip(cpi, segment_id, m, bc); |
if (m->mbmi.sb_type >= BLOCK_8X8 && cm->tx_mode == TX_MODE_SELECT) |
write_selected_tx_size(cpi, m, m->mbmi.tx_size, m->mbmi.sb_type, bc); |
if (m->mbmi.sb_type >= BLOCK_8X8) { |
- const MB_PREDICTION_MODE A = above_block_mode(m, above_mi, 0); |
- const MB_PREDICTION_MODE L = left_block_mode(m, left_mi, 0); |
+ const MB_PREDICTION_MODE A = vp9_above_block_mode(m, above_mi, 0); |
+ const MB_PREDICTION_MODE L = vp9_left_block_mode(m, left_mi, 0); |
write_intra_mode(bc, ym, vp9_kf_y_mode_prob[A][L]); |
} else { |
int idx, idy; |
@@ -403,8 +398,8 @@ |
for (idy = 0; idy < 2; idy += num_4x4_blocks_high) { |
for (idx = 0; idx < 2; idx += num_4x4_blocks_wide) { |
int i = idy * 2 + idx; |
- const MB_PREDICTION_MODE A = above_block_mode(m, above_mi, i); |
- const MB_PREDICTION_MODE L = left_block_mode(m, left_mi, i); |
+ const MB_PREDICTION_MODE A = vp9_above_block_mode(m, above_mi, i); |
+ const MB_PREDICTION_MODE L = vp9_left_block_mode(m, left_mi, i); |
const int bm = m->bmi[i].as_mode; |
write_intra_mode(bc, bm, vp9_kf_y_mode_prob[A][L]); |
} |