ref: 814cf325d206d91227b13de37f750efe5c75f863
parent: a40e63f9562d7b00ac8b14ce465959fb6ac9c5f9
author: Angie Chiang <angiebird@google.com>
date: Sun Apr 21 11:41:58 EDT 2019
Remove mv_dist and mv_cost from TplDepStats Change-Id: I1af8814449a187e900df9c930dc174f0832b0212
--- a/vp9/encoder/vp9_encoder.c
+++ b/vp9/encoder/vp9_encoder.c
@@ -5825,7 +5825,7 @@
static uint32_t motion_compensated_prediction(
VP9_COMP *cpi, ThreadData *td, int frame_idx, uint8_t *cur_frame_buf,
uint8_t *ref_frame_buf, int stride, BLOCK_SIZE bsize, int mi_row,
- int mi_col, MV *mv, int rf_idx, double *mv_dist, double *mv_cost) {
+ int mi_col, MV *mv, int rf_idx) {
#else // CONFIG_NON_GREEDY_MV
static uint32_t motion_compensated_prediction(VP9_COMP *cpi, ThreadData *td,
int frame_idx,
@@ -5850,6 +5850,8 @@
// TODO(angiebird): Figure out lambda's proper value.
double lambda = cpi->tpl_stats[frame_idx].lambda;
int_mv nb_full_mvs[NB_MVS_NUM];
+ double mv_dist;
+ double mv_cost;
#endif
MV best_ref_mv1 = { 0, 0 };
@@ -5876,7 +5878,7 @@
bsize, nb_full_mvs);
vp9_full_pixel_diamond_new(cpi, x, &best_ref_mv1_full, step_param, lambda, 1,
&cpi->fn_ptr[bsize], nb_full_mvs, NB_MVS_NUM, mv,
- mv_dist, mv_cost);
+ &mv_dist, &mv_cost);
#else
(void)frame_idx;
(void)mi_row;
@@ -6655,8 +6657,7 @@
motion_compensated_prediction(
cpi, td, frame_idx, xd->cur_buf->y_buffer + mb_y_offset,
ref_frame[rf_idx]->y_buffer + mb_y_offset, xd->cur_buf->y_stride, bsize,
- mi_row, mi_col, &mv->as_mv, rf_idx, &tpl_stats->mv_dist[rf_idx],
- &tpl_stats->mv_cost[rf_idx]);
+ mi_row, mi_col, &mv->as_mv, rf_idx);
}
}
--- a/vp9/encoder/vp9_encoder.h
+++ b/vp9/encoder/vp9_encoder.h
@@ -293,8 +293,6 @@
#if CONFIG_NON_GREEDY_MV
int ready[3];
- double mv_dist[3];
- double mv_cost[3];
int64_t sse_arr[3];
double feature_score;
#endif