shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Remove some unused rate control variables" into experimental

--- a/vp9/encoder/vp9_encodeframe.c

+++ b/vp9/encoder/vp9_encodeframe.c

@@ -594,9 +594,6 @@

           [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 @@

   // 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;

--- a/vp9/encoder/vp9_onyx_int.h

+++ b/vp9/encoder/vp9_onyx_int.h

@@ -390,11 +390,6 @@

   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

-- 

⑨