Merge "Speed up ext-intra" into nextgenv2

2016-03-25 17:52:33 +00:00
parent 07a1fd413f c85a68123f
commit f9d77d66e6
1 changed files with 2 additions and 0 deletions
--- a/vp10/encoder/rdopt.c
+++ b/vp10/encoder/rdopt.c
@@ -7943,6 +7943,8 @@ void vp10_rd_pick_inter_mode_sb(VP10_COMP *cpi,
        mbmi->angle_delta[0] = 0;
        super_block_yrd(cpi, x, &rate_y, &distortion_y, &skippable,
                        NULL, bsize, best_rd);
+        if (rate_y == INT_MAX)
+          continue;
      }

      // TODO(huisu): ext-intra is turned off in lossless mode for now to