Roll src/third_party/libvpx/source/libvpx/ b8d86733e..412547ad4 (16 commits)

https://chromium.googlesource.com/webm/libvpx.git/+log/b8d86733e9d9..412547ad4b75

$ git log b8d86733e..412547ad4 --date=short --no-merges --format='%ad %ae %s'
2019-10-09 angiebird Refactor calc_frame_boost()
2019-10-09 angiebird Add first_pass_info in TWO_PASS
2019-10-09 angiebird Refactor get_prediction_decay_rate()
2019-10-09 angiebird Replace cpi by frame_info in get_sr_decay_rate()
2019-10-09 angiebird Change the interface of calc_frame_boost
2019-10-09 angiebird Use frame_info in calculate_active_area
2019-10-09 angiebird Add FRAME_INFO into VP9_COMP
2019-10-08 angiebird Add detect_flash_from_frame_stats()
2019-10-04 jianj vp9: fix non bitexact when reuse_inter_pred is 0.
2019-10-03 hienho vp9/common/vp9_reconinter: fix int sanitizer warnings
2019-10-01 hienho vpx_dsp/quantize: fix int sanitizer warnings
2019-10-01 hienho vp9/decoder/vp9_detokenize: fix int sanitizer warnings
2019-09-28 jzern namespace ARCH_* defines
2019-09-27 jianj Fix python3 format issue
2019-09-20 marpan vp9-rtc: Fix to speed 4 for real-time mode
2019-09-19 angiebird Remove USE_PQSORT and CHANGE_MV_SEARCH_ORDER

Created with:
  roll-dep src/third_party/libvpx/source/libvpx
R=johannkoenig@google.com

Change-Id: Idb64446d8484a2ebacc8a295b1cb3d91219a5bb4
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1857584Reviewed-by: Johann Koenig <johannkoenig@google.com>
Commit-Queue: Jerome Jiang <jianj@google.com>
Cr-Commit-Position: refs/heads/master@{#706097}

DEPS

@@ -1169,7 +1169,7 @@ deps = {
   },
 
   'src/third_party/libvpx/source/libvpx':
-    Var('chromium_git') + '/webm/libvpx.git' + '@' +  'b8d86733e9d9c58e17028720751f96dad2df7a09',
+    Var('chromium_git') + '/webm/libvpx.git' + '@' +  '412547ad4b759e139b626f523b313c87debc6639',
 
   'src/third_party/libwebm/source':
     Var('chromium_git') + '/webm/libwebm.git' + '@' + '51ca718c3adf0ddedacd7df25fe45f67dc5a9ce1',

third_party/libvpx/README.chromium

@@ -5,9 +5,9 @@ License: BSD
 License File: source/libvpx/LICENSE
 Security Critical: yes
 
-Date: Friday September 20 2019
+Date: Thursday October 10 2019
 Branch: master
-Commit: b8d86733e9d9c58e17028720751f96dad2df7a09
+Commit: 412547ad4b759e139b626f523b313c87debc6639
 
 Description:
 Contains the sources used to compile libvpx binaries used by Google Chrome and

third_party/libvpx/source/config/ios/arm-neon/vpx_config.asm

@@ -2,11 +2,11 @@
 @  using the ads2gas_apple.pl script.
 
 	.syntax unified
-.set ARCH_ARM ,  1
-.set ARCH_MIPS ,  0
-.set ARCH_X86 ,  0
-.set ARCH_X86_64 ,  0
-.set ARCH_PPC ,  0
+.set VPX_ARCH_ARM ,  1
+.set VPX_ARCH_MIPS ,  0
+.set VPX_ARCH_X86 ,  0
+.set VPX_ARCH_X86_64 ,  0
+.set VPX_ARCH_PPC ,  0
 .set HAVE_NEON ,  1
 .set HAVE_NEON_ASM ,  1
 .set HAVE_MIPS32 ,  0

third_party/libvpx/source/config/ios/arm-neon/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 1
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 1
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 1
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/ios/arm64/vpx_config.asm

@@ -2,11 +2,11 @@
 @  using the ads2gas_apple.pl script.
 
 	.syntax unified
-.set ARCH_ARM ,  1
-.set ARCH_MIPS ,  0
-.set ARCH_X86 ,  0
-.set ARCH_X86_64 ,  0
-.set ARCH_PPC ,  0
+.set VPX_ARCH_ARM ,  1
+.set VPX_ARCH_MIPS ,  0
+.set VPX_ARCH_X86 ,  0
+.set VPX_ARCH_X86_64 ,  0
+.set VPX_ARCH_PPC ,  0
 .set HAVE_NEON ,  1
 .set HAVE_NEON_ASM ,  0
 .set HAVE_MIPS32 ,  0

third_party/libvpx/source/config/ios/arm64/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 1
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 1
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_config.asm

 @ This file was created from a .asm file
 @  using the ads2gas.pl script.
 	.syntax unified
-.equ ARCH_ARM ,  1
-.equ ARCH_MIPS ,  0
-.equ ARCH_X86 ,  0
-.equ ARCH_X86_64 ,  0
-.equ ARCH_PPC ,  0
+.equ VPX_ARCH_ARM ,  1
+.equ VPX_ARCH_MIPS ,  0
+.equ VPX_ARCH_X86 ,  0
+.equ VPX_ARCH_X86_64 ,  0
+.equ VPX_ARCH_PPC ,  0
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  1
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm-neon-cpu-detect/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 1
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 1
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 1
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm-neon-highbd/vpx_config.asm

 @ This file was created from a .asm file
 @  using the ads2gas.pl script.
 	.syntax unified
-.equ ARCH_ARM ,  1
-.equ ARCH_MIPS ,  0
-.equ ARCH_X86 ,  0
-.equ ARCH_X86_64 ,  0
-.equ ARCH_PPC ,  0
+.equ VPX_ARCH_ARM ,  1
+.equ VPX_ARCH_MIPS ,  0
+.equ VPX_ARCH_X86 ,  0
+.equ VPX_ARCH_X86_64 ,  0
+.equ VPX_ARCH_PPC ,  0
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  1
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm-neon-highbd/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 1
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 1
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 1
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm-neon/vpx_config.asm

 @ This file was created from a .asm file
 @  using the ads2gas.pl script.
 	.syntax unified
-.equ ARCH_ARM ,  1
-.equ ARCH_MIPS ,  0
-.equ ARCH_X86 ,  0
-.equ ARCH_X86_64 ,  0
-.equ ARCH_PPC ,  0
+.equ VPX_ARCH_ARM ,  1
+.equ VPX_ARCH_MIPS ,  0
+.equ VPX_ARCH_X86 ,  0
+.equ VPX_ARCH_X86_64 ,  0
+.equ VPX_ARCH_PPC ,  0
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  1
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm-neon/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 1
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 1
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 1
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm/vpx_config.asm

 @ This file was created from a .asm file
 @  using the ads2gas.pl script.
 	.syntax unified
-.equ ARCH_ARM ,  1
-.equ ARCH_MIPS ,  0
-.equ ARCH_X86 ,  0
-.equ ARCH_X86_64 ,  0
-.equ ARCH_PPC ,  0
+.equ VPX_ARCH_ARM ,  1
+.equ VPX_ARCH_MIPS ,  0
+.equ VPX_ARCH_X86 ,  0
+.equ VPX_ARCH_X86_64 ,  0
+.equ VPX_ARCH_PPC ,  0
 .equ HAVE_NEON ,  0
 .equ HAVE_NEON_ASM ,  0
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 1
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 1
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm64-highbd/vpx_config.asm

 @ This file was created from a .asm file
 @  using the ads2gas.pl script.
 	.syntax unified
-.equ ARCH_ARM ,  1
-.equ ARCH_MIPS ,  0
-.equ ARCH_X86 ,  0
-.equ ARCH_X86_64 ,  0
-.equ ARCH_PPC ,  0
+.equ VPX_ARCH_ARM ,  1
+.equ VPX_ARCH_MIPS ,  0
+.equ VPX_ARCH_X86 ,  0
+.equ VPX_ARCH_X86_64 ,  0
+.equ VPX_ARCH_PPC ,  0
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  0
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm64-highbd/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 1
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 1
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/arm64/vpx_config.asm

 @ This file was created from a .asm file
 @  using the ads2gas.pl script.
 	.syntax unified
-.equ ARCH_ARM ,  1
-.equ ARCH_MIPS ,  0
-.equ ARCH_X86 ,  0
-.equ ARCH_X86_64 ,  0
-.equ ARCH_PPC ,  0
+.equ VPX_ARCH_ARM ,  1
+.equ VPX_ARCH_MIPS ,  0
+.equ VPX_ARCH_X86 ,  0
+.equ VPX_ARCH_X86_64 ,  0
+.equ VPX_ARCH_PPC ,  0
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  0
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/arm64/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 1
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 1
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/generic/vpx_config.asm

 @ This file was created from a .asm file
 @  using the ads2gas.pl script.
 	.syntax unified
-.equ ARCH_ARM ,  0
-.equ ARCH_MIPS ,  0
-.equ ARCH_X86 ,  0
-.equ ARCH_X86_64 ,  0
-.equ ARCH_PPC ,  0
+.equ VPX_ARCH_ARM ,  0
+.equ VPX_ARCH_MIPS ,  0
+.equ VPX_ARCH_X86 ,  0
+.equ VPX_ARCH_X86_64 ,  0
+.equ VPX_ARCH_PPC ,  0
 .equ HAVE_NEON ,  0
 .equ HAVE_NEON_ASM ,  0
 .equ HAVE_MIPS32 ,  0

third_party/libvpx/source/config/linux/generic/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 0
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 0
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/ia32/vpx_config.asm

-%define ARCH_ARM 0
-%define ARCH_MIPS 0
-%define ARCH_X86 1
-%define ARCH_X86_64 0
-%define ARCH_PPC 0
+%define VPX_ARCH_ARM 0
+%define VPX_ARCH_MIPS 0
+%define VPX_ARCH_X86 1
+%define VPX_ARCH_X86_64 0
+%define VPX_ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/ia32/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 0
-#define ARCH_MIPS 0
-#define ARCH_X86 1
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 0
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 1
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/mips64el/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 0
-#define ARCH_MIPS 1
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 0
+#define VPX_ARCH_MIPS 1
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/mipsel/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 0
-#define ARCH_MIPS 1
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 0
+#define VPX_ARCH_MIPS 1
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 1

third_party/libvpx/source/config/linux/x64/vpx_config.asm

-%define ARCH_ARM 0
-%define ARCH_MIPS 0
-%define ARCH_X86 0
-%define ARCH_X86_64 1
-%define ARCH_PPC 0
+%define VPX_ARCH_ARM 0
+%define VPX_ARCH_MIPS 0
+%define VPX_ARCH_X86 0
+%define VPX_ARCH_X86_64 1
+%define VPX_ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/linux/x64/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 0
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 1
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 0
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 1
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/mac/ia32/vpx_config.asm

-%define ARCH_ARM 0
-%define ARCH_MIPS 0
-%define ARCH_X86 1
-%define ARCH_X86_64 0
-%define ARCH_PPC 0
+%define VPX_ARCH_ARM 0
+%define VPX_ARCH_MIPS 0
+%define VPX_ARCH_X86 1
+%define VPX_ARCH_X86_64 0
+%define VPX_ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/mac/ia32/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 0
-#define ARCH_MIPS 0
-#define ARCH_X86 1
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 0
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 1
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/mac/x64/vpx_config.asm

-%define ARCH_ARM 0
-%define ARCH_MIPS 0
-%define ARCH_X86 0
-%define ARCH_X86_64 1
-%define ARCH_PPC 0
+%define VPX_ARCH_ARM 0
+%define VPX_ARCH_MIPS 0
+%define VPX_ARCH_X86 0
+%define VPX_ARCH_X86_64 1
+%define VPX_ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/mac/x64/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 0
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 1
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 0
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 1
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/nacl/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
-#define ARCH_ARM 0
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 0
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/vpx_version.h

@@ -2,7 +2,7 @@
 #define VERSION_MAJOR  1
 #define VERSION_MINOR  8
 #define VERSION_PATCH  1
-#define VERSION_EXTRA  "139-gb8d86733e9"
+#define VERSION_EXTRA  "160-g412547ad4b"
 #define VERSION_PACKED ((VERSION_MAJOR<<16)|(VERSION_MINOR<<8)|(VERSION_PATCH))
-#define VERSION_STRING_NOSP "v1.8.1-139-gb8d86733e9"
-#define VERSION_STRING      " v1.8.1-139-gb8d86733e9"
+#define VERSION_STRING_NOSP "v1.8.1-160-g412547ad4b"
+#define VERSION_STRING      " v1.8.1-160-g412547ad4b"

third_party/libvpx/source/config/win/arm64/vpx_config.asm

@@ -2,11 +2,11 @@
 @  using the ads2gas_apple.pl script.
 
 	.syntax unified
-.set ARCH_ARM ,  1
-.set ARCH_MIPS ,  0
-.set ARCH_X86 ,  0
-.set ARCH_X86_64 ,  0
-.set ARCH_PPC ,  0
+.set VPX_ARCH_ARM ,  1
+.set VPX_ARCH_MIPS ,  0
+.set VPX_ARCH_X86 ,  0
+.set VPX_ARCH_X86_64 ,  0
+.set VPX_ARCH_PPC ,  0
 .set HAVE_NEON ,  1
 .set HAVE_NEON_ASM ,  0
 .set HAVE_MIPS32 ,  0

third_party/libvpx/source/config/win/arm64/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      __inline
-#define ARCH_ARM 1
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 1
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/win/ia32/vpx_config.asm

-%define ARCH_ARM 0
-%define ARCH_MIPS 0
-%define ARCH_X86 1
-%define ARCH_X86_64 0
-%define ARCH_PPC 0
+%define VPX_ARCH_ARM 0
+%define VPX_ARCH_MIPS 0
+%define VPX_ARCH_X86 1
+%define VPX_ARCH_X86_64 0
+%define VPX_ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/win/ia32/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      __inline
-#define ARCH_ARM 0
-#define ARCH_MIPS 0
-#define ARCH_X86 1
-#define ARCH_X86_64 0
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 0
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 1
+#define VPX_ARCH_X86_64 0
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0

third_party/libvpx/source/config/win/x64/vpx_config.asm

-%define ARCH_ARM 0
-%define ARCH_MIPS 0
-%define ARCH_X86 0
-%define ARCH_X86_64 1
-%define ARCH_PPC 0
+%define VPX_ARCH_ARM 0
+%define VPX_ARCH_MIPS 0
+%define VPX_ARCH_X86 0
+%define VPX_ARCH_X86_64 1
+%define VPX_ARCH_PPC 0
 %define HAVE_NEON 0
 %define HAVE_NEON_ASM 0
 %define HAVE_MIPS32 0

third_party/libvpx/source/config/win/x64/vpx_config.h

@@ -10,11 +10,11 @@
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      __inline
-#define ARCH_ARM 0
-#define ARCH_MIPS 0
-#define ARCH_X86 0
-#define ARCH_X86_64 1
-#define ARCH_PPC 0
+#define VPX_ARCH_ARM 0
+#define VPX_ARCH_MIPS 0
+#define VPX_ARCH_X86 0
+#define VPX_ARCH_X86_64 1
+#define VPX_ARCH_PPC 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0