diff options
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 88d0b01c8..0830949d1 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -422,7 +422,7 @@ static void update_state(VP9_COMP *cpi, PICK_MODE_CONTEXT *ctx, if (cpi->common.mcomp_filter_type == SWITCHABLE && is_inter_mode(mbmi->mode)) { - ++cpi->common.fc.switchable_interp_count[ + ++cpi->common.counts.switchable_interp[ vp9_get_pred_context_switchable_interp(xd)] [vp9_switchable_interp_map[mbmi->interp_filter]]; } @@ -1949,14 +1949,14 @@ static void init_encode_frame_mb_context(VP9_COMP *cpi) { vp9_zero(cpi->y_mode_count) vp9_zero(cpi->y_uv_mode_count) - vp9_zero(cm->fc.inter_mode_counts) + vp9_zero(cm->counts.inter_mode) vp9_zero(cpi->partition_count); 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->fc.tx_counts); - vp9_zero(cm->fc.mbskip_count); + vp9_zero(cm->counts.tx); + vp9_zero(cm->counts.mbskip); // Note: this memset assumes above_context[0], [1] and [2] // are allocated as part of the same buffer. @@ -2018,7 +2018,7 @@ static void encode_frame_internal(VP9_COMP *cpi) { // Reset frame count of inter 0,0 motion vector usage. cpi->inter_zz_count = 0; - vp9_zero(cm->fc.switchable_interp_count); + vp9_zero(cm->counts.switchable_interp); vp9_zero(cpi->txfm_stepdown_count); xd->mode_info_context = cm->mi; @@ -2026,7 +2026,7 @@ static void encode_frame_internal(VP9_COMP *cpi) { vp9_zero(cpi->NMVcount); vp9_zero(cpi->coef_counts); - vp9_zero(cm->fc.eob_branch_counts); + vp9_zero(cm->counts.eob_branch); cpi->mb.e_mbd.lossless = cm->base_qindex == 0 && cm->y_dc_delta_q == 0 && cm->uv_dc_delta_q == 0 && cm->uv_ac_delta_q == 0; @@ -2412,17 +2412,17 @@ void vp9_encode_frame(VP9_COMP *cpi) { int count32x32 = 0; for (i = 0; i < TX_SIZE_CONTEXTS; ++i) { - count4x4 += cm->fc.tx_counts.p32x32[i][TX_4X4]; - count4x4 += cm->fc.tx_counts.p16x16[i][TX_4X4]; - count4x4 += cm->fc.tx_counts.p8x8[i][TX_4X4]; + count4x4 += cm->counts.tx.p32x32[i][TX_4X4]; + count4x4 += cm->counts.tx.p16x16[i][TX_4X4]; + count4x4 += cm->counts.tx.p8x8[i][TX_4X4]; - count8x8_lp += cm->fc.tx_counts.p32x32[i][TX_8X8]; - count8x8_lp += cm->fc.tx_counts.p16x16[i][TX_8X8]; - count8x8_8x8p += cm->fc.tx_counts.p8x8[i][TX_8X8]; + count8x8_lp += cm->counts.tx.p32x32[i][TX_8X8]; + count8x8_lp += cm->counts.tx.p16x16[i][TX_8X8]; + count8x8_8x8p += cm->counts.tx.p8x8[i][TX_8X8]; - count16x16_16x16p += cm->fc.tx_counts.p16x16[i][TX_16X16]; - count16x16_lp += cm->fc.tx_counts.p32x32[i][TX_16X16]; - count32x32 += cm->fc.tx_counts.p32x32[i][TX_32X32]; + count16x16_16x16p += cm->counts.tx.p16x16[i][TX_16X16]; + count16x16_lp += cm->counts.tx.p32x32[i][TX_16X16]; + count32x32 += cm->counts.tx.p32x32[i][TX_32X32]; } if (count4x4 == 0 && count16x16_lp == 0 && count16x16_16x16p == 0 @@ -2588,7 +2588,7 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled, mbmi->mb_skip_coeff = 1; if (output_enabled) - cm->fc.mbskip_count[mb_skip_context][1]++; + cm->counts.mbskip[mb_skip_context][1]++; vp9_reset_sb_tokens_context( xd, (bsize < BLOCK_SIZE_SB8X8) ? BLOCK_SIZE_SB8X8 : bsize); } @@ -2604,7 +2604,7 @@ static void encode_superblock(VP9_COMP *cpi, TOKENEXTRA **t, int output_enabled, (mbmi->mb_skip_coeff || vp9_segfeature_active(&xd->seg, segment_id, SEG_LVL_SKIP)))) { const uint8_t context = vp9_get_pred_context_tx_size(xd); - update_tx_counts(bsize, context, mbmi->txfm_size, &cm->fc.tx_counts); + update_tx_counts(bsize, context, mbmi->txfm_size, &cm->counts.tx); } else { int x, y; TX_SIZE sz = (cm->tx_mode == TX_MODE_SELECT) ? TX_32X32 : cm->tx_mode; |