diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-10-26 13:57:00 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2021-11-02 11:31:01 +0000 |
| commit | 1943b3c2a1dcee36c233724fc4ee7613d71b9cf6 (patch) | |
| tree | 8c1b5f12357025c197da5427ae02cfdc2f3570d6 /chromium/third_party/libaom/source/config | |
| parent | 21ba0c5d4bf8fba15dddd97cd693bad2358b77fd (diff) | |
| download | qtwebengine-chromium-1943b3c2a1dcee36c233724fc4ee7613d71b9cf6.tar.gz | |
BASELINE: Update Chromium to 94.0.4606.111
Change-Id: I924781584def20fc800bedf6ff41fdb96c438193
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/third_party/libaom/source/config')
49 files changed, 379 insertions, 53 deletions
diff --git a/chromium/third_party/libaom/source/config/config/aom_version.h b/chromium/third_party/libaom/source/config/config/aom_version.h index e8298601041..7fbfae86a27 100644 --- a/chromium/third_party/libaom/source/config/config/aom_version.h +++ b/chromium/third_party/libaom/source/config/config/aom_version.h @@ -10,10 +10,10 @@ */ #define VERSION_MAJOR 3 -#define VERSION_MINOR 0 -#define VERSION_PATCH 0 -#define VERSION_EXTRA "375-g4d1ace0ad" +#define VERSION_MINOR 1 +#define VERSION_PATCH 2 +#define VERSION_EXTRA "607-gda0b537ee" #define VERSION_PACKED \ ((VERSION_MAJOR << 16) | (VERSION_MINOR << 8) | (VERSION_PATCH)) -#define VERSION_STRING_NOSP "3.0.0-375-g4d1ace0ad" -#define VERSION_STRING " 3.0.0-375-g4d1ace0ad" +#define VERSION_STRING_NOSP "3.1.2-607-gda0b537ee" +#define VERSION_STRING " 3.1.2-607-gda0b537ee" diff --git a/chromium/third_party/libaom/source/config/ios/arm-neon/config/aom_config.asm b/chromium/third_party/libaom/source/config/ios/arm-neon/config/aom_config.asm index c672cfc4394..58a9f569896 100644 --- a/chromium/third_party/libaom/source/config/ios/arm-neon/config/aom_config.asm +++ b/chromium/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 @@ -39,7 +40,6 @@ CONFIG_INSPECTION equ 0 CONFIG_INTERNAL_STATS equ 0 CONFIG_INTER_STATS_ONLY equ 0 CONFIG_LIBYUV equ 0 -CONFIG_LPF_MASK equ 0 CONFIG_MAX_DECODE_PROFILE equ 0 CONFIG_MISMATCH_DEBUG equ 0 CONFIG_MULTITHREAD equ 1 @@ -49,6 +49,7 @@ CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 CONFIG_PIC equ 0 +CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/chromium/third_party/libaom/source/config/ios/arm-neon/config/aom_config.h b/chromium/third_party/libaom/source/config/ios/arm-neon/config/aom_config.h index cb80fb32523..490b3fea0ba 100644 --- a/chromium/third_party/libaom/source/config/ios/arm-neon/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 0 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/ios/arm-neon/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/ios/arm-neon/config/aom_dsp_rtcd.h index 027c19a09f0..e71ec66a005 100644 --- a/chromium/third_party/libaom/source/config/ios/arm-neon/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/ios/arm-neon/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/ios/arm-neon/config/av1_rtcd.h index 5ac080b7f05..6e4620a4a21 100644 --- a/chromium/third_party/libaom/source/config/ios/arm-neon/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/ios/arm-neon/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -1176,6 +1176,9 @@ void av1_lowbd_fwd_txfm_neon(const int16_t* src_diff, TxfmParam* txfm_param); #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_neon +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +#define av1_nn_fast_softmax_16 av1_nn_fast_softmax_16_c + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, diff --git a/chromium/third_party/libaom/source/config/ios/arm64/config/aom_config.asm b/chromium/third_party/libaom/source/config/ios/arm64/config/aom_config.asm index c672cfc4394..58a9f569896 100644 --- a/chromium/third_party/libaom/source/config/ios/arm64/config/aom_config.asm +++ b/chromium/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 @@ -39,7 +40,6 @@ CONFIG_INSPECTION equ 0 CONFIG_INTERNAL_STATS equ 0 CONFIG_INTER_STATS_ONLY equ 0 CONFIG_LIBYUV equ 0 -CONFIG_LPF_MASK equ 0 CONFIG_MAX_DECODE_PROFILE equ 0 CONFIG_MISMATCH_DEBUG equ 0 CONFIG_MULTITHREAD equ 1 @@ -49,6 +49,7 @@ CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 CONFIG_PIC equ 0 +CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/chromium/third_party/libaom/source/config/ios/arm64/config/aom_config.h b/chromium/third_party/libaom/source/config/ios/arm64/config/aom_config.h index cb80fb32523..490b3fea0ba 100644 --- a/chromium/third_party/libaom/source/config/ios/arm64/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 0 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/ios/arm64/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/ios/arm64/config/aom_dsp_rtcd.h index 027c19a09f0..e71ec66a005 100644 --- a/chromium/third_party/libaom/source/config/ios/arm64/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/ios/arm64/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/ios/arm64/config/av1_rtcd.h index 5ac080b7f05..6e4620a4a21 100644 --- a/chromium/third_party/libaom/source/config/ios/arm64/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/ios/arm64/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -1176,6 +1176,9 @@ void av1_lowbd_fwd_txfm_neon(const int16_t* src_diff, TxfmParam* txfm_param); #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_neon +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +#define av1_nn_fast_softmax_16 av1_nn_fast_softmax_16_c + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, diff --git a/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm b/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm index 2133db07669..9a70917bd93 100644 --- a/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm +++ b/chromium/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 @@ -39,7 +40,6 @@ CONFIG_INSPECTION equ 0 CONFIG_INTERNAL_STATS equ 0 CONFIG_INTER_STATS_ONLY equ 0 CONFIG_LIBYUV equ 0 -CONFIG_LPF_MASK equ 0 CONFIG_MAX_DECODE_PROFILE equ 0 CONFIG_MISMATCH_DEBUG equ 0 CONFIG_MULTITHREAD equ 1 @@ -49,6 +49,7 @@ CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 CONFIG_PIC equ 0 +CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h b/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h index 301113832a2..346ce8a839b 100644 --- a/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 0 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h index 61141406d2e..a4df74d40d2 100644 --- a/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/av1_rtcd.h index bf31686e6b0..6cdbb1b210d 100644 --- a/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -1496,6 +1496,9 @@ RTCD_EXTERN void (*av1_lowbd_fwd_txfm)(const int16_t* src_diff, int diff_stride, TxfmParam* txfm_param); +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +#define av1_nn_fast_softmax_16 av1_nn_fast_softmax_16_c + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, diff --git a/chromium/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm b/chromium/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm index c672cfc4394..58a9f569896 100644 --- a/chromium/third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm +++ b/chromium/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 @@ -39,7 +40,6 @@ CONFIG_INSPECTION equ 0 CONFIG_INTERNAL_STATS equ 0 CONFIG_INTER_STATS_ONLY equ 0 CONFIG_LIBYUV equ 0 -CONFIG_LPF_MASK equ 0 CONFIG_MAX_DECODE_PROFILE equ 0 CONFIG_MISMATCH_DEBUG equ 0 CONFIG_MULTITHREAD equ 1 @@ -49,6 +49,7 @@ CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 CONFIG_PIC equ 0 +CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/chromium/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h b/chromium/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h index cb80fb32523..490b3fea0ba 100644 --- a/chromium/third_party/libaom/source/config/linux/arm-neon/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 0 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h index 027c19a09f0..e71ec66a005 100644 --- a/chromium/third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/linux/arm-neon/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/linux/arm-neon/config/av1_rtcd.h index 5ac080b7f05..6e4620a4a21 100644 --- a/chromium/third_party/libaom/source/config/linux/arm-neon/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/linux/arm-neon/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -1176,6 +1176,9 @@ void av1_lowbd_fwd_txfm_neon(const int16_t* src_diff, TxfmParam* txfm_param); #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_neon +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +#define av1_nn_fast_softmax_16 av1_nn_fast_softmax_16_c + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, diff --git a/chromium/third_party/libaom/source/config/linux/arm/config/aom_config.asm b/chromium/third_party/libaom/source/config/linux/arm/config/aom_config.asm index 2163031d8f4..95cd7eb367c 100644 --- a/chromium/third_party/libaom/source/config/linux/arm/config/aom_config.asm +++ b/chromium/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 @@ -39,7 +40,6 @@ CONFIG_INSPECTION equ 0 CONFIG_INTERNAL_STATS equ 0 CONFIG_INTER_STATS_ONLY equ 0 CONFIG_LIBYUV equ 0 -CONFIG_LPF_MASK equ 0 CONFIG_MAX_DECODE_PROFILE equ 0 CONFIG_MISMATCH_DEBUG equ 0 CONFIG_MULTITHREAD equ 1 @@ -49,6 +49,7 @@ CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 CONFIG_PIC equ 0 +CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/chromium/third_party/libaom/source/config/linux/arm/config/aom_config.h b/chromium/third_party/libaom/source/config/linux/arm/config/aom_config.h index 4fab123ab2f..76195695616 100644 --- a/chromium/third_party/libaom/source/config/linux/arm/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 0 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/linux/arm/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/linux/arm/config/aom_dsp_rtcd.h index d7b1b04f004..8710d625ed5 100644 --- a/chromium/third_party/libaom/source/config/linux/arm/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/linux/arm/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/linux/arm/config/av1_rtcd.h index 7376f46cf9a..48f665c85d5 100644 --- a/chromium/third_party/libaom/source/config/linux/arm/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/linux/arm/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -793,6 +793,9 @@ void av1_lowbd_fwd_txfm_c(const int16_t* src_diff, TxfmParam* txfm_param); #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_c +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +#define av1_nn_fast_softmax_16 av1_nn_fast_softmax_16_c + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, diff --git a/chromium/third_party/libaom/source/config/linux/arm64/config/aom_config.asm b/chromium/third_party/libaom/source/config/linux/arm64/config/aom_config.asm index c672cfc4394..58a9f569896 100644 --- a/chromium/third_party/libaom/source/config/linux/arm64/config/aom_config.asm +++ b/chromium/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 @@ -39,7 +40,6 @@ CONFIG_INSPECTION equ 0 CONFIG_INTERNAL_STATS equ 0 CONFIG_INTER_STATS_ONLY equ 0 CONFIG_LIBYUV equ 0 -CONFIG_LPF_MASK equ 0 CONFIG_MAX_DECODE_PROFILE equ 0 CONFIG_MISMATCH_DEBUG equ 0 CONFIG_MULTITHREAD equ 1 @@ -49,6 +49,7 @@ CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 CONFIG_PIC equ 0 +CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/chromium/third_party/libaom/source/config/linux/arm64/config/aom_config.h b/chromium/third_party/libaom/source/config/linux/arm64/config/aom_config.h index cb80fb32523..490b3fea0ba 100644 --- a/chromium/third_party/libaom/source/config/linux/arm64/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 0 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h index 027c19a09f0..e71ec66a005 100644 --- a/chromium/third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/linux/arm64/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/linux/arm64/config/av1_rtcd.h index 5ac080b7f05..6e4620a4a21 100644 --- a/chromium/third_party/libaom/source/config/linux/arm64/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/linux/arm64/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -1176,6 +1176,9 @@ void av1_lowbd_fwd_txfm_neon(const int16_t* src_diff, TxfmParam* txfm_param); #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_neon +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +#define av1_nn_fast_softmax_16 av1_nn_fast_softmax_16_c + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, diff --git a/chromium/third_party/libaom/source/config/linux/generic/config/aom_config.asm b/chromium/third_party/libaom/source/config/linux/generic/config/aom_config.asm index e86d8a16b4c..f8971fe7ff4 100644 --- a/chromium/third_party/libaom/source/config/linux/generic/config/aom_config.asm +++ b/chromium/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 @@ -39,7 +40,6 @@ CONFIG_INSPECTION equ 0 CONFIG_INTERNAL_STATS equ 0 CONFIG_INTER_STATS_ONLY equ 0 CONFIG_LIBYUV equ 0 -CONFIG_LPF_MASK equ 0 CONFIG_MAX_DECODE_PROFILE equ 0 CONFIG_MISMATCH_DEBUG equ 0 CONFIG_MULTITHREAD equ 1 @@ -49,6 +49,7 @@ CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 CONFIG_PIC equ 0 +CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/chromium/third_party/libaom/source/config/linux/generic/config/aom_config.h b/chromium/third_party/libaom/source/config/linux/generic/config/aom_config.h index 33e8b6687f6..b61509a8aed 100644 --- a/chromium/third_party/libaom/source/config/linux/generic/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 0 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/linux/generic/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/linux/generic/config/aom_dsp_rtcd.h index 05bfa838bb0..702c1b809ec 100644 --- a/chromium/third_party/libaom/source/config/linux/generic/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/linux/generic/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/linux/generic/config/av1_rtcd.h index ab207e4cc58..28c892bce69 100644 --- a/chromium/third_party/libaom/source/config/linux/generic/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/linux/generic/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -793,6 +793,9 @@ void av1_lowbd_fwd_txfm_c(const int16_t* src_diff, TxfmParam* txfm_param); #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_c +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +#define av1_nn_fast_softmax_16 av1_nn_fast_softmax_16_c + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, diff --git a/chromium/third_party/libaom/source/config/linux/ia32/config/aom_config.asm b/chromium/third_party/libaom/source/config/linux/ia32/config/aom_config.asm index 7feeaaf7c25..0bff6b71fb6 100644 --- a/chromium/third_party/libaom/source/config/linux/ia32/config/aom_config.asm +++ b/chromium/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 @@ -29,7 +30,6 @@ %define CONFIG_INTERNAL_STATS 0 %define CONFIG_INTER_STATS_ONLY 0 %define CONFIG_LIBYUV 0 -%define CONFIG_LPF_MASK 0 %define CONFIG_MAX_DECODE_PROFILE 0 %define CONFIG_MISMATCH_DEBUG 0 %define CONFIG_MULTITHREAD 1 @@ -39,6 +39,7 @@ %define CONFIG_OS_SUPPORT 1 %define CONFIG_PARTITION_SEARCH_ORDER 0 %define CONFIG_PIC 1 +%define CONFIG_RD_COMMAND 0 %define CONFIG_RD_DEBUG 0 %define CONFIG_REALTIME_ONLY 1 %define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/linux/ia32/config/aom_config.h b/chromium/third_party/libaom/source/config/linux/ia32/config/aom_config.h index f2d79fc6954..e8393f6721f 100644 --- a/chromium/third_party/libaom/source/config/linux/ia32/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 1 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/linux/ia32/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/linux/ia32/config/aom_dsp_rtcd.h index 64bc1f4056f..323c55e888c 100644 --- a/chromium/third_party/libaom/source/config/linux/ia32/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/linux/ia32/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/linux/ia32/config/av1_rtcd.h index 6380d5b0cb8..6f7fac936ff 100644 --- a/chromium/third_party/libaom/source/config/linux/ia32/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/linux/ia32/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -1047,7 +1047,10 @@ RTCD_EXTERN void (*av1_fwd_txfm2d_8x8)(const int16_t* input, int bd); void av1_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -#define av1_fwht4x4 av1_fwht4x4_c +void av1_fwht4x4_sse4_1(const int16_t* input, tran_low_t* output, int stride); +RTCD_EXTERN void (*av1_fwht4x4)(const int16_t* input, + tran_low_t* output, + int stride); uint32_t av1_get_crc32c_value_c(void* crc_calculator, uint8_t* p, @@ -1164,7 +1167,12 @@ void av1_highbd_convolve_copy_c(const uint8_t* src, #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -#define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c +void av1_highbd_fwht4x4_sse4_1(const int16_t* input, + tran_low_t* output, + int stride); +RTCD_EXTERN void (*av1_highbd_fwht4x4)(const int16_t* input, + tran_low_t* output, + int stride); void av1_highbd_inv_txfm_add_c(const tran_low_t* input, uint8_t* dest, @@ -1337,7 +1345,14 @@ void av1_highbd_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int dest_stride, int bd); -#define av1_highbd_iwht4x4_16_add av1_highbd_iwht4x4_16_add_c +void av1_highbd_iwht4x4_16_add_sse4_1(const tran_low_t* input, + uint8_t* dest, + int dest_stride, + int bd); +RTCD_EXTERN void (*av1_highbd_iwht4x4_16_add)(const tran_low_t* input, + uint8_t* dest, + int dest_stride, + int bd); void av1_highbd_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, @@ -1534,6 +1549,11 @@ RTCD_EXTERN void (*av1_lowbd_fwd_txfm)(const int16_t* src_diff, int diff_stride, TxfmParam* txfm_param); +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +void av1_nn_fast_softmax_16_sse3(const float* input_nodes, float* output); +RTCD_EXTERN void (*av1_nn_fast_softmax_16)(const float* input_nodes, + float* output); + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, @@ -2199,6 +2219,9 @@ static void setup_rtcd_internal(void) { av1_fwd_txfm2d_8x8 = av1_fwd_txfm2d_8x8_sse4_1; if (flags & HAS_AVX2) av1_fwd_txfm2d_8x8 = av1_fwd_txfm2d_8x8_avx2; + av1_fwht4x4 = av1_fwht4x4_c; + if (flags & HAS_SSE4_1) + av1_fwht4x4 = av1_fwht4x4_sse4_1; av1_get_crc32c_value = av1_get_crc32c_value_c; if (flags & HAS_SSE4_2) av1_get_crc32c_value = av1_get_crc32c_value_sse4_2; @@ -2207,6 +2230,9 @@ static void setup_rtcd_internal(void) { av1_get_horver_correlation_full = av1_get_horver_correlation_full_sse4_1; if (flags & HAS_AVX2) av1_get_horver_correlation_full = av1_get_horver_correlation_full_avx2; + av1_highbd_fwht4x4 = av1_highbd_fwht4x4_c; + if (flags & HAS_SSE4_1) + av1_highbd_fwht4x4 = av1_highbd_fwht4x4_sse4_1; av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_c; if (flags & HAS_SSE4_1) av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_sse4_1; @@ -2230,6 +2256,9 @@ static void setup_rtcd_internal(void) { av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_c; if (flags & HAS_SSE4_1) av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_sse4_1; + av1_highbd_iwht4x4_16_add = av1_highbd_iwht4x4_16_add_c; + if (flags & HAS_SSE4_1) + av1_highbd_iwht4x4_16_add = av1_highbd_iwht4x4_16_add_sse4_1; av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_c; if (flags & HAS_SSE4_1) av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_sse4_1; @@ -2246,6 +2275,9 @@ static void setup_rtcd_internal(void) { av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_sse4_1; if (flags & HAS_AVX2) av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_avx2; + av1_nn_fast_softmax_16 = av1_nn_fast_softmax_16_c; + if (flags & HAS_SSE3) + av1_nn_fast_softmax_16 = av1_nn_fast_softmax_16_sse3; av1_nn_predict = av1_nn_predict_c; if (flags & HAS_SSE3) av1_nn_predict = av1_nn_predict_sse3; diff --git a/chromium/third_party/libaom/source/config/linux/x64/config/aom_config.asm b/chromium/third_party/libaom/source/config/linux/x64/config/aom_config.asm index b76f24685ed..2604b7b4be6 100644 --- a/chromium/third_party/libaom/source/config/linux/x64/config/aom_config.asm +++ b/chromium/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 @@ -29,7 +30,6 @@ %define CONFIG_INTERNAL_STATS 0 %define CONFIG_INTER_STATS_ONLY 0 %define CONFIG_LIBYUV 0 -%define CONFIG_LPF_MASK 0 %define CONFIG_MAX_DECODE_PROFILE 0 %define CONFIG_MISMATCH_DEBUG 0 %define CONFIG_MULTITHREAD 1 @@ -39,6 +39,7 @@ %define CONFIG_OS_SUPPORT 1 %define CONFIG_PARTITION_SEARCH_ORDER 0 %define CONFIG_PIC 0 +%define CONFIG_RD_COMMAND 0 %define CONFIG_RD_DEBUG 0 %define CONFIG_REALTIME_ONLY 1 %define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/linux/x64/config/aom_config.h b/chromium/third_party/libaom/source/config/linux/x64/config/aom_config.h index 1680d82731a..911235ed9cf 100644 --- a/chromium/third_party/libaom/source/config/linux/x64/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 0 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/linux/x64/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/linux/x64/config/aom_dsp_rtcd.h index 58de231219c..dd561e44982 100644 --- a/chromium/third_party/libaom/source/config/linux/x64/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/linux/x64/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/linux/x64/config/av1_rtcd.h index 3e8c153251b..0779218fdb7 100644 --- a/chromium/third_party/libaom/source/config/linux/x64/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/linux/x64/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -1047,7 +1047,10 @@ RTCD_EXTERN void (*av1_fwd_txfm2d_8x8)(const int16_t* input, int bd); void av1_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -#define av1_fwht4x4 av1_fwht4x4_c +void av1_fwht4x4_sse4_1(const int16_t* input, tran_low_t* output, int stride); +RTCD_EXTERN void (*av1_fwht4x4)(const int16_t* input, + tran_low_t* output, + int stride); uint32_t av1_get_crc32c_value_c(void* crc_calculator, uint8_t* p, @@ -1197,7 +1200,12 @@ void av1_highbd_convolve_copy_c(const uint8_t* src, #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -#define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c +void av1_highbd_fwht4x4_sse4_1(const int16_t* input, + tran_low_t* output, + int stride); +RTCD_EXTERN void (*av1_highbd_fwht4x4)(const int16_t* input, + tran_low_t* output, + int stride); void av1_highbd_inv_txfm_add_c(const tran_low_t* input, uint8_t* dest, @@ -1370,7 +1378,14 @@ void av1_highbd_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int dest_stride, int bd); -#define av1_highbd_iwht4x4_16_add av1_highbd_iwht4x4_16_add_c +void av1_highbd_iwht4x4_16_add_sse4_1(const tran_low_t* input, + uint8_t* dest, + int dest_stride, + int bd); +RTCD_EXTERN void (*av1_highbd_iwht4x4_16_add)(const tran_low_t* input, + uint8_t* dest, + int dest_stride, + int bd); void av1_highbd_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, @@ -1567,6 +1582,11 @@ RTCD_EXTERN void (*av1_lowbd_fwd_txfm)(const int16_t* src_diff, int diff_stride, TxfmParam* txfm_param); +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +void av1_nn_fast_softmax_16_sse3(const float* input_nodes, float* output); +RTCD_EXTERN void (*av1_nn_fast_softmax_16)(const float* input_nodes, + float* output); + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, @@ -2232,6 +2252,9 @@ static void setup_rtcd_internal(void) { av1_fwd_txfm2d_8x8 = av1_fwd_txfm2d_8x8_sse4_1; if (flags & HAS_AVX2) av1_fwd_txfm2d_8x8 = av1_fwd_txfm2d_8x8_avx2; + av1_fwht4x4 = av1_fwht4x4_c; + if (flags & HAS_SSE4_1) + av1_fwht4x4 = av1_fwht4x4_sse4_1; av1_get_crc32c_value = av1_get_crc32c_value_c; if (flags & HAS_SSE4_2) av1_get_crc32c_value = av1_get_crc32c_value_sse4_2; @@ -2240,6 +2263,9 @@ static void setup_rtcd_internal(void) { av1_get_horver_correlation_full = av1_get_horver_correlation_full_sse4_1; if (flags & HAS_AVX2) av1_get_horver_correlation_full = av1_get_horver_correlation_full_avx2; + av1_highbd_fwht4x4 = av1_highbd_fwht4x4_c; + if (flags & HAS_SSE4_1) + av1_highbd_fwht4x4 = av1_highbd_fwht4x4_sse4_1; av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_c; if (flags & HAS_SSE4_1) av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_sse4_1; @@ -2263,6 +2289,9 @@ static void setup_rtcd_internal(void) { av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_c; if (flags & HAS_SSE4_1) av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_sse4_1; + av1_highbd_iwht4x4_16_add = av1_highbd_iwht4x4_16_add_c; + if (flags & HAS_SSE4_1) + av1_highbd_iwht4x4_16_add = av1_highbd_iwht4x4_16_add_sse4_1; av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_c; if (flags & HAS_SSE4_1) av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_sse4_1; @@ -2279,6 +2308,9 @@ static void setup_rtcd_internal(void) { av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_sse4_1; if (flags & HAS_AVX2) av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_avx2; + av1_nn_fast_softmax_16 = av1_nn_fast_softmax_16_c; + if (flags & HAS_SSE3) + av1_nn_fast_softmax_16 = av1_nn_fast_softmax_16_sse3; av1_nn_predict = av1_nn_predict_c; if (flags & HAS_SSE3) av1_nn_predict = av1_nn_predict_sse3; diff --git a/chromium/third_party/libaom/source/config/win/arm64/config/aom_config.asm b/chromium/third_party/libaom/source/config/win/arm64/config/aom_config.asm index c672cfc4394..58a9f569896 100644 --- a/chromium/third_party/libaom/source/config/win/arm64/config/aom_config.asm +++ b/chromium/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 @@ -39,7 +40,6 @@ CONFIG_INSPECTION equ 0 CONFIG_INTERNAL_STATS equ 0 CONFIG_INTER_STATS_ONLY equ 0 CONFIG_LIBYUV equ 0 -CONFIG_LPF_MASK equ 0 CONFIG_MAX_DECODE_PROFILE equ 0 CONFIG_MISMATCH_DEBUG equ 0 CONFIG_MULTITHREAD equ 1 @@ -49,6 +49,7 @@ CONFIG_OPTICAL_FLOW_API equ 0 CONFIG_OS_SUPPORT equ 1 CONFIG_PARTITION_SEARCH_ORDER equ 0 CONFIG_PIC equ 0 +CONFIG_RD_COMMAND equ 0 CONFIG_RD_DEBUG equ 0 CONFIG_REALTIME_ONLY equ 1 CONFIG_RT_ML_PARTITIONING equ 0 diff --git a/chromium/third_party/libaom/source/config/win/arm64/config/aom_config.h b/chromium/third_party/libaom/source/config/win/arm64/config/aom_config.h index 002f386d16c..4ce66883f37 100644 --- a/chromium/third_party/libaom/source/config/win/arm64/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 0 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/win/arm64/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/win/arm64/config/aom_dsp_rtcd.h index 027c19a09f0..e71ec66a005 100644 --- a/chromium/third_party/libaom/source/config/win/arm64/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/win/arm64/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/win/arm64/config/av1_rtcd.h index 5ac080b7f05..6e4620a4a21 100644 --- a/chromium/third_party/libaom/source/config/win/arm64/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/win/arm64/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -1176,6 +1176,9 @@ void av1_lowbd_fwd_txfm_neon(const int16_t* src_diff, TxfmParam* txfm_param); #define av1_lowbd_fwd_txfm av1_lowbd_fwd_txfm_neon +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +#define av1_nn_fast_softmax_16 av1_nn_fast_softmax_16_c + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, diff --git a/chromium/third_party/libaom/source/config/win/ia32/config/aom_config.asm b/chromium/third_party/libaom/source/config/win/ia32/config/aom_config.asm index 6a5bfad1df8..f248264146e 100644 --- a/chromium/third_party/libaom/source/config/win/ia32/config/aom_config.asm +++ b/chromium/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 @@ -29,7 +30,6 @@ %define CONFIG_INTERNAL_STATS 0 %define CONFIG_INTER_STATS_ONLY 0 %define CONFIG_LIBYUV 0 -%define CONFIG_LPF_MASK 0 %define CONFIG_MAX_DECODE_PROFILE 0 %define CONFIG_MISMATCH_DEBUG 0 %define CONFIG_MULTITHREAD 1 @@ -39,6 +39,7 @@ %define CONFIG_OS_SUPPORT 1 %define CONFIG_PARTITION_SEARCH_ORDER 0 %define CONFIG_PIC 1 +%define CONFIG_RD_COMMAND 0 %define CONFIG_RD_DEBUG 0 %define CONFIG_REALTIME_ONLY 1 %define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/win/ia32/config/aom_config.h b/chromium/third_party/libaom/source/config/win/ia32/config/aom_config.h index e3af0507498..8883d7b0901 100644 --- a/chromium/third_party/libaom/source/config/win/ia32/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 1 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/win/ia32/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/win/ia32/config/aom_dsp_rtcd.h index 64bc1f4056f..323c55e888c 100644 --- a/chromium/third_party/libaom/source/config/win/ia32/config/aom_dsp_rtcd.h +++ b/chromium/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/chromium/third_party/libaom/source/config/win/ia32/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/win/ia32/config/av1_rtcd.h index 6380d5b0cb8..6f7fac936ff 100644 --- a/chromium/third_party/libaom/source/config/win/ia32/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/win/ia32/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -1047,7 +1047,10 @@ RTCD_EXTERN void (*av1_fwd_txfm2d_8x8)(const int16_t* input, int bd); void av1_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -#define av1_fwht4x4 av1_fwht4x4_c +void av1_fwht4x4_sse4_1(const int16_t* input, tran_low_t* output, int stride); +RTCD_EXTERN void (*av1_fwht4x4)(const int16_t* input, + tran_low_t* output, + int stride); uint32_t av1_get_crc32c_value_c(void* crc_calculator, uint8_t* p, @@ -1164,7 +1167,12 @@ void av1_highbd_convolve_copy_c(const uint8_t* src, #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -#define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c +void av1_highbd_fwht4x4_sse4_1(const int16_t* input, + tran_low_t* output, + int stride); +RTCD_EXTERN void (*av1_highbd_fwht4x4)(const int16_t* input, + tran_low_t* output, + int stride); void av1_highbd_inv_txfm_add_c(const tran_low_t* input, uint8_t* dest, @@ -1337,7 +1345,14 @@ void av1_highbd_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int dest_stride, int bd); -#define av1_highbd_iwht4x4_16_add av1_highbd_iwht4x4_16_add_c +void av1_highbd_iwht4x4_16_add_sse4_1(const tran_low_t* input, + uint8_t* dest, + int dest_stride, + int bd); +RTCD_EXTERN void (*av1_highbd_iwht4x4_16_add)(const tran_low_t* input, + uint8_t* dest, + int dest_stride, + int bd); void av1_highbd_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, @@ -1534,6 +1549,11 @@ RTCD_EXTERN void (*av1_lowbd_fwd_txfm)(const int16_t* src_diff, int diff_stride, TxfmParam* txfm_param); +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +void av1_nn_fast_softmax_16_sse3(const float* input_nodes, float* output); +RTCD_EXTERN void (*av1_nn_fast_softmax_16)(const float* input_nodes, + float* output); + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, @@ -2199,6 +2219,9 @@ static void setup_rtcd_internal(void) { av1_fwd_txfm2d_8x8 = av1_fwd_txfm2d_8x8_sse4_1; if (flags & HAS_AVX2) av1_fwd_txfm2d_8x8 = av1_fwd_txfm2d_8x8_avx2; + av1_fwht4x4 = av1_fwht4x4_c; + if (flags & HAS_SSE4_1) + av1_fwht4x4 = av1_fwht4x4_sse4_1; av1_get_crc32c_value = av1_get_crc32c_value_c; if (flags & HAS_SSE4_2) av1_get_crc32c_value = av1_get_crc32c_value_sse4_2; @@ -2207,6 +2230,9 @@ static void setup_rtcd_internal(void) { av1_get_horver_correlation_full = av1_get_horver_correlation_full_sse4_1; if (flags & HAS_AVX2) av1_get_horver_correlation_full = av1_get_horver_correlation_full_avx2; + av1_highbd_fwht4x4 = av1_highbd_fwht4x4_c; + if (flags & HAS_SSE4_1) + av1_highbd_fwht4x4 = av1_highbd_fwht4x4_sse4_1; av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_c; if (flags & HAS_SSE4_1) av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_sse4_1; @@ -2230,6 +2256,9 @@ static void setup_rtcd_internal(void) { av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_c; if (flags & HAS_SSE4_1) av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_sse4_1; + av1_highbd_iwht4x4_16_add = av1_highbd_iwht4x4_16_add_c; + if (flags & HAS_SSE4_1) + av1_highbd_iwht4x4_16_add = av1_highbd_iwht4x4_16_add_sse4_1; av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_c; if (flags & HAS_SSE4_1) av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_sse4_1; @@ -2246,6 +2275,9 @@ static void setup_rtcd_internal(void) { av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_sse4_1; if (flags & HAS_AVX2) av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_avx2; + av1_nn_fast_softmax_16 = av1_nn_fast_softmax_16_c; + if (flags & HAS_SSE3) + av1_nn_fast_softmax_16 = av1_nn_fast_softmax_16_sse3; av1_nn_predict = av1_nn_predict_c; if (flags & HAS_SSE3) av1_nn_predict = av1_nn_predict_sse3; diff --git a/chromium/third_party/libaom/source/config/win/x64/config/aom_config.asm b/chromium/third_party/libaom/source/config/win/x64/config/aom_config.asm index 48f4b40782d..3e4a68a7614 100644 --- a/chromium/third_party/libaom/source/config/win/x64/config/aom_config.asm +++ b/chromium/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 @@ -29,7 +30,6 @@ %define CONFIG_INTERNAL_STATS 0 %define CONFIG_INTER_STATS_ONLY 0 %define CONFIG_LIBYUV 0 -%define CONFIG_LPF_MASK 0 %define CONFIG_MAX_DECODE_PROFILE 0 %define CONFIG_MISMATCH_DEBUG 0 %define CONFIG_MULTITHREAD 1 @@ -39,6 +39,7 @@ %define CONFIG_OS_SUPPORT 1 %define CONFIG_PARTITION_SEARCH_ORDER 0 %define CONFIG_PIC 0 +%define CONFIG_RD_COMMAND 0 %define CONFIG_RD_DEBUG 0 %define CONFIG_REALTIME_ONLY 1 %define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/win/x64/config/aom_config.h b/chromium/third_party/libaom/source/config/win/x64/config/aom_config.h index 15424e61c7d..e9834eba49a 100644 --- a/chromium/third_party/libaom/source/config/win/x64/config/aom_config.h +++ b/chromium/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 @@ -41,7 +42,6 @@ #define CONFIG_INTERNAL_STATS 0 #define CONFIG_INTER_STATS_ONLY 0 #define CONFIG_LIBYUV 0 -#define CONFIG_LPF_MASK 0 #define CONFIG_MAX_DECODE_PROFILE 0 #define CONFIG_MISMATCH_DEBUG 0 #define CONFIG_MULTITHREAD 1 @@ -51,6 +51,7 @@ #define CONFIG_OS_SUPPORT 1 #define CONFIG_PARTITION_SEARCH_ORDER 0 #define CONFIG_PIC 0 +#define CONFIG_RD_COMMAND 0 #define CONFIG_RD_DEBUG 0 #define CONFIG_REALTIME_ONLY 1 #define CONFIG_RT_ML_PARTITIONING 0 diff --git a/chromium/third_party/libaom/source/config/win/x64/config/aom_dsp_rtcd.h b/chromium/third_party/libaom/source/config/win/x64/config/aom_dsp_rtcd.h index 58de231219c..dd561e44982 100644 --- a/chromium/third_party/libaom/source/config/win/x64/config/aom_dsp_rtcd.h +++ b/chromium/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, diff --git a/chromium/third_party/libaom/source/config/win/x64/config/av1_rtcd.h b/chromium/third_party/libaom/source/config/win/x64/config/av1_rtcd.h index 3e8c153251b..0779218fdb7 100644 --- a/chromium/third_party/libaom/source/config/win/x64/config/av1_rtcd.h +++ b/chromium/third_party/libaom/source/config/win/x64/config/av1_rtcd.h @@ -13,13 +13,13 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/odintrin.h" #include "aom_dsp/txfm_common.h" #include "av1/common/av1_txfm.h" #include "av1/common/common.h" #include "av1/common/convolve.h" #include "av1/common/enums.h" #include "av1/common/filter.h" -#include "av1/common/odintrin.h" #include "av1/common/quant_common.h" #include "av1/common/restoration.h" @@ -1047,7 +1047,10 @@ RTCD_EXTERN void (*av1_fwd_txfm2d_8x8)(const int16_t* input, int bd); void av1_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -#define av1_fwht4x4 av1_fwht4x4_c +void av1_fwht4x4_sse4_1(const int16_t* input, tran_low_t* output, int stride); +RTCD_EXTERN void (*av1_fwht4x4)(const int16_t* input, + tran_low_t* output, + int stride); uint32_t av1_get_crc32c_value_c(void* crc_calculator, uint8_t* p, @@ -1197,7 +1200,12 @@ void av1_highbd_convolve_copy_c(const uint8_t* src, #define av1_highbd_convolve_copy av1_highbd_convolve_copy_c void av1_highbd_fwht4x4_c(const int16_t* input, tran_low_t* output, int stride); -#define av1_highbd_fwht4x4 av1_highbd_fwht4x4_c +void av1_highbd_fwht4x4_sse4_1(const int16_t* input, + tran_low_t* output, + int stride); +RTCD_EXTERN void (*av1_highbd_fwht4x4)(const int16_t* input, + tran_low_t* output, + int stride); void av1_highbd_inv_txfm_add_c(const tran_low_t* input, uint8_t* dest, @@ -1370,7 +1378,14 @@ void av1_highbd_iwht4x4_16_add_c(const tran_low_t* input, uint8_t* dest, int dest_stride, int bd); -#define av1_highbd_iwht4x4_16_add av1_highbd_iwht4x4_16_add_c +void av1_highbd_iwht4x4_16_add_sse4_1(const tran_low_t* input, + uint8_t* dest, + int dest_stride, + int bd); +RTCD_EXTERN void (*av1_highbd_iwht4x4_16_add)(const tran_low_t* input, + uint8_t* dest, + int dest_stride, + int bd); void av1_highbd_iwht4x4_1_add_c(const tran_low_t* input, uint8_t* dest, @@ -1567,6 +1582,11 @@ RTCD_EXTERN void (*av1_lowbd_fwd_txfm)(const int16_t* src_diff, int diff_stride, TxfmParam* txfm_param); +void av1_nn_fast_softmax_16_c(const float* input_nodes, float* output); +void av1_nn_fast_softmax_16_sse3(const float* input_nodes, float* output); +RTCD_EXTERN void (*av1_nn_fast_softmax_16)(const float* input_nodes, + float* output); + void av1_nn_predict_c(const float* input_nodes, const NN_CONFIG* const nn_config, int reduce_prec, @@ -2232,6 +2252,9 @@ static void setup_rtcd_internal(void) { av1_fwd_txfm2d_8x8 = av1_fwd_txfm2d_8x8_sse4_1; if (flags & HAS_AVX2) av1_fwd_txfm2d_8x8 = av1_fwd_txfm2d_8x8_avx2; + av1_fwht4x4 = av1_fwht4x4_c; + if (flags & HAS_SSE4_1) + av1_fwht4x4 = av1_fwht4x4_sse4_1; av1_get_crc32c_value = av1_get_crc32c_value_c; if (flags & HAS_SSE4_2) av1_get_crc32c_value = av1_get_crc32c_value_sse4_2; @@ -2240,6 +2263,9 @@ static void setup_rtcd_internal(void) { av1_get_horver_correlation_full = av1_get_horver_correlation_full_sse4_1; if (flags & HAS_AVX2) av1_get_horver_correlation_full = av1_get_horver_correlation_full_avx2; + av1_highbd_fwht4x4 = av1_highbd_fwht4x4_c; + if (flags & HAS_SSE4_1) + av1_highbd_fwht4x4 = av1_highbd_fwht4x4_sse4_1; av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_c; if (flags & HAS_SSE4_1) av1_highbd_inv_txfm_add = av1_highbd_inv_txfm_add_sse4_1; @@ -2263,6 +2289,9 @@ static void setup_rtcd_internal(void) { av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_c; if (flags & HAS_SSE4_1) av1_highbd_inv_txfm_add_8x8 = av1_highbd_inv_txfm_add_8x8_sse4_1; + av1_highbd_iwht4x4_16_add = av1_highbd_iwht4x4_16_add_c; + if (flags & HAS_SSE4_1) + av1_highbd_iwht4x4_16_add = av1_highbd_iwht4x4_16_add_sse4_1; av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_c; if (flags & HAS_SSE4_1) av1_inv_txfm2d_add_4x4 = av1_inv_txfm2d_add_4x4_sse4_1; @@ -2279,6 +2308,9 @@ static void setup_rtcd_internal(void) { av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_sse4_1; if (flags & HAS_AVX2) av1_lowbd_fwd_txfm = av1_lowbd_fwd_txfm_avx2; + av1_nn_fast_softmax_16 = av1_nn_fast_softmax_16_c; + if (flags & HAS_SSE3) + av1_nn_fast_softmax_16 = av1_nn_fast_softmax_16_sse3; av1_nn_predict = av1_nn_predict_c; if (flags & HAS_SSE3) av1_nn_predict = av1_nn_predict_sse3; |