From: Hui Su <huisu@google.com>
Date: Fri, 6 Nov 2015 17:40:49 +0000 (+0000)
Subject: Merge "ext-intra experiment" into nextgenv2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9b3ad185dcea8e906737b9574c9f21631f75958e;p=libvpx

Merge "ext-intra experiment" into nextgenv2
---

9b3ad185dcea8e906737b9574c9f21631f75958e
diff --cc vp10/common/reconintra.c
index 14af7eb8d,09aee1ae9..caef8eb7a
--- a/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++)