diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-03-18 08:36:23 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-03-18 08:36:23 -0700 |
| commit | 9a56ea7e46e44c8e0242991ab1141166537380a0 (patch) | |
| tree | 254a9aa1588c4c27691d70a8c939613440a116e9 /vp9 | |
| parent | 571fce6546c19e6d93ae2d373de733ce9e266705 (diff) | |
| parent | b8ac9f2f2c4eddcad87bdf7cf663ed326e4ba783 (diff) | |
| download | libvpx-9a56ea7e46e44c8e0242991ab1141166537380a0.tar libvpx-9a56ea7e46e44c8e0242991ab1141166537380a0.tar.gz libvpx-9a56ea7e46e44c8e0242991ab1141166537380a0.tar.bz2 libvpx-9a56ea7e46e44c8e0242991ab1141166537380a0.zip | |
Merge "Remove some unused rate control variables" into experimental
Diffstat (limited to 'vp9')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 5 | ||||
| -rw-r--r-- | vp9/encoder/vp9_onyx_int.h | 5 |
2 files changed, 0 insertions, 10 deletions
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 |