From: John Koleszar Date: Sat, 16 Mar 2013 00:37:01 +0000 (-0700) Subject: Remove some unused rate control variables X-Git-Tag: v1.3.0~1151^2~49^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b8ac9f2f2c4eddcad87bdf7cf663ed326e4ba783;p=libvpx Remove some unused rate control variables These variables are unused, and are subject to overflowing, causing assertions when built with -ftrapv. Change-Id: Ia00a3201af309906c05bcd4b23a643925ed6ea86 --- diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index b7b270031..dd2004b01 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -594,9 +594,6 @@ static void update_state(VP9_COMP *cpi, [vp9_switchable_interp_map[mbmi->interp_filter]]; } - cpi->prediction_error += ctx->distortion; - cpi->intra_error += ctx->intra_error; - cpi->rd_comp_pred_diff[SINGLE_PREDICTION_ONLY] += ctx->single_pred_diff; cpi->rd_comp_pred_diff[COMP_PREDICTION_ONLY] += ctx->comp_pred_diff; cpi->rd_comp_pred_diff[HYBRID_PREDICTION] += ctx->hybrid_pred_diff; @@ -1265,8 +1262,6 @@ static void encode_frame_internal(VP9_COMP *cpi) { // Reset frame count of inter 0,0 motion vector usage. cpi->inter_zz_count = 0; - cpi->prediction_error = 0; - cpi->intra_error = 0; cpi->skip_true_count[0] = cpi->skip_true_count[1] = cpi->skip_true_count[2] = 0; cpi->skip_false_count[0] = cpi->skip_false_count[1] = cpi->skip_false_count[2] = 0; diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 300e12869..2e9f96c09 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -390,11 +390,6 @@ typedef struct VP9_COMP { CODING_CONTEXT coding_context; // Rate targetting variables - int64_t prediction_error; - int64_t last_prediction_error; - int64_t intra_error; - int64_t last_intra_error; - int this_frame_target; int projected_frame_size; int last_q[2]; // Separate values for Intra/Inter