ref: 880adc33553cf0b48b91aea33eb7cccc730a6c39
parent: e4c6f8fde75c0b6084b854420a398991061d4fc9
parent: 394020383d3da02e602050f9d5e8e671a6e3cb8b
author: Yunqing Wang <yunqingwang@google.com>
date: Thu Dec 8 17:46:44 EST 2016
Merge "Remove an unused first pass statistic"
--- a/vp9/encoder/vp9_firstpass.c
+++ b/vp9/encoder/vp9_firstpass.c
@@ -117,8 +117,7 @@
stats->intra_skip_pct, stats->intra_smooth_pct,
stats->inactive_zone_rows, stats->inactive_zone_cols, stats->MVr,
stats->mvr_abs, stats->MVc, stats->mvc_abs, stats->MVrv,
- stats->MVcv, stats->mv_in_out_count, stats->new_mv_count,
- stats->count, stats->duration);
+ stats->MVcv, stats->mv_in_out_count, stats->count, stats->duration);
fclose(fpfile);
}
#endif
@@ -157,7 +156,6 @@
section->MVrv = 0.0;
section->MVcv = 0.0;
section->mv_in_out_count = 0.0;
- section->new_mv_count = 0.0;
section->count = 0.0;
section->duration = 1.0;
section->spatial_layer_id = 0;
@@ -187,7 +185,6 @@
section->MVrv += frame->MVrv;
section->MVcv += frame->MVcv;
section->mv_in_out_count += frame->mv_in_out_count;
- section->new_mv_count += frame->new_mv_count;
section->count += frame->count;
section->duration += frame->duration;
}
@@ -215,7 +212,6 @@
section->MVrv -= frame->MVrv;
section->MVcv -= frame->MVcv;
section->mv_in_out_count -= frame->mv_in_out_count;
- section->new_mv_count -= frame->new_mv_count;
section->count -= frame->count;
section->duration -= frame->duration;
}
@@ -679,9 +675,7 @@
int intra_skip_count = 0;
int intra_smooth_count = 0;
int image_data_start_row = INVALID_ROW;
- int new_mv_count = 0;
int sum_in_vectors = 0;
- MV lastmv = { 0, 0 };
TWO_PASS *twopass = &cpi->twopass;
const MV zero_mv = { 0, 0 };
int recon_y_stride, recon_uv_stride, uv_mb_height;
@@ -1144,10 +1138,6 @@
}
#endif
- // Non-zero vector, was it different from the last non zero vector?
- if (!is_equal_mv(&mv, &lastmv)) ++new_mv_count;
- lastmv = mv;
-
// Does the row vector point inwards or outwards?
if (mb_row < cm->mb_rows / 2) {
if (mv.row > 0)
@@ -1263,7 +1253,6 @@
fps.MVcv =
((double)sum_mvcs - ((double)sum_mvc * sum_mvc / mvcount)) / mvcount;
fps.mv_in_out_count = (double)sum_in_vectors / (mvcount * 2);
- fps.new_mv_count = new_mv_count;
fps.pcnt_motion = (double)mvcount / num_mbs;
} else {
fps.MVr = 0.0;
@@ -1273,7 +1262,6 @@
fps.MVrv = 0.0;
fps.MVcv = 0.0;
fps.mv_in_out_count = 0.0;
- fps.new_mv_count = 0.0;
fps.pcnt_motion = 0.0;
}
--- a/vp9/encoder/vp9_firstpass.h
+++ b/vp9/encoder/vp9_firstpass.h
@@ -61,7 +61,6 @@
double MVrv;
double MVcv;
double mv_in_out_count;
- double new_mv_count;
double duration;
double count;
int64_t spatial_layer_id;