shithub: libvpx

Info  •  Files  •  Log  •  Branches

Fix to spatial svc: set reference_frame masking.

For real-time mode: keep reference_frame masking off
for spatial svc.

Change-Id: I15e123c06f67ea040172b8d4042a672f3525b9d8

--- a/vp9/encoder/vp9_pickmode.c

+++ b/vp9/encoder/vp9_pickmode.c

@@ -1058,6 +1058,7 @@

                          int mi_row, int mi_col, RD_COST *rd_cost,

                          BLOCK_SIZE bsize, PICK_MODE_CONTEXT *ctx) {

   VP9_COMMON *const cm = &cpi->common;

+  SPEED_FEATURES *const sf = &cpi->sf;

   TileInfo *const tile_info = &tile_data->tile_info;

   MACROBLOCKD *const xd = &x->e_mbd;

   MB_MODE_INFO *const mbmi = &xd->mi[0]->mbmi;

@@ -1217,7 +1218,7 @@

       continue;

     i = (ref_frame == LAST_FRAME) ? GOLDEN_FRAME : LAST_FRAME;

-    if (cpi->ref_frame_flags & flag_list[i])

+    if ((cpi->ref_frame_flags & flag_list[i]) && sf->reference_masking)

       if (x->pred_mv_sad[ref_frame] > (x->pred_mv_sad[i] << 1))

         ref_frame_skip_mask |= (1 << ref_frame);

     if (ref_frame_skip_mask & (1 << ref_frame))

--- a/vp9/encoder/vp9_speed_features.c

+++ b/vp9/encoder/vp9_speed_features.c

@@ -260,8 +260,12 @@

                                  FLAG_SKIP_INTRA_LOWVAR;

     sf->adaptive_pred_interp_filter = 2;

-    // Reference masking is not supported in dynamic scaling mode.

-    sf->reference_masking = cpi->oxcf.resize_mode != RESIZE_DYNAMIC ? 1 : 0;

+    // Disable reference masking if using spatial scaling since

+    // pred_mv_sad will not be set (since vp9_mv_pred will not

+    // be called).

+    // TODO(marpan/agrange): Fix this condition.

+    sf->reference_masking = (cpi->oxcf.resize_mode != RESIZE_DYNAMIC &&

+                             cpi->svc.number_spatial_layers == 1) ? 1 : 0;

     sf->disable_filter_search_var_thresh = 50;

     sf->comp_inter_joint_search_thresh = BLOCK_SIZES;