From 146d14993fd373242c32d7696f1e148f121b96a4 Mon Sep 17 00:00:00 2001 From: Jerome Jiang Date: Wed, 14 Mar 2018 00:32:48 +0000 Subject: [PATCH] Roll src/third_party/libvpx/source/libvpx/ c6fcb9bb9..7b5a57449 (9 commits) https://chromium.googlesource.com/webm/libvpx.git/+log/c6fcb9bb94ea..7b5a57449ba0 $ git log c6fcb9bb9..7b5a57449 --date=short --no-merges --format='%ad %ae %s' 2017-01-31 johannkoenig vp8 temporal_filter: ignore return value 2018-03-12 marpan vp9-svc: Update layer frame counters when layer is skipped. 2018-03-11 marpan vp9-SVC: Fix to choose_partition when LAST ref is NULL. 2018-03-07 jzern vpx_scale_test: add w/h output to alloc failure 2018-03-05 johannkoenig add worst-case frame size cap 2018-03-05 linfengz Fix a bug in vp9_iht16x16_256_add_neon() 2018-03-05 linfengz Fix a bug in vp9_iht8x8_64_add_neon() 2018-03-04 johannkoenig move vp8 encodeopt to block_error_sse2 2018-02-21 paulwilkins Change to KF frame boost calculation. Created with: roll-dep src/third_party/libvpx/source/libvpx R=johannkoenig@google.com BUG=webm:1503 Change-Id: I771065a1f26ad711d6b2f55c769354028ac47ef7 Reviewed-on: https://chromium-review.googlesource.com/961368 Reviewed-by: Johann Koenig Commit-Queue: Jerome Jiang Cr-Commit-Position: refs/heads/master@{#542968} --- DEPS | 2 +- third_party/libvpx/README.chromium | 4 ++-- third_party/libvpx/libvpx_srcs.gni | 4 ++-- .../source/config/ios/arm-neon/vp9_rtcd.h | 12 ++++++++-- .../libvpx/source/config/ios/arm64/vp9_rtcd.h | 12 ++++++++-- .../linux/arm-neon-cpu-detect/vp9_rtcd.h | 24 +++++++++++++++++-- .../source/config/linux/arm-neon/vp9_rtcd.h | 12 ++++++++-- .../source/config/linux/arm64/vp9_rtcd.h | 12 ++++++++-- .../libvpx/source/config/vpx_version.h | 6 ++--- 9 files changed, 70 insertions(+), 18 deletions(-) diff --git a/DEPS b/DEPS index 4471dd56960179..8d19bbd60e8f2c 100644 --- a/DEPS +++ b/DEPS @@ -489,7 +489,7 @@ deps = { }, 'src/third_party/libvpx/source/libvpx': - Var('chromium_git') + '/webm/libvpx.git' + '@' + 'c6fcb9bb94ea02324d9d842b71ac3d0ab0329c10', + Var('chromium_git') + '/webm/libvpx.git' + '@' + '7b5a57449ba07f35cc400516d311ce88c49dce9a', '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 324dd01a9b7387..fc28ad82cf8e35 100644 --- a/third_party/libvpx/README.chromium +++ b/third_party/libvpx/README.chromium @@ -5,9 +5,9 @@ License: BSD License File: source/libvpx/LICENSE Security Critical: yes -Date: Saturday March 03 2018 +Date: Monday March 12 2018 Branch: master -Commit: c6fcb9bb94ea02324d9d842b71ac3d0ab0329c10 +Commit: 7b5a57449ba07f35cc400516d311ce88c49dce9a 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 dbba94e3220704..eff8642ca94494 100644 --- a/third_party/libvpx/libvpx_srcs.gni +++ b/third_party/libvpx/libvpx_srcs.gni @@ -377,8 +377,8 @@ libvpx_srcs_x86_assembly = [ "//third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_mmx.asm", "//third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_sse2.asm", "//third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_ssse3.asm", + "//third_party/libvpx/source/libvpx/vp8/encoder/x86/block_error_sse2.asm", "//third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_sse2.asm", - "//third_party/libvpx/source/libvpx/vp8/encoder/x86/encodeopt.asm", "//third_party/libvpx/source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm", "//third_party/libvpx/source/libvpx/vp9/common/x86/vp9_mfqe_sse2.asm", "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_sse2.asm", @@ -850,8 +850,8 @@ libvpx_srcs_x86_64_assembly = [ "//third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_mmx.asm", "//third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_sse2.asm", "//third_party/libvpx/source/libvpx/vp8/common/x86/subpixel_ssse3.asm", + "//third_party/libvpx/source/libvpx/vp8/encoder/x86/block_error_sse2.asm", "//third_party/libvpx/source/libvpx/vp8/encoder/x86/dct_sse2.asm", - "//third_party/libvpx/source/libvpx/vp8/encoder/x86/encodeopt.asm", "//third_party/libvpx/source/libvpx/vp8/encoder/x86/fwalsh_sse2.asm", "//third_party/libvpx/source/libvpx/vp9/common/x86/vp9_mfqe_sse2.asm", "//third_party/libvpx/source/libvpx/vp9/encoder/x86/vp9_dct_sse2.asm", 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 4df63fcec1a591..309c78087459f2 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 @@ -143,7 +143,11 @@ void vp9_iht16x16_256_add_c(const tran_low_t* input, uint8_t* output, int pitch, int tx_type); -#define vp9_iht16x16_256_add vp9_iht16x16_256_add_c +void vp9_iht16x16_256_add_neon(const tran_low_t* input, + uint8_t* output, + int pitch, + int tx_type); +#define vp9_iht16x16_256_add vp9_iht16x16_256_add_neon void vp9_iht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, @@ -159,7 +163,11 @@ void vp9_iht8x8_64_add_c(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_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 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 4df63fcec1a591..309c78087459f2 100644 --- a/third_party/libvpx/source/config/ios/arm64/vp9_rtcd.h +++ b/third_party/libvpx/source/config/ios/arm64/vp9_rtcd.h @@ -143,7 +143,11 @@ void vp9_iht16x16_256_add_c(const tran_low_t* input, uint8_t* output, int pitch, int tx_type); -#define vp9_iht16x16_256_add vp9_iht16x16_256_add_c +void vp9_iht16x16_256_add_neon(const tran_low_t* input, + uint8_t* output, + int pitch, + int tx_type); +#define vp9_iht16x16_256_add vp9_iht16x16_256_add_neon void vp9_iht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, @@ -159,7 +163,11 @@ void vp9_iht8x8_64_add_c(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_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 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 25b8930cd36f55..28fa6b5740c322 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 @@ -165,7 +165,14 @@ void vp9_iht16x16_256_add_c(const tran_low_t* input, uint8_t* output, int pitch, int tx_type); -#define vp9_iht16x16_256_add vp9_iht16x16_256_add_c +void vp9_iht16x16_256_add_neon(const tran_low_t* input, + uint8_t* output, + int pitch, + int tx_type); +RTCD_EXTERN void (*vp9_iht16x16_256_add)(const tran_low_t* input, + uint8_t* output, + int pitch, + int tx_type); void vp9_iht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, @@ -184,7 +191,14 @@ void vp9_iht8x8_64_add_c(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_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); void vp9_quantize_fp_c(const tran_low_t* coeff_ptr, intptr_t n_coeffs, @@ -288,9 +302,15 @@ static void setup_rtcd_internal(void) { vp9_fdct8x8_quant = vp9_fdct8x8_quant_c; if (flags & HAS_NEON) vp9_fdct8x8_quant = vp9_fdct8x8_quant_neon; + vp9_iht16x16_256_add = vp9_iht16x16_256_add_c; + if (flags & HAS_NEON) + vp9_iht16x16_256_add = vp9_iht16x16_256_add_neon; 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 4df63fcec1a591..309c78087459f2 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 @@ -143,7 +143,11 @@ void vp9_iht16x16_256_add_c(const tran_low_t* input, uint8_t* output, int pitch, int tx_type); -#define vp9_iht16x16_256_add vp9_iht16x16_256_add_c +void vp9_iht16x16_256_add_neon(const tran_low_t* input, + uint8_t* output, + int pitch, + int tx_type); +#define vp9_iht16x16_256_add vp9_iht16x16_256_add_neon void vp9_iht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, @@ -159,7 +163,11 @@ void vp9_iht8x8_64_add_c(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_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 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 4df63fcec1a591..309c78087459f2 100644 --- a/third_party/libvpx/source/config/linux/arm64/vp9_rtcd.h +++ b/third_party/libvpx/source/config/linux/arm64/vp9_rtcd.h @@ -143,7 +143,11 @@ void vp9_iht16x16_256_add_c(const tran_low_t* input, uint8_t* output, int pitch, int tx_type); -#define vp9_iht16x16_256_add vp9_iht16x16_256_add_c +void vp9_iht16x16_256_add_neon(const tran_low_t* input, + uint8_t* output, + int pitch, + int tx_type); +#define vp9_iht16x16_256_add vp9_iht16x16_256_add_neon void vp9_iht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, @@ -159,7 +163,11 @@ void vp9_iht8x8_64_add_c(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_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 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 c49d1dd2bfb051..b793be0dd87d76 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 "133-gc6fcb9bb9" +#define VERSION_EXTRA "146-g7b5a57449" #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH)) -#define VERSION_STRING_NOSP "v1.7.0-133-gc6fcb9bb9" -#define VERSION_STRING " v1.7.0-133-gc6fcb9bb9" +#define VERSION_STRING_NOSP "v1.7.0-146-g7b5a57449" +#define VERSION_STRING " v1.7.0-146-g7b5a57449"