diff options
| -rw-r--r-- | vp9/encoder/vp9_bitstream.c | 8 | ||||
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 22 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_if.c | 3 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 3 |
4 files changed, 15 insertions, 21 deletions
diff --git a/vp9/encoder/vp9_bitstream.c b/vp9/encoder/vp9_bitstream.c index 88e25ebf2..547ad52f6 100644 --- a/vp9/encoder/vp9_bitstream.c +++ b/vp9/encoder/vp9_bitstream.c @@ -1256,23 +1256,23 @@ static size_t write_compressed_header(VP9_COMP *cpi, uint8_t *data) { if (use_hybrid_pred) for (i = 0; i < COMP_INTER_CONTEXTS; i++) vp9_cond_prob_diff_update(&header_bc, &fc->comp_inter_prob[i], - cpi->comp_inter_count[i]); + cm->counts.comp_inter[i]); } } if (cm->reference_mode != COMPOUND_REFERENCE) { for (i = 0; i < REF_CONTEXTS; i++) { vp9_cond_prob_diff_update(&header_bc, &fc->single_ref_prob[i][0], - cpi->single_ref_count[i][0]); + cm->counts.single_ref[i][0]); vp9_cond_prob_diff_update(&header_bc, &fc->single_ref_prob[i][1], - cpi->single_ref_count[i][1]); + cm->counts.single_ref[i][1]); } } if (cm->reference_mode != SINGLE_REFERENCE) for (i = 0; i < REF_CONTEXTS; i++) vp9_cond_prob_diff_update(&header_bc, &fc->comp_ref_prob[i], - cpi->comp_ref_count[i]); + cm->counts.comp_ref[i]); for (i = 0; i < BLOCK_SIZE_GROUPS; ++i) prob_diff_update(vp9_intra_mode_tree, cm->fc.y_mode_prob[i], diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 1c86b0ece..4ddbd9067 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -762,17 +762,17 @@ static void update_stats(VP9_COMP *cpi) { // the reference frame counts used to work out probabilities. if (is_inter_block(mbmi) && !seg_ref_active) { if (cm->reference_mode == REFERENCE_MODE_SELECT) - cpi->comp_inter_count[vp9_get_reference_mode_context(cm, xd)] + cm->counts.comp_inter[vp9_get_reference_mode_context(cm, xd)] [has_second_ref(mbmi)]++; if (has_second_ref(mbmi)) { - cpi->comp_ref_count[vp9_get_pred_context_comp_ref_p(cm, xd)] + cm->counts.comp_ref[vp9_get_pred_context_comp_ref_p(cm, xd)] [mbmi->ref_frame[0] == GOLDEN_FRAME]++; } else { - cpi->single_ref_count[vp9_get_pred_context_single_ref_p1(xd)][0] + cm->counts.single_ref[vp9_get_pred_context_single_ref_p1(xd)][0] [mbmi->ref_frame[0] != LAST_FRAME]++; if (mbmi->ref_frame[0] != LAST_FRAME) - cpi->single_ref_count[vp9_get_pred_context_single_ref_p2(xd)][1] + cm->counts.single_ref[vp9_get_pred_context_single_ref_p2(xd)][1] [mbmi->ref_frame[0] != GOLDEN_FRAME]++; } } @@ -2011,9 +2011,9 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) { vp9_zero(cm->counts.inter_mode); vp9_zero(cm->counts.partition); vp9_zero(cpi->intra_inter_count); - vp9_zero(cpi->comp_inter_count); - vp9_zero(cpi->single_ref_count); - vp9_zero(cpi->comp_ref_count); + vp9_zero(cm->counts.comp_inter); + vp9_zero(cm->counts.single_ref); + vp9_zero(cm->counts.comp_ref); vp9_zero(cm->counts.tx); vp9_zero(cm->counts.mbskip); @@ -2431,16 +2431,16 @@ void vp9_encode_frame(VP9_COMP *cpi) { int comp_count_zero = 0; for (i = 0; i < COMP_INTER_CONTEXTS; i++) { - single_count_zero += cpi->comp_inter_count[i][0]; - comp_count_zero += cpi->comp_inter_count[i][1]; + single_count_zero += cm->counts.comp_inter[i][0]; + comp_count_zero += cm->counts.comp_inter[i][1]; } if (comp_count_zero == 0) { cpi->common.reference_mode = SINGLE_REFERENCE; - vp9_zero(cpi->comp_inter_count); + vp9_zero(cm->counts.comp_inter); } else if (single_count_zero == 0) { cpi->common.reference_mode = COMPOUND_REFERENCE; - vp9_zero(cpi->comp_inter_count); + vp9_zero(cm->counts.comp_inter); } } diff --git a/vp9/encoder/vp9_onyx_if.c b/vp9/encoder/vp9_onyx_if.c index 9747eb5a2..7438dc97e 100644 --- a/vp9/encoder/vp9_onyx_if.c +++ b/vp9/encoder/vp9_onyx_if.c @@ -3104,9 +3104,6 @@ static void encode_frame_to_data_rate(VP9_COMP *cpi, vp9_copy(counts->y_mode, cpi->y_mode_count); vp9_copy(counts->uv_mode, cpi->y_uv_mode_count); vp9_copy(counts->intra_inter, cpi->intra_inter_count); - vp9_copy(counts->comp_inter, cpi->comp_inter_count); - vp9_copy(counts->single_ref, cpi->single_ref_count); - vp9_copy(counts->comp_ref, cpi->comp_ref_count); if (!cpi->common.error_resilient_mode && !cpi->common.frame_parallel_decoding_mode) { vp9_adapt_mode_probs(&cpi->common); diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 5f37a0789..b5541d6ff 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -434,9 +434,6 @@ typedef struct VP9_COMP { int64_t rd_comp_pred_diff[REFERENCE_MODES]; int64_t rd_prediction_type_threshes[4][REFERENCE_MODES]; unsigned int intra_inter_count[INTRA_INTER_CONTEXTS][2]; - unsigned int comp_inter_count[COMP_INTER_CONTEXTS][2]; - unsigned int single_ref_count[REF_CONTEXTS][2][2]; - unsigned int comp_ref_count[REF_CONTEXTS][2]; int64_t rd_tx_select_diff[TX_MODES]; // FIXME(rbultje) can this overflow? |