commit 6fd7f7dd3e3e0ef23956cdf5fb92a005de290fa6
author Hui Su <huisu@google.com> Sat May 28 04:34:58 2016 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat May 28 04:34:59 2016 +0000
tree bec8f9a13787e6690966b4ea9e4317c8f32f2eec
parent e717ece4ab75da4c68f33b48b09ac2fe55c6e395
parent e5f47d4334475dd23b8d4e990833950d628764d7

Merge "ext-intra: refactor mode info. writing and reading" into nextgenv2

vp10/common/reconintra.c

diff --git a/vp10/common/reconintra.c b/vp10/common/reconintra.c
index fa20f2c..89ff13b 100644
--- a/vp10/common/reconintra.c
+++ b/vp10/common/reconintra.c
@@ -1198,6 +1198,20 @@
 #endif  // CONFIG_EXT_INTRA
 
   (void) plane;
+  assert(n_top_px >= 0);
+  assert(n_topright_px >= 0);
+  assert(n_left_px >= 0);
+  assert(n_bottomleft_px >= 0);
+
+  if ((!need_above && n_left_px == 0) || (!need_left && n_top_px == 0)) {
+    int i;
+    const int val = (n_left_px == 0) ? base + 1 : base - 1;
+    for (i = 0; i < bs; ++i) {
+      vpx_memset16(dst, val, bs);
+      dst += dst_stride;
+    }
+    return;
+  }
 
   // NEED_LEFT
   if (need_left) {
@@ -1361,6 +1375,16 @@
   assert(n_left_px >= 0);
   assert(n_bottomleft_px >= 0);
 
+  if ((!need_above && n_left_px == 0) || (!need_left && n_top_px == 0)) {
+    int i;
+    const int val = (n_left_px == 0) ? 129 : 127;
+    for (i = 0; i < bs; ++i) {
+      memset(dst, val, bs);
+      dst += dst_stride;
+    }
+    return;
+  }
+
   // NEED_LEFT
   if (need_left) {
 #if CONFIG_EXT_INTRA