Roll src/third_party/libaom/source/libaom/ 63256264a..1c2430a2e (6 commits)

https://aomedia.googlesource.com/aom.git/+log/63256264a978..1c2430a2e13a

$ git log 63256264a..1c2430a2e --date=short --no-merges --format='%ad %ae %s'
2018-06-21 niva213 hbd lpf sse2 perf and code quality improvement
2018-06-21 ddvfinite Speed up av1_optimize_b
2018-06-21 zoeliu Merge two flags to one for hierarchical structure
2018-06-22 anorkin [NORMATIVE] level_idx=31, initial_display_delay
2018-06-22 birkbeck Clear {cb,cr}_grain_block when there is no scaling function
2018-06-21 sachin.kumargarg Add ARM Neon optimization of aom_highbd_dc_predictor

Created with:
  roll-dep src/third_party/libaom/source/libaom

BUG=chromium:783519
TBR=tomfinegan@chromium.org

Change-Id: I86949822c95cd18d2739ca9c3c99fbdc9d0028cd
Reviewed-on: https://chromium-review.googlesource.com/1112944Reviewed-by: Johann Koenig <johannkoenig@google.com>
Commit-Queue: Johann Koenig <johannkoenig@google.com>
Cr-Commit-Position: refs/heads/master@{#569904}

DEPS

@@ -779,7 +779,7 @@ deps = {
     Var('chromium_git') + '/external/libaddressinput.git' + '@' + 'd955c63ec7048d59dffd20af25eeec23da878d27',
 
   'src/third_party/libaom/source/libaom': {
-    'url': Var('aomedia_git') + '/aom.git' + '@' +  '63256264a978ecac8e3c8799275b1a47c04ca3c8',
+    'url': Var('aomedia_git') + '/aom.git' + '@' +  '1c2430a2e13af52390be4109da0d6e3f6b5d3d9f',
     'condition': 'checkout_libaom',
   },
 

third_party/libaom/README.chromium

@@ -2,9 +2,9 @@ Name: Alliance for Open Media Video Codec
 Short Name: libaom
 URL: https://aomedia.googlesource.com/aom/
 Version: 0
-Date: Friday June 22 2018
+Date: Saturday June 23 2018
 Branch: master
-Commit: 63256264a978ecac8e3c8799275b1a47c04ca3c8
+Commit: 1c2430a2e13af52390be4109da0d6e3f6b5d3d9f
 License: BSD
 License File: source/libaom/LICENSE
 Security Critical: yes

third_party/libaom/libaom_srcs.gni

@@ -29,6 +29,7 @@ aom_av1_common_intrin_neon = [
   "//third_party/libaom/source/libaom/av1/common/arm/blend_a64_vmask_neon.c",
   "//third_party/libaom/source/libaom/av1/common/arm/reconinter_neon.c",
   "//third_party/libaom/source/libaom/av1/common/arm/wiener_convolve_neon.c",
+  "//third_party/libaom/source/libaom/av1/common/arm/intrapred_neon.c",
   "//third_party/libaom/source/libaom/av1/common/cdef_block_neon.c",
 ]
 

third_party/libaom/source/config/config/aom_version.h

@@ -12,8 +12,8 @@
 #define VERSION_MAJOR 0
 #define VERSION_MINOR 1
 #define VERSION_PATCH 0
-#define VERSION_EXTRA "9854-g63256264a"
+#define VERSION_EXTRA "9860-g1c2430a2e"
 #define VERSION_PACKED \
   ((VERSION_MAJOR << 16) | (VERSION_MINOR << 8) | (VERSION_PATCH))
-#define VERSION_STRING_NOSP "0.1.0-9854-g63256264a"
-#define VERSION_STRING " 0.1.0-9854-g63256264a"
+#define VERSION_STRING_NOSP "0.1.0-9860-g1c2430a2e"
+#define VERSION_STRING " 0.1.0-9860-g1c2430a2e"

third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h

@@ -1246,7 +1246,16 @@ void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
                                      const uint16_t* above,
                                      const uint16_t* left,
                                      int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_c
+void aom_highbd_dc_predictor_16x16_neon(uint16_t* dst,
+                                        ptrdiff_t y_stride,
+                                        const uint16_t* above,
+                                        const uint16_t* left,
+                                        int bd);
+RTCD_EXTERN void (*aom_highbd_dc_predictor_16x16)(uint16_t* dst,
+                                                  ptrdiff_t y_stride,
+                                                  const uint16_t* above,
+                                                  const uint16_t* left,
+                                                  int bd);
 
 void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
                                      ptrdiff_t y_stride,
@@ -1295,7 +1304,16 @@ void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
                                      const uint16_t* above,
                                      const uint16_t* left,
                                      int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_c
+void aom_highbd_dc_predictor_32x32_neon(uint16_t* dst,
+                                        ptrdiff_t y_stride,
+                                        const uint16_t* above,
+                                        const uint16_t* left,
+                                        int bd);
+RTCD_EXTERN void (*aom_highbd_dc_predictor_32x32)(uint16_t* dst,
+                                                  ptrdiff_t y_stride,
+                                                  const uint16_t* above,
+                                                  const uint16_t* left,
+                                                  int bd);
 
 void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
                                      ptrdiff_t y_stride,
@@ -1323,7 +1341,16 @@ void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
                                    const uint16_t* above,
                                    const uint16_t* left,
                                    int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_c
+void aom_highbd_dc_predictor_4x4_neon(uint16_t* dst,
+                                      ptrdiff_t y_stride,
+                                      const uint16_t* above,
+                                      const uint16_t* left,
+                                      int bd);
+RTCD_EXTERN void (*aom_highbd_dc_predictor_4x4)(uint16_t* dst,
+                                                ptrdiff_t y_stride,
+                                                const uint16_t* above,
+                                                const uint16_t* left,
+                                                int bd);
 
 void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
                                    ptrdiff_t y_stride,
@@ -1351,7 +1378,16 @@ void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
                                      const uint16_t* above,
                                      const uint16_t* left,
                                      int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c
+void aom_highbd_dc_predictor_64x64_neon(uint16_t* dst,
+                                        ptrdiff_t y_stride,
+                                        const uint16_t* above,
+                                        const uint16_t* left,
+                                        int bd);
+RTCD_EXTERN void (*aom_highbd_dc_predictor_64x64)(uint16_t* dst,
+                                                  ptrdiff_t y_stride,
+                                                  const uint16_t* above,
+                                                  const uint16_t* left,
+                                                  int bd);
 
 void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
                                     ptrdiff_t y_stride,
@@ -1379,7 +1415,16 @@ void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
                                    const uint16_t* above,
                                    const uint16_t* left,
                                    int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_c
+void aom_highbd_dc_predictor_8x8_neon(uint16_t* dst,
+                                      ptrdiff_t y_stride,
+                                      const uint16_t* above,
+                                      const uint16_t* left,
+                                      int bd);
+RTCD_EXTERN void (*aom_highbd_dc_predictor_8x8)(uint16_t* dst,
+                                                ptrdiff_t y_stride,
+                                                const uint16_t* above,
+                                                const uint16_t* left,
+                                                int bd);
 
 void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
                                          ptrdiff_t y_stride,
@@ -3452,6 +3497,21 @@ static void setup_rtcd_internal(void) {
   aom_h_predictor_8x8 = aom_h_predictor_8x8_c;
   if (flags & HAS_NEON)
     aom_h_predictor_8x8 = aom_h_predictor_8x8_neon;
+  aom_highbd_dc_predictor_16x16 = aom_highbd_dc_predictor_16x16_c;
+  if (flags & HAS_NEON)
+    aom_highbd_dc_predictor_16x16 = aom_highbd_dc_predictor_16x16_neon;
+  aom_highbd_dc_predictor_32x32 = aom_highbd_dc_predictor_32x32_c;
+  if (flags & HAS_NEON)
+    aom_highbd_dc_predictor_32x32 = aom_highbd_dc_predictor_32x32_neon;
+  aom_highbd_dc_predictor_4x4 = aom_highbd_dc_predictor_4x4_c;
+  if (flags & HAS_NEON)
+    aom_highbd_dc_predictor_4x4 = aom_highbd_dc_predictor_4x4_neon;
+  aom_highbd_dc_predictor_64x64 = aom_highbd_dc_predictor_64x64_c;
+  if (flags & HAS_NEON)
+    aom_highbd_dc_predictor_64x64 = aom_highbd_dc_predictor_64x64_neon;
+  aom_highbd_dc_predictor_8x8 = aom_highbd_dc_predictor_8x8_c;
+  if (flags & HAS_NEON)
+    aom_highbd_dc_predictor_8x8 = aom_highbd_dc_predictor_8x8_neon;
   aom_lowbd_blend_a64_d16_mask = aom_lowbd_blend_a64_d16_mask_c;
   if (flags & HAS_NEON)
     aom_lowbd_blend_a64_d16_mask = aom_lowbd_blend_a64_d16_mask_neon;

third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h

@@ -1170,7 +1170,12 @@ void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
                                      const uint16_t* above,
                                      const uint16_t* left,
                                      int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_c
+void aom_highbd_dc_predictor_16x16_neon(uint16_t* dst,
+                                        ptrdiff_t y_stride,
+                                        const uint16_t* above,
+                                        const uint16_t* left,
+                                        int bd);
+#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_neon
 
 void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
                                      ptrdiff_t y_stride,
@@ -1219,7 +1224,12 @@ void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
                                      const uint16_t* above,
                                      const uint16_t* left,
                                      int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_c
+void aom_highbd_dc_predictor_32x32_neon(uint16_t* dst,
+                                        ptrdiff_t y_stride,
+                                        const uint16_t* above,
+                                        const uint16_t* left,
+                                        int bd);
+#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_neon
 
 void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
                                      ptrdiff_t y_stride,
@@ -1247,7 +1257,12 @@ void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
                                    const uint16_t* above,
                                    const uint16_t* left,
                                    int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_c
+void aom_highbd_dc_predictor_4x4_neon(uint16_t* dst,
+                                      ptrdiff_t y_stride,
+                                      const uint16_t* above,
+                                      const uint16_t* left,
+                                      int bd);
+#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_neon
 
 void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
                                    ptrdiff_t y_stride,
@@ -1275,7 +1290,12 @@ void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
                                      const uint16_t* above,
                                      const uint16_t* left,
                                      int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c
+void aom_highbd_dc_predictor_64x64_neon(uint16_t* dst,
+                                        ptrdiff_t y_stride,
+                                        const uint16_t* above,
+                                        const uint16_t* left,
+                                        int bd);
+#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_neon
 
 void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
                                     ptrdiff_t y_stride,
@@ -1303,7 +1323,12 @@ void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
                                    const uint16_t* above,
                                    const uint16_t* left,
                                    int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_c
+void aom_highbd_dc_predictor_8x8_neon(uint16_t* dst,
+                                      ptrdiff_t y_stride,
+                                      const uint16_t* above,
+                                      const uint16_t* left,
+                                      int bd);
+#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_neon
 
 void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
                                          ptrdiff_t y_stride,

third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h

@@ -1170,7 +1170,12 @@ void aom_highbd_dc_predictor_16x16_c(uint16_t* dst,
                                      const uint16_t* above,
                                      const uint16_t* left,
                                      int bd);
-#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_c
+void aom_highbd_dc_predictor_16x16_neon(uint16_t* dst,
+                                        ptrdiff_t y_stride,
+                                        const uint16_t* above,
+                                        const uint16_t* left,
+                                        int bd);
+#define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_neon
 
 void aom_highbd_dc_predictor_16x32_c(uint16_t* dst,
                                      ptrdiff_t y_stride,
@@ -1219,7 +1224,12 @@ void aom_highbd_dc_predictor_32x32_c(uint16_t* dst,
                                      const uint16_t* above,
                                      const uint16_t* left,
                                      int bd);
-#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_c
+void aom_highbd_dc_predictor_32x32_neon(uint16_t* dst,
+                                        ptrdiff_t y_stride,
+                                        const uint16_t* above,
+                                        const uint16_t* left,
+                                        int bd);
+#define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_neon
 
 void aom_highbd_dc_predictor_32x64_c(uint16_t* dst,
                                      ptrdiff_t y_stride,
@@ -1247,7 +1257,12 @@ void aom_highbd_dc_predictor_4x4_c(uint16_t* dst,
                                    const uint16_t* above,
                                    const uint16_t* left,
                                    int bd);
-#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_c
+void aom_highbd_dc_predictor_4x4_neon(uint16_t* dst,
+                                      ptrdiff_t y_stride,
+                                      const uint16_t* above,
+                                      const uint16_t* left,
+                                      int bd);
+#define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_neon
 
 void aom_highbd_dc_predictor_4x8_c(uint16_t* dst,
                                    ptrdiff_t y_stride,
@@ -1275,7 +1290,12 @@ void aom_highbd_dc_predictor_64x64_c(uint16_t* dst,
                                      const uint16_t* above,
                                      const uint16_t* left,
                                      int bd);
-#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_c
+void aom_highbd_dc_predictor_64x64_neon(uint16_t* dst,
+                                        ptrdiff_t y_stride,
+                                        const uint16_t* above,
+                                        const uint16_t* left,
+                                        int bd);
+#define aom_highbd_dc_predictor_64x64 aom_highbd_dc_predictor_64x64_neon
 
 void aom_highbd_dc_predictor_8x16_c(uint16_t* dst,
                                     ptrdiff_t y_stride,
@@ -1303,7 +1323,12 @@ void aom_highbd_dc_predictor_8x8_c(uint16_t* dst,
                                    const uint16_t* above,
                                    const uint16_t* left,
                                    int bd);
-#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_c
+void aom_highbd_dc_predictor_8x8_neon(uint16_t* dst,
+                                      ptrdiff_t y_stride,
+                                      const uint16_t* above,
+                                      const uint16_t* left,
+                                      int bd);
+#define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_neon
 
 void aom_highbd_dc_top_predictor_16x16_c(uint16_t* dst,
                                          ptrdiff_t y_stride,