Roll src/third_party/libaom/source/libaom/ 79b775799..0a5da45c7 (65 c…

…ommits) https://aomedia.googlesource.com/aom.git/+log/79b775799699..0a5da45c7f94 $ git log 79b775799..0a5da45c7 --date=short --no-merges --format='%ad %ae %s' 2021-03-25 angiebird Remove txb_coeff_cost_map from RD_STATS 2021-03-17 mufaddal.chakera Move index from GF_GROUP to AV1_COMP 2021-03-22 marpan rtc-svc: Allow for fixed SVC modes 2021-03-25 skal tune vmaf: fix subsampling parameters 2021-03-23 chengchen Correctly count partition rate cost for split 2021-03-23 chengchen Return RD_STATs instead of int64_t 2021-03-24 wtc Delete a void cast in rd_pick_filter_intra_sby 2021-03-22 sarahparker Fix forced keyframe detection 2021-03-22 nithya.vs Disable newmv search for COMPOUND_WEDGE 2021-03-23 chethan.kumar Abstract malloc/dealloc calls of members in MACROBLOCK struct (...) 2021-02-18 bill.wresnahan Add option to skip applying denoising with denoise-noise-level 2021-02-08 wtc Prepare for the libaom v2.0.2 release 2021-02-19 mpkrishnan Fix mismatch for --enable-chroma-deltaq 2021-02-18 angiebird Add aom_clear_system_state() to frame rate funcs 2021-02-12 sanampudi.venkatarao Allocate loop restoration buffers conditionally 2021-02-15 deepa.kg Add call to aom_clear_system_state() 2021-02-04 bohanli Let the key & value API support all entries in av1_args. 2021-02-13 wtc av1_key_value_api_test.cc when BUILD_SHARED_LIBS 2021-02-13 wtc Export aom_codec_set_option from shared libraries 2021-02-22 kyslov AV1 RT: Fix 10 bit enc/dec mismatch Created with: roll-dep src/third_party/libaom/source/libaom R=jzern@google.com Change-Id: Ia109bd120898348cacd79f0ae8f7af37c999b57c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2795929 Commit-Queue: James Zern <jzern@google.com> Reviewed-by: James Zern <jzern@google.com> Cr-Commit-Position: refs/heads/master@{#867936}
chromium · Mar 31, 2021 · f173a03 · f173a03
1 parent 40ce45d
commit f173a03
Show file tree

Hide file tree

Showing 27 changed files with 32 additions and 32 deletions.
diff --git a/DEPS b/DEPS
@@ -1167,7 +1167,7 @@ deps = {
     Var('chromium_git') + '/external/libaddressinput.git' + '@' + '390dfc08e3806a2125d08d4d8d034a24d587d77a',
 
   'src/third_party/libaom/source/libaom':
-    Var('aomedia_git') + '/aom.git' + '@' +  '79b775799699eb00b7d65e9b8892bde1094ae91e',
+    Var('aomedia_git') + '/aom.git' + '@' +  '0a5da45c7f942908974f5ab8e107c9fa82048ae7',
 
   'src/third_party/libavif/src':
     Var('chromium_git') + '/external/github.com/AOMediaCodec/libavif.git' + '@' + Var('libavif_revision'),

diff --git a/third_party/libaom/README.chromium b/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: Tuesday March 16 2021
+Date: Friday March 26 2021
 Branch: master
-Commit: 79b775799699eb00b7d65e9b8892bde1094ae91e
+Commit: 0a5da45c7f942908974f5ab8e107c9fa82048ae7
 License: BSD
 License File: source/libaom/LICENSE
 Security Critical: yes

diff --git a/third_party/libaom/source/config/config/aom_version.h b/third_party/libaom/source/config/config/aom_version.h
@@ -9,11 +9,11 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#define VERSION_MAJOR 2
+#define VERSION_MAJOR 3
 #define VERSION_MINOR 0
-#define VERSION_PATCH 2
-#define VERSION_EXTRA "1395-g79b775799"
+#define VERSION_PATCH 0
+#define VERSION_EXTRA "205-g0a5da45c7"
 #define VERSION_PACKED \
   ((VERSION_MAJOR << 16) | (VERSION_MINOR << 8) | (VERSION_PATCH))
-#define VERSION_STRING_NOSP "2.0.2-1395-g79b775799"
-#define VERSION_STRING " 2.0.2-1395-g79b775799"
+#define VERSION_STRING_NOSP "3.0.0-205-g0a5da45c7"
+#define VERSION_STRING " 3.0.0-205-g0a5da45c7"
diff --git a/third_party/libaom/source/config/ios/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/ios/arm-neon/config/aom_config.asm
@@ -46,6 +46,7 @@ CONFIG_NN_V2 equ 0
 CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_PARTITION_SEARCH_ORDER equ 0
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
 CONFIG_REALTIME_ONLY equ 1
@@ -58,7 +59,6 @@ CONFIG_SPATIAL_RESAMPLING equ 1
 CONFIG_SPEED_STATS equ 0
 CONFIG_TUNE_BUTTERAUGLI equ 0
 CONFIG_TUNE_VMAF equ 0
-CONFIG_USE_VMAF_RC equ 0
 CONFIG_WEBM_IO equ 1
 DECODE_HEIGHT_LIMIT equ 16384
 DECODE_WIDTH_LIMIT equ 16384

diff --git a/third_party/libaom/source/config/ios/arm-neon/config/aom_config.h b/third_party/libaom/source/config/ios/arm-neon/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/ios/arm64/config/aom_config.asm b/third_party/libaom/source/config/ios/arm64/config/aom_config.asm
@@ -46,6 +46,7 @@ CONFIG_NN_V2 equ 0
 CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_PARTITION_SEARCH_ORDER equ 0
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
 CONFIG_REALTIME_ONLY equ 1
@@ -58,7 +59,6 @@ CONFIG_SPATIAL_RESAMPLING equ 1
 CONFIG_SPEED_STATS equ 0
 CONFIG_TUNE_BUTTERAUGLI equ 0
 CONFIG_TUNE_VMAF equ 0
-CONFIG_USE_VMAF_RC equ 0
 CONFIG_WEBM_IO equ 1
 DECODE_HEIGHT_LIMIT equ 16384
 DECODE_WIDTH_LIMIT equ 16384

diff --git a/third_party/libaom/source/config/ios/arm64/config/aom_config.h b/third_party/libaom/source/config/ios/arm64/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
@@ -46,6 +46,7 @@ CONFIG_NN_V2 equ 0
 CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_PARTITION_SEARCH_ORDER equ 0
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
 CONFIG_REALTIME_ONLY equ 1
@@ -58,7 +59,6 @@ CONFIG_SPATIAL_RESAMPLING equ 1
 CONFIG_SPEED_STATS equ 0
 CONFIG_TUNE_BUTTERAUGLI equ 0
 CONFIG_TUNE_VMAF equ 0
-CONFIG_USE_VMAF_RC equ 0
 CONFIG_WEBM_IO equ 1
 DECODE_HEIGHT_LIMIT equ 16384
 DECODE_WIDTH_LIMIT equ 16384

diff --git a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
@@ -46,6 +46,7 @@ CONFIG_NN_V2 equ 0
 CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_PARTITION_SEARCH_ORDER equ 0
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
 CONFIG_REALTIME_ONLY equ 1
@@ -58,7 +59,6 @@ CONFIG_SPATIAL_RESAMPLING equ 1
 CONFIG_SPEED_STATS equ 0
 CONFIG_TUNE_BUTTERAUGLI equ 0
 CONFIG_TUNE_VMAF equ 0
-CONFIG_USE_VMAF_RC equ 0
 CONFIG_WEBM_IO equ 1
 DECODE_HEIGHT_LIMIT equ 16384
 DECODE_WIDTH_LIMIT equ 16384

diff --git a/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/third_party/libaom/source/config/linux/arm/config/aom_config.asm
@@ -46,6 +46,7 @@ CONFIG_NN_V2 equ 0
 CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_PARTITION_SEARCH_ORDER equ 0
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
 CONFIG_REALTIME_ONLY equ 1
@@ -58,7 +59,6 @@ CONFIG_SPATIAL_RESAMPLING equ 1
 CONFIG_SPEED_STATS equ 0
 CONFIG_TUNE_BUTTERAUGLI equ 0
 CONFIG_TUNE_VMAF equ 0
-CONFIG_USE_VMAF_RC equ 0
 CONFIG_WEBM_IO equ 1
 DECODE_HEIGHT_LIMIT equ 16384
 DECODE_WIDTH_LIMIT equ 16384

diff --git a/third_party/libaom/source/config/linux/arm/config/aom_config.h b/third_party/libaom/source/config/linux/arm/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm
@@ -46,6 +46,7 @@ CONFIG_NN_V2 equ 0
 CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_PARTITION_SEARCH_ORDER equ 0
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
 CONFIG_REALTIME_ONLY equ 1
@@ -58,7 +59,6 @@ CONFIG_SPATIAL_RESAMPLING equ 1
 CONFIG_SPEED_STATS equ 0
 CONFIG_TUNE_BUTTERAUGLI equ 0
 CONFIG_TUNE_VMAF equ 0
-CONFIG_USE_VMAF_RC equ 0
 CONFIG_WEBM_IO equ 1
 DECODE_HEIGHT_LIMIT equ 16384
 DECODE_WIDTH_LIMIT equ 16384

diff --git a/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/third_party/libaom/source/config/linux/arm64/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/third_party/libaom/source/config/linux/generic/config/aom_config.asm
@@ -46,6 +46,7 @@ CONFIG_NN_V2 equ 0
 CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_PARTITION_SEARCH_ORDER equ 0
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
 CONFIG_REALTIME_ONLY equ 1
@@ -58,7 +59,6 @@ CONFIG_SPATIAL_RESAMPLING equ 1
 CONFIG_SPEED_STATS equ 0
 CONFIG_TUNE_BUTTERAUGLI equ 0
 CONFIG_TUNE_VMAF equ 0
-CONFIG_USE_VMAF_RC equ 0
 CONFIG_WEBM_IO equ 1
 DECODE_HEIGHT_LIMIT equ 16384
 DECODE_WIDTH_LIMIT equ 16384

diff --git a/third_party/libaom/source/config/linux/generic/config/aom_config.h b/third_party/libaom/source/config/linux/generic/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm
@@ -36,6 +36,7 @@
 %define CONFIG_NORMAL_TILE_MODE 1
 %define CONFIG_OPTICAL_FLOW_API 0
 %define CONFIG_OS_SUPPORT 1
+%define CONFIG_PARTITION_SEARCH_ORDER 0
 %define CONFIG_PIC 1
 %define CONFIG_RD_DEBUG 0
 %define CONFIG_REALTIME_ONLY 1
@@ -48,7 +49,6 @@
 %define CONFIG_SPEED_STATS 0
 %define CONFIG_TUNE_BUTTERAUGLI 0
 %define CONFIG_TUNE_VMAF 0
-%define CONFIG_USE_VMAF_RC 0
 %define CONFIG_WEBM_IO 1
 %define DECODE_HEIGHT_LIMIT 16384
 %define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/linux/ia32/config/aom_config.h b/third_party/libaom/source/config/linux/ia32/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 1
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/third_party/libaom/source/config/linux/x64/config/aom_config.asm
@@ -36,6 +36,7 @@
 %define CONFIG_NORMAL_TILE_MODE 1
 %define CONFIG_OPTICAL_FLOW_API 0
 %define CONFIG_OS_SUPPORT 1
+%define CONFIG_PARTITION_SEARCH_ORDER 0
 %define CONFIG_PIC 0
 %define CONFIG_RD_DEBUG 0
 %define CONFIG_REALTIME_ONLY 1
@@ -48,7 +49,6 @@
 %define CONFIG_SPEED_STATS 0
 %define CONFIG_TUNE_BUTTERAUGLI 0
 %define CONFIG_TUNE_VMAF 0
-%define CONFIG_USE_VMAF_RC 0
 %define CONFIG_WEBM_IO 1
 %define DECODE_HEIGHT_LIMIT 16384
 %define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/linux/x64/config/aom_config.h b/third_party/libaom/source/config/linux/x64/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/win/arm64/config/aom_config.asm b/third_party/libaom/source/config/win/arm64/config/aom_config.asm
@@ -46,6 +46,7 @@ CONFIG_NN_V2 equ 0
 CONFIG_NORMAL_TILE_MODE equ 1
 CONFIG_OPTICAL_FLOW_API equ 0
 CONFIG_OS_SUPPORT equ 1
+CONFIG_PARTITION_SEARCH_ORDER equ 0
 CONFIG_PIC equ 0
 CONFIG_RD_DEBUG equ 0
 CONFIG_REALTIME_ONLY equ 1
@@ -58,7 +59,6 @@ CONFIG_SPATIAL_RESAMPLING equ 1
 CONFIG_SPEED_STATS equ 0
 CONFIG_TUNE_BUTTERAUGLI equ 0
 CONFIG_TUNE_VMAF equ 0
-CONFIG_USE_VMAF_RC equ 0
 CONFIG_WEBM_IO equ 1
 DECODE_HEIGHT_LIMIT equ 16384
 DECODE_WIDTH_LIMIT equ 16384

diff --git a/third_party/libaom/source/config/win/arm64/config/aom_config.h b/third_party/libaom/source/config/win/arm64/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 0
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/win/ia32/config/aom_config.asm b/third_party/libaom/source/config/win/ia32/config/aom_config.asm
@@ -36,6 +36,7 @@
 %define CONFIG_NORMAL_TILE_MODE 1
 %define CONFIG_OPTICAL_FLOW_API 0
 %define CONFIG_OS_SUPPORT 1
+%define CONFIG_PARTITION_SEARCH_ORDER 0
 %define CONFIG_PIC 1
 %define CONFIG_RD_DEBUG 0
 %define CONFIG_REALTIME_ONLY 1
@@ -48,7 +49,6 @@
 %define CONFIG_SPEED_STATS 0
 %define CONFIG_TUNE_BUTTERAUGLI 0
 %define CONFIG_TUNE_VMAF 0
-%define CONFIG_USE_VMAF_RC 0
 %define CONFIG_WEBM_IO 1
 %define DECODE_HEIGHT_LIMIT 16384
 %define DECODE_WIDTH_LIMIT 16384

diff --git a/third_party/libaom/source/config/win/ia32/config/aom_config.h b/third_party/libaom/source/config/win/ia32/config/aom_config.h
@@ -48,6 +48,7 @@
 #define CONFIG_NORMAL_TILE_MODE 1
 #define CONFIG_OPTICAL_FLOW_API 0
 #define CONFIG_OS_SUPPORT 1
+#define CONFIG_PARTITION_SEARCH_ORDER 0
 #define CONFIG_PIC 1
 #define CONFIG_RD_DEBUG 0
 #define CONFIG_REALTIME_ONLY 1
@@ -60,7 +61,6 @@
 #define CONFIG_SPEED_STATS 0
 #define CONFIG_TUNE_BUTTERAUGLI 0
 #define CONFIG_TUNE_VMAF 0
-#define CONFIG_USE_VMAF_RC 0
 #define CONFIG_WEBM_IO 1
 #define DECODE_HEIGHT_LIMIT 16384
 #define DECODE_WIDTH_LIMIT 16384