ref: 8f8b526b54dca6e651f0d3a1b53a2b39002a3c15
parent: 538865dfa516a3a08aa63ee7eab49197d326898a
parent: 86712c50f2f6380856fe0f4f6e170144b672038a
author: John Koleszar <jkoleszar@google.com>
date: Tue Oct 4 03:40:49 EDT 2011
Merge "Fix uninitialized new_mv_count in first pass file"
--- a/vp8/encoder/firstpass.c
+++ b/vp8/encoder/firstpass.c
@@ -777,6 +777,7 @@
fps.MVrv = 0.0;
fps.MVcv = 0.0;
fps.mv_in_out_count = 0.0;
+ fps.new_mv_count = 0.0;
fps.count = 1.0;
fps.pcnt_inter = 1.0 * (double)intercount / cm->MBs;
@@ -932,10 +933,7 @@
double section_err = (fpstats->coded_error / fpstats->count);
double err_per_mb = section_err / num_mbs;
double err_correction_factor;
- double corr_high;
double speed_correction = 1.0;
- double inter_pct = (fpstats->pcnt_inter / fpstats->count);
- double intra_pct = 1.0 - inter_pct;
int overhead_bits_per_mb;
if (section_target_bandwitdh <= 0)
@@ -1047,12 +1045,9 @@
double section_err = (fpstats->coded_error / fpstats->count);
double err_per_mb = section_err / num_mbs;
double err_correction_factor;
- double corr_high;
double speed_correction = 1.0;
double clip_iiratio;
double clip_iifactor;
- double inter_pct = (fpstats->pcnt_inter / fpstats->count);
- double intra_pct = 1.0 - inter_pct;
int overhead_bits_per_mb;
if (0)
@@ -1131,7 +1126,6 @@
double err_per_mb = section_err / num_mbs;
double err_correction_factor;
- double corr_high;
double speed_correction = 1.0;
target_norm_bits_per_mb = (section_target_bandwitdh < (1 << 20)) ? (512 * section_target_bandwitdh) / num_mbs : 512 * (section_target_bandwitdh / num_mbs);
@@ -1177,7 +1171,6 @@
double err_per_mb = section_err / num_mbs;
double err_correction_factor;
- double corr_high;
double speed_correction = 1.0;
double current_spend_ratio = 1.0;
@@ -2305,7 +2298,7 @@
int tmp_q;
int frames_left = (int)(cpi->twopass.total_stats->count - cpi->common.current_video_frame);
- FIRSTPASS_STATS this_frame;
+ FIRSTPASS_STATS this_frame = {0};FIRSTPASS_STATS this_frame_copy;
double this_frame_error;
--
⑨