shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "Enable conditional skip path in rd_pick_intra_sby_mode"

--- a/vp9/encoder/vp9_rdopt.c

+++ b/vp9/encoder/vp9_rdopt.c

@@ -1072,6 +1072,16 @@

   /* Y Search for intra prediction mode */

   for (mode = DC_PRED; mode <= TM_PRED; mode++) {

     int64_t local_tx_cache[TX_MODES];

+

+    if (cpi->sf.use_nonrd_pick_mode) {

+      // These speed features are turned on in hybrid non-RD and RD mode

+      // for key frame coding in the context of real-time setting.

+      if (conditional_skipintra(mode, mode_selected))

+          continue;

+      if (*skippable)

+        break;

+    }

+

     mic->mbmi.mode = mode;

     super_block_yrd(cpi, x, &this_rate_tokenonly, &this_distortion,

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

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

@@ -106,7 +106,8 @@

                                                       : USE_LARGESTALL;

     sf->reference_masking = 1;

-    sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH |

+    sf->mode_search_skip_flags = (cm->frame_type == KEY_FRAME) ? 0 :

+                                 FLAG_SKIP_INTRA_DIRMISMATCH |

                                  FLAG_SKIP_INTRA_BESTINTER |

                                  FLAG_SKIP_COMP_BESTINTRA |

                                  FLAG_SKIP_INTRA_LOWVAR;

@@ -140,7 +141,8 @@

     sf->mv.search_method = BIGDIA;

     sf->mv.subpel_search_method = SUBPEL_TREE_PRUNED_MORE;

     sf->adaptive_rd_thresh = 4;

-    sf->mode_search_skip_flags |= FLAG_EARLY_TERMINATE;

+    if (cm->frame_type != KEY_FRAME)

+      sf->mode_search_skip_flags |= FLAG_EARLY_TERMINATE;

     sf->disable_filter_search_var_thresh = 200;

     sf->use_lp32x32fdct = 1;

     sf->use_fast_coef_updates = ONE_LOOP_REDUCED;

@@ -226,7 +228,8 @@

   }

   if (speed >= 2) {

-    sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH |

+    sf->mode_search_skip_flags = (cm->frame_type == KEY_FRAME) ? 0 :

+                                 FLAG_SKIP_INTRA_DIRMISMATCH |

                                  FLAG_SKIP_INTRA_BESTINTER |

                                  FLAG_SKIP_COMP_BESTINTRA |

                                  FLAG_SKIP_INTRA_LOWVAR;

@@ -305,6 +308,7 @@

     sf->partition_search_breakout_rate_thr = 200;

     sf->coeff_prob_appx_step = 4;

     sf->use_fast_coef_updates = is_keyframe ? TWO_LOOP : ONE_LOOP_REDUCED;

+    sf->mode_search_skip_flags = FLAG_SKIP_INTRA_DIRMISMATCH;

     if (!is_keyframe) {

       int i;