shithub: libvpx

Info  •  Files  •  Log  •  Branches

Reuse simple motion search results

In the ML based partition search speed feature, use MV result of
previous simple motion search as the starting point for the next one.

Compression change is neutral; encoding speed becomes slightly faster.

Change-Id: Iea554f28f7966fc5b5857e12b06de58e3fa312a6

--- a/vp9/encoder/vp9_context_tree.h

+++ b/vp9/encoder/vp9_context_tree.h

@@ -91,6 +91,9 @@

     struct PC_TREE *split[4];

     PICK_MODE_CONTEXT *leaf_split[4];

   };

+  // Obtained from a simple motion search. Used by the ML based partition search

+  // speed feature.

+  MV mv;

 } PC_TREE;

 void vp9_setup_pc_tree(struct VP9Common *cm, struct ThreadData *td);

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

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

@@ -3484,8 +3484,9 @@

 // input features.

 #define FEATURES 6

 static void ml_predict_var_rd_paritioning(VP9_COMP *cpi, MACROBLOCK *x,

-                                          BLOCK_SIZE bsize, int mi_row,

-                                          int mi_col, int *none, int *split) {

+                                          PC_TREE *pc_tree, BLOCK_SIZE bsize,

+                                          int mi_row, int mi_col, int *none,

+                                          int *split) {

   VP9_COMMON *const cm = &cpi->common;

   const NN_CONFIG *nn_config = NULL;

 #if CONFIG_VP9_HIGHBITDEPTH

@@ -3530,10 +3531,17 @@

   // Do a simple single motion search to find a prediction for current block.

   // The variance of the residue will be used as input features.

   {

-    const MV ref_mv = { 0, 0 };

+    MV ref_mv;

     const MV_REFERENCE_FRAME ref =

         cpi->rc.is_src_frame_alt_ref ? ALTREF_FRAME : LAST_FRAME;

+    // If bsize is 64x64, use zero MV as reference; otherwise, use MV result

+    // of previous(larger) block as reference.

+    if (bsize == BLOCK_64X64)

+      ref_mv.row = ref_mv.col = 0;

+    else

+      ref_mv = pc_tree->mv;

     simple_motion_search(cpi, x, bsize, mi_row, mi_col, ref_mv, ref, pred_buf);

+    pc_tree->mv = x->e_mbd.mi[0]->mv[0].as_mv;

   }

   vpx_clear_system_state();

@@ -3828,14 +3836,19 @@

   pc_tree->partitioning = PARTITION_NONE;

-  if (cpi->sf.ml_var_partition_pruning) {

+  if (cpi->sf.ml_var_partition_pruning && !frame_is_intra_only(cm)) {

     const int do_ml_var_partition_pruning =

-        !frame_is_intra_only(cm) && partition_none_allowed && do_split &&

+        partition_none_allowed && do_split &&

         mi_row + num_8x8_blocks_high_lookup[bsize] <= cm->mi_rows &&

         mi_col + num_8x8_blocks_wide_lookup[bsize] <= cm->mi_cols;

     if (do_ml_var_partition_pruning) {

-      ml_predict_var_rd_paritioning(cpi, x, bsize, mi_row, mi_col,

+      ml_predict_var_rd_paritioning(cpi, x, pc_tree, bsize, mi_row, mi_col,

                                     &partition_none_allowed, &do_split);

+    } else {

+      vp9_zero(pc_tree->mv);

+    }

+    if (bsize > BLOCK_8X8) {  // Store MV result as reference for subblocks.

+      for (i = 0; i < 4; ++i) pc_tree->split[i]->mv = pc_tree->mv;

     }

   }