1 files changed, 38 insertions, 25 deletions

diff --git a/media/libaom/config/generic/aom_config.h b/media/libaom/config/generic/aom_config.h
index 27934329c..6757221e3 100644
--- a/media/libaom/config/generic/aom_config.h
+++ b/media/libaom/config/generic/aom_config.h
@@ -59,8 +59,6 @@
 #define CONFIG_STATIC_MSVCRT 0
 #define CONFIG_SPATIAL_RESAMPLING 1
 #define CONFIG_REALTIME_ONLY 0
-#define CONFIG_ONTHEFLY_BITPACKING 0
-#define CONFIG_ERROR_CONCEALMENT 0
 #define CONFIG_SHARED 0
 #define CONFIG_STATIC 1
 #define CONFIG_SMALL 0
@@ -73,73 +71,71 @@
 #define CONFIG_INSPECTION 0
 #define CONFIG_DECODE_PERF_TESTS 0
 #define CONFIG_ENCODE_PERF_TESTS 0
+#define CONFIG_BITSTREAM_DEBUG 0
+#define CONFIG_SYMBOLRATE 0
 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0
 #define CONFIG_LOWBITDEPTH 1
 #define CONFIG_HIGHBITDEPTH 1
 #define CONFIG_EXPERIMENTAL 0
 #define CONFIG_SIZE_LIMIT 1
-#define CONFIG_COLORSPACE_HEADERS 0
 #define CONFIG_FP_MB_STATS 0
 #define CONFIG_CDEF 1
+#define CONFIG_CDEF_SINGLEPASS 1
 #define CONFIG_VAR_TX 1
 #define CONFIG_RECT_TX 1
 #define CONFIG_RECT_TX_EXT 0
 #define CONFIG_TPL_MV 0
 #define CONFIG_DUAL_FILTER 1
-#define CONFIG_CONVOLVE_ROUND 0
+#define CONFIG_CONVOLVE_ROUND 1
 #define CONFIG_COMPOUND_ROUND 0
 #define CONFIG_EXT_TX 1
-#define CONFIG_DPCM_INTRA 0
 #define CONFIG_TX64X64 0
 #define CONFIG_EXT_INTRA 1
 #define CONFIG_INTRA_INTERP 0
 #define CONFIG_FILTER_INTRA 0
-#define CONFIG_INTRA_EDGE 0
+#define CONFIG_INTRA_EDGE 1
 #define CONFIG_INTRABC 0
-#define CONFIG_EXT_INTER 1
 #define CONFIG_INTERINTRA 1
 #define CONFIG_WEDGE 1
 #define CONFIG_COMPOUND_SEGMENT 1
 #define CONFIG_EXT_REFS 1
-#define CONFIG_ALTREF2 0
-#define CONFIG_SPEED_REFS 0
-#define CONFIG_GF_GROUPS 0
-#define CONFIG_FLEX_REFS 0
 #define CONFIG_GLOBAL_MOTION 1
 #define CONFIG_NEW_QUANT 0
 #define CONFIG_SUPERTX 0
 #define CONFIG_ANS 0
-#define CONFIG_LOOP_RESTORATION 0
+#define CONFIG_LOOP_RESTORATION 1
+#define CONFIG_STRIPED_LOOP_RESTORATION 0
 #define CONFIG_EXT_PARTITION 0
 #define CONFIG_EXT_PARTITION_TYPES 0
+#define CONFIG_EXT_PARTITION_TYPES_AB 0
 #define CONFIG_UNPOISON_PARTITION_CTX 0
 #define CONFIG_EXT_TILE 0
 #define CONFIG_MOTION_VAR 1
 #define CONFIG_NCOBMC 0
 #define CONFIG_WARPED_MOTION 1
 #define CONFIG_Q_ADAPT_PROBS 0
-#define CONFIG_BITSTREAM_DEBUG 0
 #define CONFIG_INTER_STATS_ONLY 0
-#define CONFIG_ALT_INTRA 1
-#define CONFIG_PALETTE 1
 #define CONFIG_PALETTE_DELTA_ENCODING 0
 #define CONFIG_RAWBITS 0
-#define CONFIG_EC_SMALLMUL 1
+#define CONFIG_KF_CTX 0
 #define CONFIG_PVQ 0
 #define CONFIG_CFL 0
 #define CONFIG_XIPHRC 0
 #define CONFIG_DCT_ONLY 0
+#define CONFIG_DAALA_TX 0
 #define CONFIG_DAALA_DCT4 0
 #define CONFIG_DAALA_DCT8 0
+#define CONFIG_DAALA_DCT16 0
+#define CONFIG_DAALA_DCT32 0
+#define CONFIG_DAALA_DCT64 0
 #define CONFIG_CB4X4 1
 #define CONFIG_CHROMA_2X2 0
 #define CONFIG_CHROMA_SUB8X8 1
 #define CONFIG_FRAME_SIZE 0
-#define CONFIG_DELTA_Q 1
 #define CONFIG_EXT_DELTA_Q 1
 #define CONFIG_ADAPT_SCAN 0
-#define CONFIG_FILTER_7BIT 1
 #define CONFIG_PARALLEL_DEBLOCKING 1
+#define CONFIG_DEBLOCK_13TAP 0
 #define CONFIG_LOOPFILTERING_ACROSS_TILES 1
 #define CONFIG_TEMPMV_SIGNALING 1
 #define CONFIG_RD_DEBUG 0
@@ -148,31 +144,48 @@
 #define CONFIG_ENTROPY_STATS 0
 #define CONFIG_MASKED_TX 0
 #define CONFIG_DEPENDENT_HORZTILES 0
-#define CONFIG_DIST_8X8 0
-#define CONFIG_DAALA_DIST 0
-#define CONFIG_TRIPRED 0
+#define CONFIG_DIST_8X8 1
 #define CONFIG_PALETTE_THROUGHPUT 1
 #define CONFIG_REF_ADAPT 0
 #define CONFIG_LV_MAP 0
+#define CONFIG_CTX1D 0
 #define CONFIG_TXK_SEL 0
 #define CONFIG_MV_COMPRESS 1
+#define CONFIG_SEGMENT_ZEROMV 0
 #define CONFIG_FRAME_SUPERRES 0
 #define CONFIG_NEW_MULTISYMBOL 0
 #define CONFIG_COMPOUND_SINGLEREF 0
-#define CONFIG_AOM_QM 0
+#define CONFIG_AOM_QM 1
 #define CONFIG_ONE_SIDED_COMPOUND 1
-#define CONFIG_EXT_COMP_REFS 0
+#define CONFIG_EXT_COMP_REFS 1
 #define CONFIG_SMOOTH_HV 1
 #define CONFIG_VAR_REFS 0
-#define CONFIG_RECT_INTRA_PRED 1
 #define CONFIG_LGT 0
+#define CONFIG_LGT_FROM_PRED 0
 #define CONFIG_SBL_SYMBOL 0
 #define CONFIG_NCOBMC_ADAPT_WEIGHT 0
 #define CONFIG_BGSPRITE 0
 #define CONFIG_VAR_TX_NO_TX_MODE 0
 #define CONFIG_MRC_TX 0
 #define CONFIG_LPF_DIRECT 0
-#define CONFIG_UV_LVL 0
+#define CONFIG_LOOPFILTER_LEVEL 0
+#define CONFIG_NO_FRAME_CONTEXT_SIGNALING 0
+#define CONFIG_TXMG 1
+#define CONFIG_MAX_TILE 0
+#define CONFIG_HASH_ME 0
+#define CONFIG_COLORSPACE_HEADERS 0
+#define CONFIG_MFMV 0
+#define CONFIG_FRAME_MARKER 0
+#define CONFIG_JNT_COMP 0
+#define CONFIG_FRAME_SIGN_BIAS 0
+#define CONFIG_EXT_SKIP 0
+#define CONFIG_OBU 0
+#define CONFIG_AMVR 0
+#define CONFIG_LPF_SB 0
+#define CONFIG_OPT_REF_MV 0
+#define CONFIG_TMV 0
+#define CONFIG_RESTRICT_COMPRESSED_HDR 0
+#define CONFIG_HORZONLY_FRAME_SUPERRES 0
 #define CONFIG_ANALYZER 0
 #define DECODE_WIDTH_LIMIT 8192
 #define DECODE_HEIGHT_LIMIT 4608