Roll src/third_party/libvpx/source/libvpx/ 181988d37..243029faf (45 commits).
https://chromium.googlesource.com/webm/libvpx.git/+log/181988d37273..243029faff45
$ git log 181988d37..243029faf --date=short --no-merges --format='%ad %ae %s'
2016-06-22 thakis win: Include <intrin.h> instead of manually declaring intrinsics.
2016-06-22 yaowu Prevent negative variance
2016-06-20 yaowu Fix ubsan warnings: vp9/encoder/vp9_mcomp.c
2016-06-15 huisu Add a hardware compatibility feature
2016-06-20 yaowu Make type conversion explicit
2016-06-19 johannkoenig Fix iosbuild.sh: outdated reference to ios-version.sh
2016-06-18 jzern realtime_test: remove decoded frame count check
2016-06-17 jingning Refactor optimize_b for speed performance
2016-06-17 jingning Port optimize_b speed-up from vp10
2016-06-17 yaowu Fix ubsan warning: vp9/encoder/vp9_encodeframe.c
2016-06-17 jingning Use 64-bit integer to store distortion in optimize_b
2016-06-17 johannkoenig Configuration: Use 'is_in' instead of echo | grep
2016-06-10 johannkoenig Parse codec options in order of occurrence.
2016-06-15 tomfinegan Disable neon for Xcode versions < v6.3.
2016-06-17 gezalore Fix warnings from gtest under GCC 5 or newer.
2016-06-15 tomfinegan Output frames in first pass for VPX_DL_REALTIME.
2016-06-17 yaowu Fix ubsan warnings: vp9/encoder/vp9_encoder.c
2016-06-16 johannkoenig Remove ios-version.sh
2016-06-13 johannkoenig vp8_[cd]x_iface.c: Initialize structures to 0
2016-06-13 johannkoenig VP8_COMP: make frames_since_golden signed
(...)
R=johannkoenig@chromium.org
BUG=592745
Review-Url: https://codereview.chromium.org/2087233003
Cr-Commit-Position: refs/heads/master@{#401411}
diff --git a/DEPS b/DEPS
index faa052f..4c97dc0 100644
--- a/DEPS
+++ b/DEPS
@@ -190,7 +190,7 @@
Var('chromium_git') + '/external/selenium/py.git' + '@' + '5fd78261a75fe08d27ca4835fb6c5ce4b42275bd',
'src/third_party/libvpx/source/libvpx':
- Var('chromium_git') + '/webm/libvpx.git' + '@' + '181988d37273bd31708718a51e727ea1048d7c98',
+ Var('chromium_git') + '/webm/libvpx.git' + '@' + '243029faff45872fa47d2053bf3375bcfee6dfd9',
'src/third_party/ffmpeg':
Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'd45f90eac6d5eb22be6120b1f7cb145f7a7c88b0',
diff --git a/third_party/libvpx/README.chromium b/third_party/libvpx/README.chromium
index ea1b39e..b70f123 100644
--- a/third_party/libvpx/README.chromium
+++ b/third_party/libvpx/README.chromium
@@ -5,9 +5,9 @@
License File: source/libvpx/LICENSE
Security Critical: yes
-Date: Friday June 10 2016
+Date: Wednesday June 22 2016
Branch: master
-Commit: 181988d37273bd31708718a51e727ea1048d7c98
+Commit: 243029faff45872fa47d2053bf3375bcfee6dfd9
Description:
Contains the sources used to compile libvpx binaries used by Google Chrome and
diff --git a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_dsp_rtcd.h
index f72e439..f7a9227 100644
--- a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_dsp_rtcd.h
@@ -302,7 +302,8 @@
RTCD_EXTERN void (*vpx_h_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
void vpx_hadamard_16x16_c(const int16_t *src_diff, int src_stride, int16_t *coeff);
-#define vpx_hadamard_16x16 vpx_hadamard_16x16_c
+void vpx_hadamard_16x16_neon(const int16_t *src_diff, int src_stride, int16_t *coeff);
+RTCD_EXTERN void (*vpx_hadamard_16x16)(const int16_t *src_diff, int src_stride, int16_t *coeff);
void vpx_hadamard_8x8_c(const int16_t *src_diff, int src_stride, int16_t *coeff);
void vpx_hadamard_8x8_neon(const int16_t *src_diff, int src_stride, int16_t *coeff);
@@ -924,6 +925,8 @@
if (flags & HAS_NEON) vpx_h_predictor_4x4 = vpx_h_predictor_4x4_neon;
vpx_h_predictor_8x8 = vpx_h_predictor_8x8_c;
if (flags & HAS_NEON) vpx_h_predictor_8x8 = vpx_h_predictor_8x8_neon;
+ vpx_hadamard_16x16 = vpx_hadamard_16x16_c;
+ if (flags & HAS_NEON) vpx_hadamard_16x16 = vpx_hadamard_16x16_neon;
vpx_hadamard_8x8 = vpx_hadamard_8x8_c;
if (flags & HAS_NEON) vpx_hadamard_8x8 = vpx_hadamard_8x8_neon;
vpx_idct16x16_10_add = vpx_idct16x16_10_add_c;
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon/vpx_dsp_rtcd.h
index 8a9bce5..235e3b2 100644
--- a/third_party/libvpx/source/config/linux/arm-neon/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/linux/arm-neon/vpx_dsp_rtcd.h
@@ -302,7 +302,8 @@
#define vpx_h_predictor_8x8 vpx_h_predictor_8x8_neon
void vpx_hadamard_16x16_c(const int16_t *src_diff, int src_stride, int16_t *coeff);
-#define vpx_hadamard_16x16 vpx_hadamard_16x16_c
+void vpx_hadamard_16x16_neon(const int16_t *src_diff, int src_stride, int16_t *coeff);
+#define vpx_hadamard_16x16 vpx_hadamard_16x16_neon
void vpx_hadamard_8x8_c(const int16_t *src_diff, int src_stride, int16_t *coeff);
void vpx_hadamard_8x8_neon(const int16_t *src_diff, int src_stride, int16_t *coeff);
diff --git a/third_party/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h b/third_party/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h
index d29c82c..d1bc8b4a 100644
--- a/third_party/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h
+++ b/third_party/libvpx/source/config/linux/arm64/vpx_dsp_rtcd.h
@@ -302,7 +302,8 @@
#define vpx_h_predictor_8x8 vpx_h_predictor_8x8_neon
void vpx_hadamard_16x16_c(const int16_t *src_diff, int src_stride, int16_t *coeff);
-#define vpx_hadamard_16x16 vpx_hadamard_16x16_c
+void vpx_hadamard_16x16_neon(const int16_t *src_diff, int src_stride, int16_t *coeff);
+#define vpx_hadamard_16x16 vpx_hadamard_16x16_neon
void vpx_hadamard_8x8_c(const int16_t *src_diff, int src_stride, int16_t *coeff);
void vpx_hadamard_8x8_neon(const int16_t *src_diff, int src_stride, int16_t *coeff);
diff --git a/third_party/libvpx/source/config/vpx_version.h b/third_party/libvpx/source/config/vpx_version.h
index 051ed0e..b2ead16 100644
--- a/third_party/libvpx/source/config/vpx_version.h
+++ b/third_party/libvpx/source/config/vpx_version.h
@@ -1,7 +1,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 5
#define VERSION_PATCH 0
-#define VERSION_EXTRA "1018-g181988d"
+#define VERSION_EXTRA "1099-g243029f"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v1.5.0-1018-g181988d"
-#define VERSION_STRING " v1.5.0-1018-g181988d"
+#define VERSION_STRING_NOSP "v1.5.0-1099-g243029f"
+#define VERSION_STRING " v1.5.0-1099-g243029f"
