shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Add mv_{dist/cost}_sum to TplDepFrame"

--- a/vp9/encoder/vp9_encoder.c

+++ b/vp9/encoder/vp9_encoder.c

@@ -5954,6 +5954,9 @@

   const int mi_height = num_8x8_blocks_high_lookup[bsize];

   const int mi_width = num_8x8_blocks_wide_lookup[bsize];

   int64_t recon_error, sse;

+#if CONFIG_NON_GREEDY_MV

+  int rf_idx;

+#endif

   // Setup scaling factor

 #if CONFIG_VP9_HIGHBITDEPTH

@@ -5995,6 +5998,12 @@

   cm->base_qindex = tpl_frame->base_qindex;

   vp9_frame_init_quantizer(cpi);

+#if CONFIG_NON_GREEDY_MV

+  for (rf_idx = 0; rf_idx < 3; ++rf_idx) {

+    tpl_frame->mv_dist_sum[rf_idx] = 0;

+    tpl_frame->mv_cost_sum[rf_idx] = 0;

+  }

+#endif

   for (mi_row = 0; mi_row < cm->mi_rows; mi_row += mi_height) {

     // Motion estimation row boundary

     x->mv_limits.row_min = -((mi_row * MI_SIZE) + (17 - 2 * VP9_INTERP_EXTEND));

@@ -6012,6 +6021,16 @@

       tpl_model_update(cpi->tpl_stats, tpl_frame->tpl_stats_ptr, mi_row, mi_col,

                        bsize);

+#if CONFIG_NON_GREEDY_MV

+      {

+        TplDepStats *this_tpl_stats =

+            &tpl_frame->tpl_stats_ptr[mi_row * tpl_frame->stride + mi_col];

+        for (rf_idx = 0; rf_idx < 3; ++rf_idx) {

+          tpl_frame->mv_dist_sum[rf_idx] += this_tpl_stats->mv_dist[rf_idx];

+          tpl_frame->mv_cost_sum[rf_idx] += this_tpl_stats->mv_cost[rf_idx];

+        }

+      }

+#endif

     }

   }

 }

--- a/vp9/encoder/vp9_encoder.h

+++ b/vp9/encoder/vp9_encoder.h

@@ -311,6 +311,10 @@

   int mi_rows;

   int mi_cols;

   int base_qindex;

+#if CONFIG_NON_GREEDY_MV

+  double mv_dist_sum[3];

+  double mv_cost_sum[3];

+#endif

 } TplDepFrame;

 #define TPL_DEP_COST_SCALE_LOG2 4