diff options
Diffstat (limited to 'third_party/libaom/source/config')
37 files changed, 228 insertions, 30 deletions
diff --git a/third_party/libaom/source/config/config/aom_version.h b/third_party/libaom/source/config/config/aom_version.h index 9c9e03e384..d62ceb34f7 100644 --- 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_MINOR 0 -#define VERSION_PATCH 2 -#define VERSION_EXTRA "1395-g79b775799" +#define VERSION_MAJOR 3 +#define VERSION_MINOR 1 +#define VERSION_PATCH 0 +#define VERSION_EXTRA "309-g12287adee" #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.1.0-309-g12287adee" +#define VERSION_STRING " 3.1.0-309-g12287adee" 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 index dcceb2497b..15c20d956a 100644 --- 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 @@ -20,6 +20,7 @@ CONFIG_AV1_ENCODER equ 1 CONFIG_AV1_HIGHBITDEPTH equ 0 CONFIG_AV1_TEMPORAL_DENOISING equ 1 CONFIG_BIG_ENDIAN equ 0 +CONFIG_BITRATE_ACCURACY equ 0 CONFIG_BITSTREAM_DEBUG equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_COLLECT_COMPONENT_TIMING equ 0 @@ -31,6 +32,7 @@ CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 equ 1 CONFIG_DIST_8X8 equ 0 CONFIG_ENTROPY_STATS equ 0 CONFIG_EXCLUDE_SIMD_MISMATCH equ 0 +CONFIG_FRAME_PARALLEL_ENCODE equ 0 CONFIG_GCC equ 1 CONFIG_GCOV equ 0 CONFIG_GPROF equ 0 @@ -46,6 +48,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 +61,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 index 655ca4c8dc..f79ffc6929 100644 --- 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 @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 1 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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/arm-neon/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/ios/arm-neon/config/aom_dsp_rtcd.h index 027c19a09f..e71ec66a00 100644 --- a/third_party/libaom/source/config/ios/arm-neon/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/ios/arm-neon/config/aom_dsp_rtcd.h @@ -3433,6 +3433,17 @@ int64_t aom_sse_neon(const uint8_t* a, int height); #define aom_sse aom_sse_neon +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_c + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, 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 index dcceb2497b..15c20d956a 100644 --- a/third_party/libaom/source/config/ios/arm64/config/aom_config.asm +++ b/third_party/libaom/source/config/ios/arm64/config/aom_config.asm @@ -20,6 +20,7 @@ CONFIG_AV1_ENCODER equ 1 CONFIG_AV1_HIGHBITDEPTH equ 0 CONFIG_AV1_TEMPORAL_DENOISING equ 1 CONFIG_BIG_ENDIAN equ 0 +CONFIG_BITRATE_ACCURACY equ 0 CONFIG_BITSTREAM_DEBUG equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_COLLECT_COMPONENT_TIMING equ 0 @@ -31,6 +32,7 @@ CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 equ 1 CONFIG_DIST_8X8 equ 0 CONFIG_ENTROPY_STATS equ 0 CONFIG_EXCLUDE_SIMD_MISMATCH equ 0 +CONFIG_FRAME_PARALLEL_ENCODE equ 0 CONFIG_GCC equ 1 CONFIG_GCOV equ 0 CONFIG_GPROF equ 0 @@ -46,6 +48,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 +61,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 index 655ca4c8dc..f79ffc6929 100644 --- a/third_party/libaom/source/config/ios/arm64/config/aom_config.h +++ b/third_party/libaom/source/config/ios/arm64/config/aom_config.h @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 1 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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_dsp_rtcd.h b/third_party/libaom/source/config/ios/arm64/config/aom_dsp_rtcd.h index 027c19a09f..e71ec66a00 100644 --- a/third_party/libaom/source/config/ios/arm64/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/ios/arm64/config/aom_dsp_rtcd.h @@ -3433,6 +3433,17 @@ int64_t aom_sse_neon(const uint8_t* a, int height); #define aom_sse aom_sse_neon +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_c + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, 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 index fbaae3b28d..ac5f20f3b1 100644 --- 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 @@ -20,6 +20,7 @@ CONFIG_AV1_ENCODER equ 1 CONFIG_AV1_HIGHBITDEPTH equ 0 CONFIG_AV1_TEMPORAL_DENOISING equ 1 CONFIG_BIG_ENDIAN equ 0 +CONFIG_BITRATE_ACCURACY equ 0 CONFIG_BITSTREAM_DEBUG equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_COLLECT_COMPONENT_TIMING equ 0 @@ -31,6 +32,7 @@ CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 equ 1 CONFIG_DIST_8X8 equ 0 CONFIG_ENTROPY_STATS equ 0 CONFIG_EXCLUDE_SIMD_MISMATCH equ 0 +CONFIG_FRAME_PARALLEL_ENCODE equ 0 CONFIG_GCC equ 1 CONFIG_GCOV equ 0 CONFIG_GPROF equ 0 @@ -46,6 +48,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 +61,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 index adb548aa40..c8e44f4edd 100644 --- 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 @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 1 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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_dsp_rtcd.h b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h index 61141406d2..a4df74d40d 100644 --- a/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h @@ -3813,6 +3813,17 @@ RTCD_EXTERN int64_t (*aom_sse)(const uint8_t* a, int width, int height); +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_c + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, 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 index dcceb2497b..15c20d956a 100644 --- 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 @@ -20,6 +20,7 @@ CONFIG_AV1_ENCODER equ 1 CONFIG_AV1_HIGHBITDEPTH equ 0 CONFIG_AV1_TEMPORAL_DENOISING equ 1 CONFIG_BIG_ENDIAN equ 0 +CONFIG_BITRATE_ACCURACY equ 0 CONFIG_BITSTREAM_DEBUG equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_COLLECT_COMPONENT_TIMING equ 0 @@ -31,6 +32,7 @@ CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 equ 1 CONFIG_DIST_8X8 equ 0 CONFIG_ENTROPY_STATS equ 0 CONFIG_EXCLUDE_SIMD_MISMATCH equ 0 +CONFIG_FRAME_PARALLEL_ENCODE equ 0 CONFIG_GCC equ 1 CONFIG_GCOV equ 0 CONFIG_GPROF equ 0 @@ -46,6 +48,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 +61,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 index 655ca4c8dc..f79ffc6929 100644 --- 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 @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 1 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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_dsp_rtcd.h b/third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h index 027c19a09f..e71ec66a00 100644 --- a/third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h @@ -3433,6 +3433,17 @@ int64_t aom_sse_neon(const uint8_t* a, int height); #define aom_sse aom_sse_neon +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_c + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, 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 index e9000243ad..bc1a95f003 100644 --- a/third_party/libaom/source/config/linux/arm/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.asm @@ -20,6 +20,7 @@ CONFIG_AV1_ENCODER equ 1 CONFIG_AV1_HIGHBITDEPTH equ 0 CONFIG_AV1_TEMPORAL_DENOISING equ 1 CONFIG_BIG_ENDIAN equ 0 +CONFIG_BITRATE_ACCURACY equ 0 CONFIG_BITSTREAM_DEBUG equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_COLLECT_COMPONENT_TIMING equ 0 @@ -31,6 +32,7 @@ CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 equ 1 CONFIG_DIST_8X8 equ 0 CONFIG_ENTROPY_STATS equ 0 CONFIG_EXCLUDE_SIMD_MISMATCH equ 0 +CONFIG_FRAME_PARALLEL_ENCODE equ 0 CONFIG_GCC equ 1 CONFIG_GCOV equ 0 CONFIG_GPROF equ 0 @@ -46,6 +48,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 +61,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 index 0404a4c827..f3ac36f68c 100644 --- a/third_party/libaom/source/config/linux/arm/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm/config/aom_config.h @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 1 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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_dsp_rtcd.h b/third_party/libaom/source/config/linux/arm/config/aom_dsp_rtcd.h index d7b1b04f00..8710d625ed 100644 --- a/third_party/libaom/source/config/linux/arm/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/linux/arm/config/aom_dsp_rtcd.h @@ -2953,6 +2953,17 @@ int64_t aom_sse_c(const uint8_t* a, int height); #define aom_sse aom_sse_c +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_c + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, 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 index dcceb2497b..15c20d956a 100644 --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.asm @@ -20,6 +20,7 @@ CONFIG_AV1_ENCODER equ 1 CONFIG_AV1_HIGHBITDEPTH equ 0 CONFIG_AV1_TEMPORAL_DENOISING equ 1 CONFIG_BIG_ENDIAN equ 0 +CONFIG_BITRATE_ACCURACY equ 0 CONFIG_BITSTREAM_DEBUG equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_COLLECT_COMPONENT_TIMING equ 0 @@ -31,6 +32,7 @@ CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 equ 1 CONFIG_DIST_8X8 equ 0 CONFIG_ENTROPY_STATS equ 0 CONFIG_EXCLUDE_SIMD_MISMATCH equ 0 +CONFIG_FRAME_PARALLEL_ENCODE equ 0 CONFIG_GCC equ 1 CONFIG_GCOV equ 0 CONFIG_GPROF equ 0 @@ -46,6 +48,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 +61,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 index 655ca4c8dc..f79ffc6929 100644 --- a/third_party/libaom/source/config/linux/arm64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/arm64/config/aom_config.h @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 1 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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_dsp_rtcd.h b/third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h index 027c19a09f..e71ec66a00 100644 --- a/third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h @@ -3433,6 +3433,17 @@ int64_t aom_sse_neon(const uint8_t* a, int height); #define aom_sse aom_sse_neon +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_c + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, 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 index 0e681a032e..24b965dfb3 100644 --- a/third_party/libaom/source/config/linux/generic/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.asm @@ -20,6 +20,7 @@ CONFIG_AV1_ENCODER equ 1 CONFIG_AV1_HIGHBITDEPTH equ 0 CONFIG_AV1_TEMPORAL_DENOISING equ 1 CONFIG_BIG_ENDIAN equ 0 +CONFIG_BITRATE_ACCURACY equ 0 CONFIG_BITSTREAM_DEBUG equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_COLLECT_COMPONENT_TIMING equ 0 @@ -31,6 +32,7 @@ CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 equ 1 CONFIG_DIST_8X8 equ 0 CONFIG_ENTROPY_STATS equ 0 CONFIG_EXCLUDE_SIMD_MISMATCH equ 0 +CONFIG_FRAME_PARALLEL_ENCODE equ 0 CONFIG_GCC equ 1 CONFIG_GCOV equ 0 CONFIG_GPROF equ 0 @@ -46,6 +48,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 +61,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 index 0e1665a47e..cdb4794210 100644 --- a/third_party/libaom/source/config/linux/generic/config/aom_config.h +++ b/third_party/libaom/source/config/linux/generic/config/aom_config.h @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 1 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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_dsp_rtcd.h b/third_party/libaom/source/config/linux/generic/config/aom_dsp_rtcd.h index 05bfa838bb..702c1b809e 100644 --- a/third_party/libaom/source/config/linux/generic/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/linux/generic/config/aom_dsp_rtcd.h @@ -2953,6 +2953,17 @@ int64_t aom_sse_c(const uint8_t* a, int height); #define aom_sse aom_sse_c +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_c + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, 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 index d8ec860317..f4e2dfb836 100644 --- a/third_party/libaom/source/config/linux/ia32/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.asm @@ -10,6 +10,7 @@ %define CONFIG_AV1_HIGHBITDEPTH 0 %define CONFIG_AV1_TEMPORAL_DENOISING 1 %define CONFIG_BIG_ENDIAN 0 +%define CONFIG_BITRATE_ACCURACY 0 %define CONFIG_BITSTREAM_DEBUG 0 %define CONFIG_COEFFICIENT_RANGE_CHECKING 0 %define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -21,6 +22,7 @@ %define CONFIG_DIST_8X8 0 %define CONFIG_ENTROPY_STATS 0 %define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +%define CONFIG_FRAME_PARALLEL_ENCODE 0 %define CONFIG_GCC 1 %define CONFIG_GCOV 0 %define CONFIG_GPROF 0 @@ -36,6 +38,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 +51,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 index 53666caafa..1b3bba6797 100644 --- a/third_party/libaom/source/config/linux/ia32/config/aom_config.h +++ b/third_party/libaom/source/config/linux/ia32/config/aom_config.h @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 1 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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_dsp_rtcd.h b/third_party/libaom/source/config/linux/ia32/config/aom_dsp_rtcd.h index 64bc1f4056..323c55e888 100644 --- a/third_party/libaom/source/config/linux/ia32/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/linux/ia32/config/aom_dsp_rtcd.h @@ -6787,6 +6787,17 @@ RTCD_EXTERN int64_t (*aom_sse)(const uint8_t* a, int width, int height); +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_c + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, 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 index 0fdb4ea1e8..b15994bbd7 100644 --- a/third_party/libaom/source/config/linux/x64/config/aom_config.asm +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.asm @@ -10,6 +10,7 @@ %define CONFIG_AV1_HIGHBITDEPTH 0 %define CONFIG_AV1_TEMPORAL_DENOISING 1 %define CONFIG_BIG_ENDIAN 0 +%define CONFIG_BITRATE_ACCURACY 0 %define CONFIG_BITSTREAM_DEBUG 0 %define CONFIG_COEFFICIENT_RANGE_CHECKING 0 %define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -21,6 +22,7 @@ %define CONFIG_DIST_8X8 0 %define CONFIG_ENTROPY_STATS 0 %define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +%define CONFIG_FRAME_PARALLEL_ENCODE 0 %define CONFIG_GCC 1 %define CONFIG_GCOV 0 %define CONFIG_GPROF 0 @@ -36,6 +38,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 +51,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 index d026bc215f..d090f8398a 100644 --- a/third_party/libaom/source/config/linux/x64/config/aom_config.h +++ b/third_party/libaom/source/config/linux/x64/config/aom_config.h @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 1 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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_dsp_rtcd.h b/third_party/libaom/source/config/linux/x64/config/aom_dsp_rtcd.h index 58de231219..dd561e4498 100644 --- a/third_party/libaom/source/config/linux/x64/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/linux/x64/config/aom_dsp_rtcd.h @@ -6814,6 +6814,26 @@ RTCD_EXTERN int64_t (*aom_sse)(const uint8_t* a, int width, int height); +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +void aom_ssim_parms_8x8_sse2(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_sse2 + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, 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 index dcceb2497b..15c20d956a 100644 --- a/third_party/libaom/source/config/win/arm64/config/aom_config.asm +++ b/third_party/libaom/source/config/win/arm64/config/aom_config.asm @@ -20,6 +20,7 @@ CONFIG_AV1_ENCODER equ 1 CONFIG_AV1_HIGHBITDEPTH equ 0 CONFIG_AV1_TEMPORAL_DENOISING equ 1 CONFIG_BIG_ENDIAN equ 0 +CONFIG_BITRATE_ACCURACY equ 0 CONFIG_BITSTREAM_DEBUG equ 0 CONFIG_COEFFICIENT_RANGE_CHECKING equ 0 CONFIG_COLLECT_COMPONENT_TIMING equ 0 @@ -31,6 +32,7 @@ CONFIG_DISABLE_FULL_PIXEL_SPLIT_8X8 equ 1 CONFIG_DIST_8X8 equ 0 CONFIG_ENTROPY_STATS equ 0 CONFIG_EXCLUDE_SIMD_MISMATCH equ 0 +CONFIG_FRAME_PARALLEL_ENCODE equ 0 CONFIG_GCC equ 1 CONFIG_GCOV equ 0 CONFIG_GPROF equ 0 @@ -46,6 +48,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 +61,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 index 5ca170928b..c744a45ff4 100644 --- a/third_party/libaom/source/config/win/arm64/config/aom_config.h +++ b/third_party/libaom/source/config/win/arm64/config/aom_config.h @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 0 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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_dsp_rtcd.h b/third_party/libaom/source/config/win/arm64/config/aom_dsp_rtcd.h index 027c19a09f..e71ec66a00 100644 --- a/third_party/libaom/source/config/win/arm64/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/win/arm64/config/aom_dsp_rtcd.h @@ -3433,6 +3433,17 @@ int64_t aom_sse_neon(const uint8_t* a, int height); #define aom_sse aom_sse_neon +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_c + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, 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 index 789f7c98f7..ad1912f54d 100644 --- a/third_party/libaom/source/config/win/ia32/config/aom_config.asm +++ b/third_party/libaom/source/config/win/ia32/config/aom_config.asm @@ -10,6 +10,7 @@ %define CONFIG_AV1_HIGHBITDEPTH 0 %define CONFIG_AV1_TEMPORAL_DENOISING 1 %define CONFIG_BIG_ENDIAN 0 +%define CONFIG_BITRATE_ACCURACY 0 %define CONFIG_BITSTREAM_DEBUG 0 %define CONFIG_COEFFICIENT_RANGE_CHECKING 0 %define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -21,6 +22,7 @@ %define CONFIG_DIST_8X8 0 %define CONFIG_ENTROPY_STATS 0 %define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +%define CONFIG_FRAME_PARALLEL_ENCODE 0 %define CONFIG_GCC 0 %define CONFIG_GCOV 0 %define CONFIG_GPROF 0 @@ -36,6 +38,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 +51,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 index e9cafd4296..044ba296e6 100644 --- a/third_party/libaom/source/config/win/ia32/config/aom_config.h +++ b/third_party/libaom/source/config/win/ia32/config/aom_config.h @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 0 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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_dsp_rtcd.h b/third_party/libaom/source/config/win/ia32/config/aom_dsp_rtcd.h index 64bc1f4056..323c55e888 100644 --- a/third_party/libaom/source/config/win/ia32/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/win/ia32/config/aom_dsp_rtcd.h @@ -6787,6 +6787,17 @@ RTCD_EXTERN int64_t (*aom_sse)(const uint8_t* a, int width, int height); +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_c + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, diff --git a/third_party/libaom/source/config/win/x64/config/aom_config.asm b/third_party/libaom/source/config/win/x64/config/aom_config.asm index bdebbbe6b3..f3e1660a08 100644 --- a/third_party/libaom/source/config/win/x64/config/aom_config.asm +++ b/third_party/libaom/source/config/win/x64/config/aom_config.asm @@ -10,6 +10,7 @@ %define CONFIG_AV1_HIGHBITDEPTH 0 %define CONFIG_AV1_TEMPORAL_DENOISING 1 %define CONFIG_BIG_ENDIAN 0 +%define CONFIG_BITRATE_ACCURACY 0 %define CONFIG_BITSTREAM_DEBUG 0 %define CONFIG_COEFFICIENT_RANGE_CHECKING 0 %define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -21,6 +22,7 @@ %define CONFIG_DIST_8X8 0 %define CONFIG_ENTROPY_STATS 0 %define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +%define CONFIG_FRAME_PARALLEL_ENCODE 0 %define CONFIG_GCC 0 %define CONFIG_GCOV 0 %define CONFIG_GPROF 0 @@ -36,6 +38,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 +51,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/x64/config/aom_config.h b/third_party/libaom/source/config/win/x64/config/aom_config.h index 6187935081..1adc7b7407 100644 --- a/third_party/libaom/source/config/win/x64/config/aom_config.h +++ b/third_party/libaom/source/config/win/x64/config/aom_config.h @@ -22,6 +22,7 @@ #define CONFIG_AV1_HIGHBITDEPTH 0 #define CONFIG_AV1_TEMPORAL_DENOISING 1 #define CONFIG_BIG_ENDIAN 0 +#define CONFIG_BITRATE_ACCURACY 0 #define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_COLLECT_COMPONENT_TIMING 0 @@ -33,6 +34,7 @@ #define CONFIG_DIST_8X8 0 #define CONFIG_ENTROPY_STATS 0 #define CONFIG_EXCLUDE_SIMD_MISMATCH 0 +#define CONFIG_FRAME_PARALLEL_ENCODE 0 #define CONFIG_GCC 0 #define CONFIG_GCOV 0 #define CONFIG_GPROF 0 @@ -48,6 +50,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 +63,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/x64/config/aom_dsp_rtcd.h b/third_party/libaom/source/config/win/x64/config/aom_dsp_rtcd.h index 58de231219..dd561e4498 100644 --- a/third_party/libaom/source/config/win/x64/config/aom_dsp_rtcd.h +++ b/third_party/libaom/source/config/win/x64/config/aom_dsp_rtcd.h @@ -6814,6 +6814,26 @@ RTCD_EXTERN int64_t (*aom_sse)(const uint8_t* a, int width, int height); +void aom_ssim_parms_8x8_c(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +void aom_ssim_parms_8x8_sse2(const uint8_t* s, + int sp, + const uint8_t* r, + int rp, + uint32_t* sum_s, + uint32_t* sum_r, + uint32_t* sum_sq_s, + uint32_t* sum_sq_r, + uint32_t* sum_sxr); +#define aom_ssim_parms_8x8 aom_ssim_parms_8x8_sse2 + uint32_t aom_sub_pixel_avg_variance128x128_c(const uint8_t* src_ptr, int source_stride, int xoffset, |