Roll src/third_party/libvpx/source/libvpx/ edc9a4687..c6fcb9bb9 (16 commits)
https://chromium.googlesource.com/webm/libvpx.git/+log/edc9a4687699..c6fcb9bb94ea
$ git log edc9a4687..c6fcb9bb9 --date=short --no-merges --format='%ad %ae %s'
2018-03-03 jzern disable vp9_highbd_iht{4x4_16,8x8_64}_add_neon
2018-03-03 jzern disable vp9_iht8x8_64_add_neon
2018-03-03 jzern disable vp9_iht16x16_256_add_neon
2018-03-02 marpan vp9-svc: Disable partition_reuse unless 2x2 scale.
2018-03-01 marpan vp9-svc: Fix to downsampling filter phase_shift.
2018-02-28 jzern iadst16x16_256_add_half1d: fix array size
2018-02-26 linfengz Add vp9_iht16x16_256_add_neon()
2018-02-26 jzern datarate_test: correct last_pts_ref_ type
2018-02-26 linfengz Fix a bug in create_s16x4_neon()
2018-02-22 linfengz Clean test/dct_test.cc with testing::Combine
2018-02-21 jianj VP9 SVC: Datarate test for dynamic bitrate change.
2018-02-20 linfengz Add vp9_highbd_iht8x8_16_add_neon()
2018-02-20 johannkoenig remove deprecated 'register' keyword
2018-02-12 jianj vp9_cx_iface: Remove else when returning from the other branch.
2018-02-12 jianj VP9 ROI test clean up regarding bool type flag.
2018-02-05 kylesiefring Fold adds in 16->32-bit converts in SSE2/AVX2 fDCT
Created with:
roll-dep src/third_party/libvpx/source/libvpx
[email protected]
Change-Id: I90e68cab836f548e9d8502ed5c06191791d505a5
Reviewed-on: https://chromium-review.googlesource.com/952085
Reviewed-by: Johann Koenig <[email protected]>
Commit-Queue: Jerome Jiang <[email protected]>
Cr-Commit-Position: refs/heads/master@{#541231}diff --git a/DEPS b/DEPS
index 352ac35e..b0c74c9 100644
--- a/DEPS
+++ b/DEPS
@@ -489,7 +489,7 @@
},
'src/third_party/libvpx/source/libvpx':
- Var('chromium_git') + '/webm/libvpx.git' + '@' + 'edc9a4687699b372a0c27856020b42434ddc3014',
+ Var('chromium_git') + '/webm/libvpx.git' + '@' + 'c6fcb9bb94ea02324d9d842b71ac3d0ab0329c10',
'src/third_party/libwebm/source':
Var('chromium_git') + '/webm/libwebm.git' + '@' + 'b03c65468b06d097f27235d93d76bfc45f490ede',
diff --git a/third_party/libvpx/README.chromium b/third_party/libvpx/README.chromium
index 44fd8d66..324dd01 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: Saturday February 10 2018
+Date: Saturday March 03 2018
Branch: master
-Commit: edc9a4687699b372a0c27856020b42434ddc3014
+Commit: c6fcb9bb94ea02324d9d842b71ac3d0ab0329c10
Description:
Contains the sources used to compile libvpx binaries used by Google Chrome and
diff --git a/third_party/libvpx/libvpx_srcs.gni b/third_party/libvpx/libvpx_srcs.gni
index 6ff45bcb..dbba94e 100644
--- a/third_party/libvpx/libvpx_srcs.gni
+++ b/third_party/libvpx/libvpx_srcs.gni
@@ -1435,6 +1435,7 @@
"//third_party/libvpx/source/libvpx/vp8/encoder/vp8_quantize.c",
"//third_party/libvpx/source/libvpx/vp8/vp8_cx_iface.c",
"//third_party/libvpx/source/libvpx/vp8/vp8_dx_iface.c",
+ "//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht16x16_add_neon.c",
"//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht4x4_add_neon.c",
"//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht8x8_add_neon.c",
"//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht_neon.h",
@@ -2084,6 +2085,7 @@
"//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.c",
"//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/shortfdct_neon.c",
"//third_party/libvpx/source/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c",
+ "//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht16x16_add_neon.c",
"//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht4x4_add_neon.c",
"//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht8x8_add_neon.c",
"//third_party/libvpx/source/libvpx/vp9/encoder/arm/neon/vp9_dct_neon.c",
@@ -2261,6 +2263,7 @@
"//third_party/libvpx/source/libvpx/vp8/encoder/vp8_quantize.c",
"//third_party/libvpx/source/libvpx/vp8/vp8_cx_iface.c",
"//third_party/libvpx/source/libvpx/vp8/vp8_dx_iface.c",
+ "//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht16x16_add_neon.c",
"//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht4x4_add_neon.c",
"//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht8x8_add_neon.c",
"//third_party/libvpx/source/libvpx/vp9/common/arm/neon/vp9_iht_neon.h",
diff --git a/third_party/libvpx/source/config/ios/arm-neon/vp9_rtcd.h b/third_party/libvpx/source/config/ios/arm-neon/vp9_rtcd.h
index bd397cc..4df63fce 100644
--- a/third_party/libvpx/source/config/ios/arm-neon/vp9_rtcd.h
+++ b/third_party/libvpx/source/config/ios/arm-neon/vp9_rtcd.h
@@ -159,11 +159,7 @@
uint8_t* dest,
int stride,
int tx_type);
-void vp9_iht8x8_64_add_neon(const tran_low_t* input,
- uint8_t* dest,
- int stride,
- int tx_type);
-#define vp9_iht8x8_64_add vp9_iht8x8_64_add_neon
+#define vp9_iht8x8_64_add vp9_iht8x8_64_add_c
void vp9_quantize_fp_c(const tran_low_t* coeff_ptr,
intptr_t n_coeffs,
diff --git a/third_party/libvpx/source/config/ios/arm64/vp9_rtcd.h b/third_party/libvpx/source/config/ios/arm64/vp9_rtcd.h
index bd397cc..4df63fce 100644
--- a/third_party/libvpx/source/config/ios/arm64/vp9_rtcd.h
+++ b/third_party/libvpx/source/config/ios/arm64/vp9_rtcd.h
@@ -159,11 +159,7 @@
uint8_t* dest,
int stride,
int tx_type);
-void vp9_iht8x8_64_add_neon(const tran_low_t* input,
- uint8_t* dest,
- int stride,
- int tx_type);
-#define vp9_iht8x8_64_add vp9_iht8x8_64_add_neon
+#define vp9_iht8x8_64_add vp9_iht8x8_64_add_c
void vp9_quantize_fp_c(const tran_low_t* coeff_ptr,
intptr_t n_coeffs,
diff --git a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h
index dc5b2d1..25b8930c 100644
--- a/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h
+++ b/third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vp9_rtcd.h
@@ -184,14 +184,7 @@
uint8_t* dest,
int stride,
int tx_type);
-void vp9_iht8x8_64_add_neon(const tran_low_t* input,
- uint8_t* dest,
- int stride,
- int tx_type);
-RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t* input,
- uint8_t* dest,
- int stride,
- int tx_type);
+#define vp9_iht8x8_64_add vp9_iht8x8_64_add_c
void vp9_quantize_fp_c(const tran_low_t* coeff_ptr,
intptr_t n_coeffs,
@@ -298,9 +291,6 @@
vp9_iht4x4_16_add = vp9_iht4x4_16_add_c;
if (flags & HAS_NEON)
vp9_iht4x4_16_add = vp9_iht4x4_16_add_neon;
- vp9_iht8x8_64_add = vp9_iht8x8_64_add_c;
- if (flags & HAS_NEON)
- vp9_iht8x8_64_add = vp9_iht8x8_64_add_neon;
vp9_quantize_fp = vp9_quantize_fp_c;
if (flags & HAS_NEON)
vp9_quantize_fp = vp9_quantize_fp_neon;
diff --git a/third_party/libvpx/source/config/linux/arm-neon/vp9_rtcd.h b/third_party/libvpx/source/config/linux/arm-neon/vp9_rtcd.h
index bd397cc..4df63fce 100644
--- a/third_party/libvpx/source/config/linux/arm-neon/vp9_rtcd.h
+++ b/third_party/libvpx/source/config/linux/arm-neon/vp9_rtcd.h
@@ -159,11 +159,7 @@
uint8_t* dest,
int stride,
int tx_type);
-void vp9_iht8x8_64_add_neon(const tran_low_t* input,
- uint8_t* dest,
- int stride,
- int tx_type);
-#define vp9_iht8x8_64_add vp9_iht8x8_64_add_neon
+#define vp9_iht8x8_64_add vp9_iht8x8_64_add_c
void vp9_quantize_fp_c(const tran_low_t* coeff_ptr,
intptr_t n_coeffs,
diff --git a/third_party/libvpx/source/config/linux/arm64/vp9_rtcd.h b/third_party/libvpx/source/config/linux/arm64/vp9_rtcd.h
index bd397cc..4df63fce 100644
--- a/third_party/libvpx/source/config/linux/arm64/vp9_rtcd.h
+++ b/third_party/libvpx/source/config/linux/arm64/vp9_rtcd.h
@@ -159,11 +159,7 @@
uint8_t* dest,
int stride,
int tx_type);
-void vp9_iht8x8_64_add_neon(const tran_low_t* input,
- uint8_t* dest,
- int stride,
- int tx_type);
-#define vp9_iht8x8_64_add vp9_iht8x8_64_add_neon
+#define vp9_iht8x8_64_add vp9_iht8x8_64_add_c
void vp9_quantize_fp_c(const tran_low_t* coeff_ptr,
intptr_t n_coeffs,
diff --git a/third_party/libvpx/source/config/vpx_version.h b/third_party/libvpx/source/config/vpx_version.h
index 38cedd0..c49d1dd 100644
--- a/third_party/libvpx/source/config/vpx_version.h
+++ b/third_party/libvpx/source/config/vpx_version.h
@@ -2,7 +2,7 @@
#define VERSION_MAJOR 1
#define VERSION_MINOR 7
#define VERSION_PATCH 0
-#define VERSION_EXTRA "110-gedc9a4687"
+#define VERSION_EXTRA "133-gc6fcb9bb9"
#define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v1.7.0-110-gedc9a4687"
-#define VERSION_STRING " v1.7.0-110-gedc9a4687"
+#define VERSION_STRING_NOSP "v1.7.0-133-gc6fcb9bb9"
+#define VERSION_STRING " v1.7.0-133-gc6fcb9bb9"
