Merge "Fix RDO issue of obmc + speed feature fast_inter_tx_type_search" into nextgenv2

474ea305 · Yue Chen · Gerrit Code Review · f1a50db2 · 1273c39c · 474ea305
Commit 474ea305 authored Jun 20, 2016 by Yue Chen Committed by Gerrit Code Review Jun 20, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

vp10/encoder/rdopt.c vp10/encoder/rdopt.c +6 -0

No files found.
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -9668,6 +9668,12 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,

    if (is_inter_mode(mbmi->mode)) {
      vp10_build_inter_predictors_sb(xd, mi_row, mi_col, bsize);
+#if CONFIG_OBMC
+      if (mbmi->motion_variation == OBMC_CAUSAL)
+        vp10_build_obmc_inter_prediction(cm, xd, mi_row, mi_col, 0, NULL, NULL,
+                                         dst_buf1, dst_stride1,
+                                         dst_buf2, dst_stride2);
+#endif  // CONFIG_OBMC
      vp10_subtract_plane(x, bsize, 0);
 #if CONFIG_VAR_TX
      if (cm->tx_mode == TX_MODE_SELECT || xd->lossless[mbmi->segment_id]) {