Merge "ext-intra experiment" into nextgenv2

diff --cc vp10/common/reconintra.c
index 14af7eb8debc38031434d30b92fb15abf8ded3ad,09aee1ae9516dd2a23fc678c3b1ee63e5f2ebc7c..caef8eb7af14855a6b5c0367eb3470f7de4fd032
--- 1/vp10/common/reconintra.c
--- 2/vp10/common/reconintra.c
+++ b/vp10/common/reconintra.c
@@@ -319,13 -984,22 +987,25 @@@ static void build_intra_predictors_high
    (void) x;
    (void) y;
    (void) plane;
 +  (void) need_left;
 +  (void) need_above;
 +  (void) need_aboveright;
  
    // NEED_LEFT
-   if (extend_modes[mode] & NEED_LEFT) {
+   if (need_left) {
+ #if CONFIG_EXT_INTRA
+     int need_bottom;
+     if (ext_intra_mode_info->use_ext_intra_mode[plane != 0]) {
+       if (ext_intra_mode <= FILTER_TM_PRED)
+         need_bottom = 0;
+       else
+         need_bottom = angle > 180;
+     } else {
+       need_bottom = !!(extend_modes[mode] & NEED_BOTTOMLEFT);
+     }
+ #else
      const int need_bottom = !!(extend_modes[mode] & NEED_BOTTOMLEFT);
+ #endif  // CONFIG_EXT_INTRA
      i = 0;
      if (n_left_px > 0) {
        for (; i < n_left_px; i++)

diff --cc vp10/encoder/rdopt.c
Simple merge