libvpx: Pull from upstream

source/libvpx/vp9/common/vp9_reconintra.c

 /*
  *  Copyright (c) 2010 The WebM project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 446 matching lines @@
   DST(2, 0) = DST(1, 1) = DST(0, 2)             = AVG3(C, D, E);
   DST(3, 0) = DST(2, 1) = DST(1, 2) = DST(0, 3) = AVG3(D, E, F);
               DST(3, 1) = DST(2, 2) = DST(1, 3) = AVG3(E, F, G);
                           DST(3, 2) = DST(2, 3) = AVG3(F, G, H);
                                       DST(3, 3) = H;  // differs from vp8
 }
 
 static INLINE void d45_predictor(uint8_t *dst, ptrdiff_t stride, int bs,
                                  const uint8_t *above, const uint8_t *left) {
   const uint8_t above_right = above[bs - 1];
+  const uint8_t *const dst_row0 = dst;
   int x, size;
-  uint8_t avg[31];  // TODO(jzern): this could be block size specific
   (void)left;
 
   for (x = 0; x < bs - 1; ++x) {
-    avg[x] = AVG3(above[x], above[x + 1], above[x + 2]);
+    dst[x] = AVG3(above[x], above[x + 1], above[x + 2]);
   }
-  for (x = 0, size = bs - 1; x < bs; ++x, --size) {
-    memcpy(dst, avg + x, size);
+  dst[bs - 1] = above_right;
+  dst += stride;
+  for (x = 1, size = bs - 2; x < bs; ++x, --size) {
+    memcpy(dst, dst_row0 + x, size);
     memset(dst + size, above_right, x + 1);
     dst += stride;
   }
 }
 intra_pred_no_4x4(d45)
 
 void vp9_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
                               const uint8_t *above, const uint8_t *left) {
   const int I = left[0];
   const int J = left[1];
@@ skipping 38 matching lines @@
 
   // the rest of the block
   for (r = 2; r < bs; ++r) {
     for (c = 1; c < bs; c++)
       dst[c] = dst[-2 * stride + c - 1];
     dst += stride;
   }
 }
 intra_pred_no_4x4(d117)
 
-void vp9_d135_predictor_4x4(uint8_t *dst, ptrdiff_t stride,
-                            const uint8_t *above, const uint8_t *left) {
+void vp9_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t stride,
+                              const uint8_t *above, const uint8_t *left) {
   const int I = left[0];
   const int J = left[1];
   const int K = left[2];
   const int L = left[3];
   const int X = above[-1];
   const int A = above[0];
   const int B = above[1];
   const int C = above[2];
   const int D = above[3];
   (void)stride;
@@ skipping 533 matching lines @@
     return;
   }
 #endif
   build_intra_predictors(xd, ref, ref_stride, dst, dst_stride, mode, tx_size,
                          have_top, have_left, have_right, x, y, plane);
 }
 
 void vp9_init_intra_predictors(void) {
   once(vp9_init_intra_predictors_internal);
 }