Skip to content

GitLab

T
tangled
Commit d969f8bf authored by Johann's avatar Johann Committed by Commit Bot
Browse files
Options

Roll src/third_party/libaom/source/libaom/ c5a56b99d..63256264a (76 commits) 

Update to the finalized version of the AV1 bitstream.

https://aomedia.googlesource.com/aom.git/+log/c5a56b99df86..63256264a978

$ git log c5a56b99d..63256264a --date=short --no-merges --format='%ad %ae %s'
2018-06-22 yaowu Replace "<< 1" with "* 2"
2018-06-22 tdaede Don't write timing or display model for still pictures.
2018-06-22 ravi.chaudhary Fix highbd warp intrinsic module
2018-06-19 tdaede [NORMATIVE] Update decoder_peek_si_internal to match RAP spec.
2018-06-21 debargha [NORMATIVE] Fix dr preds when upsampling is enabled
2018-06-20 huisu Reset seen_frame_header before decoding a frame
2018-06-21 debargha [NORMATIVE] Rem rest. for show_exisitng_frames
2018-06-21 zoeliu Remove duplicate assert statement
2018-06-20 anorkin [NORMATIVE] Update of decoder model syntax
2018-06-20 rathaval common: convolve: Use memcpy in av1_convolve_2d_copy_sr_c
2018-06-20 ravi.chaudhary Fixed issue in AV1MultiThreaded/TestVectorTest
2018-05-24 yuec Add wavelet energy based q modulation
2018-06-20 angiebird Turn off inter_mode_data_push on multi-tile mode
2018-06-20 david.barker [NORMATIVE] Fix random-access decoding
2018-06-21 johannkoenig Revert "Fix bug in round shift array unit test"
2018-06-20 angiebird Implement handle_intra_mode
2018-06-19 angiebird Move skip_repeated_mv into order indep skip func
2018-06-19 angiebird Move ref_frame_skip_mask out of search_state
2018-06-19 angiebird Move mode_skip_mask out of search_state
2018-06-21 sachin.kumargarg Add ARM Neon optimization of compound_diffwtd_mask_d16
(...)

Created with:
  roll-dep src/third_party/libaom/source/libaom

BUG=chromium:783519

Change-Id: I2532d7bf4684c19dea2b9606f6ed6d60bf0165f2
Reviewed-on: https://chromium-review.googlesource.com/1112501Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Johann Koenig <johannkoenig@google.com>
Cr-Commit-Position: refs/heads/master@{#569869}
parent 0e66a9bd
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 71 deletions
DEPS
View file @ d969f8bf
......@@ -779,7 +779,7 @@ deps = {
Var('chromium_git') + '/external/libaddressinput.git' + '@' + 'd955c63ec7048d59dffd20af25eeec23da878d27',
'src/third_party/libaom/source/libaom': {
'url': Var('aomedia_git') + '/aom.git' + '@' + 'c5a56b99df86cd39706af252a13ed263eebc6412',
'url': Var('aomedia_git') + '/aom.git' + '@' + '63256264a978ecac8e3c8799275b1a47c04ca3c8',
'condition': 'checkout_libaom',
},
......
third_party/libaom/README.chromium
View file @ d969f8bf
......@@ -2,9 +2,9 @@ Name: Alliance for Open Media Video Codec
Short Name: libaom
URL: https://aomedia.googlesource.com/aom/
Version: 0
Date: Thursday June 14 2018
Date: Friday June 22 2018
Branch: master
Commit: c5a56b99df86cd39706af252a13ed263eebc6412
Commit: 63256264a978ecac8e3c8799275b1a47c04ca3c8
License: BSD
License File: source/libaom/LICENSE
Security Critical: yes
......
third_party/libaom/libaom_srcs.gni
View file @ d969f8bf
......@@ -25,6 +25,9 @@ aom_av1_common_intrin_neon = [
"//third_party/libaom/source/libaom/av1/common/arm/jnt_convolve_neon.c",
"//third_party/libaom/source/libaom/av1/common/arm/mem_neon.h",
"//third_party/libaom/source/libaom/av1/common/arm/transpose_neon.h",
"//third_party/libaom/source/libaom/av1/common/arm/blend_a64_hmask_neon.c",
"//third_party/libaom/source/libaom/av1/common/arm/blend_a64_vmask_neon.c",
"//third_party/libaom/source/libaom/av1/common/arm/reconinter_neon.c",
"//third_party/libaom/source/libaom/av1/common/arm/wiener_convolve_neon.c",
"//third_party/libaom/source/libaom/av1/common/cdef_block_neon.c",
]
......@@ -139,6 +142,7 @@ aom_av1_common_sources = [
"//third_party/libaom/source/libaom/av1/common/tile_common.c",
"//third_party/libaom/source/libaom/av1/common/tile_common.h",
"//third_party/libaom/source/libaom/av1/common/timing.h",
"//third_party/libaom/source/libaom/av1/common/timing.c",
"//third_party/libaom/source/libaom/av1/common/token_cdfs.h",
"//third_party/libaom/source/libaom/av1/common/txb_common.c",
"//third_party/libaom/source/libaom/av1/common/txb_common.h",
......@@ -288,7 +292,6 @@ aom_av1_encoder_sources = [
"//third_party/libaom/source/libaom/av1/encoder/speed_features.h",
"//third_party/libaom/source/libaom/av1/encoder/temporal_filter.c",
"//third_party/libaom/source/libaom/av1/encoder/temporal_filter.h",
"//third_party/libaom/source/libaom/av1/encoder/timing.c",
"//third_party/libaom/source/libaom/av1/encoder/tokenize.c",
"//third_party/libaom/source/libaom/av1/encoder/tokenize.h",
"//third_party/libaom/source/libaom/av1/encoder/wedge_utils.c",
......@@ -298,6 +301,8 @@ aom_av1_encoder_sources = [
"//third_party/libaom/source/libaom/third_party/fastfeat/nonmax.c",
"//third_party/libaom/source/libaom/third_party/vector/vector.c",
"//third_party/libaom/source/libaom/third_party/vector/vector.h",
"//third_party/libaom/source/libaom/av1/encoder/dwt.c",
"//third_party/libaom/source/libaom/av1/encoder/dwt.h",
]
aom_dsp_common_asm_sse2 = [
......@@ -320,6 +325,7 @@ aom_dsp_common_intrin_avx2 = [
"//third_party/libaom/source/libaom/aom_dsp/x86/aom_subpixel_8t_intrin_avx2.c",
"//third_party/libaom/source/libaom/aom_dsp/x86/common_avx2.h",
"//third_party/libaom/source/libaom/aom_dsp/x86/convolve_avx2.h",
"//third_party/libaom/source/libaom/aom_dsp/x86/fft_avx2.c",
"//third_party/libaom/source/libaom/aom_dsp/x86/highbd_convolve_avx2.c",
"//third_party/libaom/source/libaom/aom_dsp/x86/highbd_loopfilter_avx2.c",
"//third_party/libaom/source/libaom/aom_dsp/x86/intrapred_avx2.c",
......@@ -362,6 +368,7 @@ aom_dsp_common_intrin_sse2 = [
"//third_party/libaom/source/libaom/aom_dsp/x86/aom_asm_stubs.c",
"//third_party/libaom/source/libaom/aom_dsp/x86/convolve.h",
"//third_party/libaom/source/libaom/aom_dsp/x86/convolve_sse2.h",
"//third_party/libaom/source/libaom/aom_dsp/x86/fft_sse2.c",
"//third_party/libaom/source/libaom/aom_dsp/x86/highbd_intrapred_sse2.c",
"//third_party/libaom/source/libaom/aom_dsp/x86/highbd_loopfilter_sse2.c",
"//third_party/libaom/source/libaom/aom_dsp/x86/intrapred_sse2.c",
......@@ -397,6 +404,8 @@ aom_dsp_common_sources = [
"//third_party/libaom/source/libaom/aom_dsp/blend_a64_vmask.c",
"//third_party/libaom/source/libaom/aom_dsp/entcode.c",
"//third_party/libaom/source/libaom/aom_dsp/entcode.h",
"//third_party/libaom/source/libaom/aom_dsp/fft.c",
"//third_party/libaom/source/libaom/aom_dsp/fft_common.h",
"//third_party/libaom/source/libaom/aom_dsp/intrapred.c",
"//third_party/libaom/source/libaom/aom_dsp/intrapred_common.h",
"//third_party/libaom/source/libaom/aom_dsp/loopfilter.c",
......
third_party/libaom/source/config/config/aom_version.h
View file @ d969f8bf
......@@ -12,8 +12,8 @@
#define VERSION_MAJOR 0
#define VERSION_MINOR 1
#define VERSION_PATCH 0
#define VERSION_EXTRA ""
#define VERSION_EXTRA "9854-g63256264a"
#define VERSION_PACKED \
((VERSION_MAJOR << 16) | (VERSION_MINOR << 8) | (VERSION_PATCH))
#define VERSION_STRING_NOSP "0.1.0-9778-gc5a56b99d"
#define VERSION_STRING " 0.1.0-9778-gc5a56b99d"
#define VERSION_STRING_NOSP "0.1.0-9854-g63256264a"
#define VERSION_STRING " 0.1.0-9854-g63256264a"
third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.asm
View file @ d969f8bf
......@@ -23,9 +23,7 @@ CONFIG_COEFFICIENT_RANGE_CHECKING equ 0
CONFIG_COLLECT_INTER_MODE_RD_STATS equ 1
CONFIG_COLLECT_RD_STATS equ 0
CONFIG_DEBUG equ 0
CONFIG_DECODE_PERF_TESTS equ 0
CONFIG_DIST_8X8 equ 1
CONFIG_ENCODE_PERF_TESTS equ 0
CONFIG_ENTROPY_STATS equ 0
CONFIG_FILEOPTIONS equ 1
CONFIG_FP_MB_STATS equ 0
......@@ -48,7 +46,6 @@ CONFIG_SHARED equ 0
CONFIG_SIZE_LIMIT equ 1
CONFIG_SPATIAL_RESAMPLING equ 1
CONFIG_STATIC equ 1
CONFIG_UNIT_TESTS equ 1
CONFIG_WEBM_IO equ 1
DECODE_HEIGHT_LIMIT equ 16384
DECODE_WIDTH_LIMIT equ 16384
......
third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_config.h
View file @ d969f8bf
......@@ -25,9 +25,7 @@
#define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
#define CONFIG_COLLECT_RD_STATS 0
#define CONFIG_DEBUG 0
#define CONFIG_DECODE_PERF_TESTS 0
#define CONFIG_DIST_8X8 1
#define CONFIG_ENCODE_PERF_TESTS 0
#define CONFIG_ENTROPY_STATS 0
#define CONFIG_FILEOPTIONS 1
#define CONFIG_FP_MB_STATS 0
......@@ -50,7 +48,6 @@
#define CONFIG_SIZE_LIMIT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_STATIC 1
#define CONFIG_UNIT_TESTS 1
#define CONFIG_WEBM_IO 1
#define DECODE_HEIGHT_LIMIT 16384
#define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/aom_dsp_rtcd.h
View file @ d969f8bf
......@@ -30,7 +30,24 @@ void aom_blend_a64_hmask_c(uint8_t* dst,
const uint8_t* mask,
int w,
int h);
#define aom_blend_a64_hmask aom_blend_a64_hmask_c
void aom_blend_a64_hmask_neon(uint8_t* dst,
uint32_t dst_stride,
const uint8_t* src0,
uint32_t src0_stride,
const uint8_t* src1,
uint32_t src1_stride,
const uint8_t* mask,
int w,
int h);
RTCD_EXTERN void (*aom_blend_a64_hmask)(uint8_t* dst,
uint32_t dst_stride,
const uint8_t* src0,
uint32_t src0_stride,
const uint8_t* src1,
uint32_t src1_stride,
const uint8_t* mask,
int w,
int h);
void aom_blend_a64_mask_c(uint8_t* dst,
uint32_t dst_stride,
......@@ -55,7 +72,24 @@ void aom_blend_a64_vmask_c(uint8_t* dst,
const uint8_t* mask,
int w,
int h);
#define aom_blend_a64_vmask aom_blend_a64_vmask_c
void aom_blend_a64_vmask_neon(uint8_t* dst,
uint32_t dst_stride,
const uint8_t* src0,
uint32_t src0_stride,
const uint8_t* src1,
uint32_t src1_stride,
const uint8_t* mask,
int w,
int h);
RTCD_EXTERN void (*aom_blend_a64_vmask)(uint8_t* dst,
uint32_t dst_stride,
const uint8_t* src0,
uint32_t src0_stride,
const uint8_t* src1,
uint32_t src1_stride,
const uint8_t* mask,
int w,
int h);
void aom_convolve8_horiz_c(const uint8_t* src,
ptrdiff_t src_stride,
......@@ -3352,6 +3386,12 @@ static void setup_rtcd_internal(void) {
(void)flags;
aom_blend_a64_hmask = aom_blend_a64_hmask_c;
if (flags & HAS_NEON)
aom_blend_a64_hmask = aom_blend_a64_hmask_neon;
aom_blend_a64_vmask = aom_blend_a64_vmask_c;
if (flags & HAS_NEON)
aom_blend_a64_vmask = aom_blend_a64_vmask_neon;
aom_dc_128_predictor_16x16 = aom_dc_128_predictor_16x16_c;
if (flags & HAS_NEON)
aom_dc_128_predictor_16x16 = aom_dc_128_predictor_16x16_neon;
......
third_party/libaom/source/config/linux/arm-neon-cpu-detect/config/av1_rtcd.h
View file @ d969f8bf
......@@ -91,8 +91,27 @@ void av1_build_compound_diffwtd_mask_d16_c(uint8_t* mask,
int w,
ConvolveParams* conv_params,
int bd);
#define av1_build_compound_diffwtd_mask_d16 \
av1_build_compound_diffwtd_mask_d16_c
void av1_build_compound_diffwtd_mask_d16_neon(uint8_t* mask,
DIFFWTD_MASK_TYPE mask_type,
const CONV_BUF_TYPE* src0,
int src0_stride,
const CONV_BUF_TYPE* src1,
int src1_stride,
int h,
int w,
ConvolveParams* conv_params,
int bd);
RTCD_EXTERN void (*av1_build_compound_diffwtd_mask_d16)(
uint8_t* mask,
DIFFWTD_MASK_TYPE mask_type,
const CONV_BUF_TYPE* src0,
int src0_stride,
const CONV_BUF_TYPE* src1,
int src1_stride,
int h,
int w,
ConvolveParams* conv_params,
int bd);
void av1_build_compound_diffwtd_mask_highbd_c(uint8_t* mask,
DIFFWTD_MASK_TYPE mask_type,
......@@ -1095,6 +1114,10 @@ static void setup_rtcd_internal(void) {
(void)flags;
av1_build_compound_diffwtd_mask_d16 = av1_build_compound_diffwtd_mask_d16_c;
if (flags & HAS_NEON)
av1_build_compound_diffwtd_mask_d16 =
av1_build_compound_diffwtd_mask_d16_neon;
av1_convolve_2d_copy_sr = av1_convolve_2d_copy_sr_c;
if (flags & HAS_NEON)
av1_convolve_2d_copy_sr = av1_convolve_2d_copy_sr_neon;
......
third_party/libaom/source/config/linux/arm-neon/config/aom_config.asm
View file @ d969f8bf
......@@ -23,9 +23,7 @@ CONFIG_COEFFICIENT_RANGE_CHECKING equ 0
CONFIG_COLLECT_INTER_MODE_RD_STATS equ 1
CONFIG_COLLECT_RD_STATS equ 0
CONFIG_DEBUG equ 0
CONFIG_DECODE_PERF_TESTS equ 0
CONFIG_DIST_8X8 equ 1
CONFIG_ENCODE_PERF_TESTS equ 0
CONFIG_ENTROPY_STATS equ 0
CONFIG_FILEOPTIONS equ 1
CONFIG_FP_MB_STATS equ 0
......@@ -48,7 +46,6 @@ CONFIG_SHARED equ 0
CONFIG_SIZE_LIMIT equ 1
CONFIG_SPATIAL_RESAMPLING equ 1
CONFIG_STATIC equ 1
CONFIG_UNIT_TESTS equ 1
CONFIG_WEBM_IO equ 1
DECODE_HEIGHT_LIMIT equ 16384
DECODE_WIDTH_LIMIT equ 16384
......
third_party/libaom/source/config/linux/arm-neon/config/aom_config.h
View file @ d969f8bf
......@@ -25,9 +25,7 @@
#define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
#define CONFIG_COLLECT_RD_STATS 0
#define CONFIG_DEBUG 0
#define CONFIG_DECODE_PERF_TESTS 0
#define CONFIG_DIST_8X8 1
#define CONFIG_ENCODE_PERF_TESTS 0
#define CONFIG_ENTROPY_STATS 0
#define CONFIG_FILEOPTIONS 1
#define CONFIG_FP_MB_STATS 0
......@@ -50,7 +48,6 @@
#define CONFIG_SIZE_LIMIT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_STATIC 1
#define CONFIG_UNIT_TESTS 1
#define CONFIG_WEBM_IO 1
#define DECODE_HEIGHT_LIMIT 16384
#define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/linux/arm-neon/config/aom_dsp_rtcd.h
View file @ d969f8bf
......@@ -30,7 +30,16 @@ void aom_blend_a64_hmask_c(uint8_t* dst,
const uint8_t* mask,
int w,
int h);
#define aom_blend_a64_hmask aom_blend_a64_hmask_c
void aom_blend_a64_hmask_neon(uint8_t* dst,
uint32_t dst_stride,
const uint8_t* src0,
uint32_t src0_stride,
const uint8_t* src1,
uint32_t src1_stride,
const uint8_t* mask,
int w,
int h);
#define aom_blend_a64_hmask aom_blend_a64_hmask_neon
void aom_blend_a64_mask_c(uint8_t* dst,
uint32_t dst_stride,
......@@ -55,7 +64,16 @@ void aom_blend_a64_vmask_c(uint8_t* dst,
const uint8_t* mask,
int w,
int h);
#define aom_blend_a64_vmask aom_blend_a64_vmask_c
void aom_blend_a64_vmask_neon(uint8_t* dst,
uint32_t dst_stride,
const uint8_t* src0,
uint32_t src0_stride,
const uint8_t* src1,
uint32_t src1_stride,
const uint8_t* mask,
int w,
int h);
#define aom_blend_a64_vmask aom_blend_a64_vmask_neon
void aom_convolve8_horiz_c(const uint8_t* src,
ptrdiff_t src_stride,
......
third_party/libaom/source/config/linux/arm-neon/config/av1_rtcd.h
View file @ d969f8bf
......@@ -91,8 +91,18 @@ void av1_build_compound_diffwtd_mask_d16_c(uint8_t* mask,
int w,
ConvolveParams* conv_params,
int bd);
void av1_build_compound_diffwtd_mask_d16_neon(uint8_t* mask,
DIFFWTD_MASK_TYPE mask_type,
const CONV_BUF_TYPE* src0,
int src0_stride,
const CONV_BUF_TYPE* src1,
int src1_stride,
int h,
int w,
ConvolveParams* conv_params,
int bd);
#define av1_build_compound_diffwtd_mask_d16 \
av1_build_compound_diffwtd_mask_d16_c
av1_build_compound_diffwtd_mask_d16_neon
void av1_build_compound_diffwtd_mask_highbd_c(uint8_t* mask,
DIFFWTD_MASK_TYPE mask_type,
......
third_party/libaom/source/config/linux/arm/config/aom_config.asm
View file @ d969f8bf
......@@ -23,9 +23,7 @@ CONFIG_COEFFICIENT_RANGE_CHECKING equ 0
CONFIG_COLLECT_INTER_MODE_RD_STATS equ 1
CONFIG_COLLECT_RD_STATS equ 0
CONFIG_DEBUG equ 0
CONFIG_DECODE_PERF_TESTS equ 0
CONFIG_DIST_8X8 equ 1
CONFIG_ENCODE_PERF_TESTS equ 0
CONFIG_ENTROPY_STATS equ 0
CONFIG_FILEOPTIONS equ 1
CONFIG_FP_MB_STATS equ 0
......@@ -48,7 +46,6 @@ CONFIG_SHARED equ 0
CONFIG_SIZE_LIMIT equ 1
CONFIG_SPATIAL_RESAMPLING equ 1
CONFIG_STATIC equ 1
CONFIG_UNIT_TESTS equ 1
CONFIG_WEBM_IO equ 1
DECODE_HEIGHT_LIMIT equ 16384
DECODE_WIDTH_LIMIT equ 16384
......
third_party/libaom/source/config/linux/arm/config/aom_config.h
View file @ d969f8bf
......@@ -25,9 +25,7 @@
#define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
#define CONFIG_COLLECT_RD_STATS 0
#define CONFIG_DEBUG 0
#define CONFIG_DECODE_PERF_TESTS 0
#define CONFIG_DIST_8X8 1
#define CONFIG_ENCODE_PERF_TESTS 0
#define CONFIG_ENTROPY_STATS 0
#define CONFIG_FILEOPTIONS 1
#define CONFIG_FP_MB_STATS 0
......@@ -50,7 +48,6 @@
#define CONFIG_SIZE_LIMIT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_STATIC 1
#define CONFIG_UNIT_TESTS 1
#define CONFIG_WEBM_IO 1
#define DECODE_HEIGHT_LIMIT 16384
#define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/linux/arm64/config/aom_config.asm
View file @ d969f8bf
......@@ -23,9 +23,7 @@ CONFIG_COEFFICIENT_RANGE_CHECKING equ 0
CONFIG_COLLECT_INTER_MODE_RD_STATS equ 1
CONFIG_COLLECT_RD_STATS equ 0
CONFIG_DEBUG equ 0
CONFIG_DECODE_PERF_TESTS equ 0
CONFIG_DIST_8X8 equ 1
CONFIG_ENCODE_PERF_TESTS equ 0
CONFIG_ENTROPY_STATS equ 0
CONFIG_FILEOPTIONS equ 1
CONFIG_FP_MB_STATS equ 0
......@@ -48,7 +46,6 @@ CONFIG_SHARED equ 0
CONFIG_SIZE_LIMIT equ 1
CONFIG_SPATIAL_RESAMPLING equ 1
CONFIG_STATIC equ 1
CONFIG_UNIT_TESTS equ 1
CONFIG_WEBM_IO equ 1
DECODE_HEIGHT_LIMIT equ 16384
DECODE_WIDTH_LIMIT equ 16384
......
third_party/libaom/source/config/linux/arm64/config/aom_config.h
View file @ d969f8bf
......@@ -25,9 +25,7 @@
#define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
#define CONFIG_COLLECT_RD_STATS 0
#define CONFIG_DEBUG 0
#define CONFIG_DECODE_PERF_TESTS 0
#define CONFIG_DIST_8X8 1
#define CONFIG_ENCODE_PERF_TESTS 0
#define CONFIG_ENTROPY_STATS 0
#define CONFIG_FILEOPTIONS 1
#define CONFIG_FP_MB_STATS 0
......@@ -50,7 +48,6 @@
#define CONFIG_SIZE_LIMIT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_STATIC 1
#define CONFIG_UNIT_TESTS 1
#define CONFIG_WEBM_IO 1
#define DECODE_HEIGHT_LIMIT 16384
#define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/linux/arm64/config/aom_dsp_rtcd.h
View file @ d969f8bf
......@@ -30,7 +30,16 @@ void aom_blend_a64_hmask_c(uint8_t* dst,
const uint8_t* mask,
int w,
int h);
#define aom_blend_a64_hmask aom_blend_a64_hmask_c
void aom_blend_a64_hmask_neon(uint8_t* dst,
uint32_t dst_stride,
const uint8_t* src0,
uint32_t src0_stride,
const uint8_t* src1,
uint32_t src1_stride,
const uint8_t* mask,
int w,
int h);
#define aom_blend_a64_hmask aom_blend_a64_hmask_neon
void aom_blend_a64_mask_c(uint8_t* dst,
uint32_t dst_stride,
......@@ -55,7 +64,16 @@ void aom_blend_a64_vmask_c(uint8_t* dst,
const uint8_t* mask,
int w,
int h);
#define aom_blend_a64_vmask aom_blend_a64_vmask_c
void aom_blend_a64_vmask_neon(uint8_t* dst,
uint32_t dst_stride,
const uint8_t* src0,
uint32_t src0_stride,
const uint8_t* src1,
uint32_t src1_stride,
const uint8_t* mask,
int w,
int h);
#define aom_blend_a64_vmask aom_blend_a64_vmask_neon
void aom_convolve8_horiz_c(const uint8_t* src,
ptrdiff_t src_stride,
......
third_party/libaom/source/config/linux/arm64/config/av1_rtcd.h
View file @ d969f8bf
......@@ -91,8 +91,18 @@ void av1_build_compound_diffwtd_mask_d16_c(uint8_t* mask,
int w,
ConvolveParams* conv_params,
int bd);
void av1_build_compound_diffwtd_mask_d16_neon(uint8_t* mask,
DIFFWTD_MASK_TYPE mask_type,
const CONV_BUF_TYPE* src0,
int src0_stride,
const CONV_BUF_TYPE* src1,
int src1_stride,
int h,
int w,
ConvolveParams* conv_params,
int bd);
#define av1_build_compound_diffwtd_mask_d16 \
av1_build_compound_diffwtd_mask_d16_c
av1_build_compound_diffwtd_mask_d16_neon
void av1_build_compound_diffwtd_mask_highbd_c(uint8_t* mask,
DIFFWTD_MASK_TYPE mask_type,
......
third_party/libaom/source/config/linux/generic/config/aom_config.asm
View file @ d969f8bf
......@@ -23,9 +23,7 @@ CONFIG_COEFFICIENT_RANGE_CHECKING equ 0
CONFIG_COLLECT_INTER_MODE_RD_STATS equ 1
CONFIG_COLLECT_RD_STATS equ 0
CONFIG_DEBUG equ 0
CONFIG_DECODE_PERF_TESTS equ 0
CONFIG_DIST_8X8 equ 1
CONFIG_ENCODE_PERF_TESTS equ 0
CONFIG_ENTROPY_STATS equ 0
CONFIG_FILEOPTIONS equ 1
CONFIG_FP_MB_STATS equ 0
......@@ -48,7 +46,6 @@ CONFIG_SHARED equ 0
CONFIG_SIZE_LIMIT equ 1
CONFIG_SPATIAL_RESAMPLING equ 1
CONFIG_STATIC equ 1
CONFIG_UNIT_TESTS equ 1
CONFIG_WEBM_IO equ 1
DECODE_HEIGHT_LIMIT equ 16384
DECODE_WIDTH_LIMIT equ 16384
......
third_party/libaom/source/config/linux/generic/config/aom_config.h
View file @ d969f8bf
......@@ -25,9 +25,7 @@
#define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
#define CONFIG_COLLECT_RD_STATS 0
#define CONFIG_DEBUG 0
#define CONFIG_DECODE_PERF_TESTS 0
#define CONFIG_DIST_8X8 1
#define CONFIG_ENCODE_PERF_TESTS 0
#define CONFIG_ENTROPY_STATS 0
#define CONFIG_FILEOPTIONS 1
#define CONFIG_FP_MB_STATS 0
......@@ -50,7 +48,6 @@
#define CONFIG_SIZE_LIMIT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_STATIC 1
#define CONFIG_UNIT_TESTS 1
#define CONFIG_WEBM_IO 1
#define DECODE_HEIGHT_LIMIT 16384
#define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/linux/ia32/config/aom_config.asm
View file @ d969f8bf
......@@ -13,9 +13,7 @@
%define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
%define CONFIG_COLLECT_RD_STATS 0
%define CONFIG_DEBUG 0
%define CONFIG_DECODE_PERF_TESTS 0
%define CONFIG_DIST_8X8 1
%define CONFIG_ENCODE_PERF_TESTS 0
%define CONFIG_ENTROPY_STATS 0
%define CONFIG_FILEOPTIONS 1
%define CONFIG_FP_MB_STATS 0
......@@ -38,7 +36,6 @@
%define CONFIG_SIZE_LIMIT 1
%define CONFIG_SPATIAL_RESAMPLING 1
%define CONFIG_STATIC 1
%define CONFIG_UNIT_TESTS 1
%define CONFIG_WEBM_IO 1
%define DECODE_HEIGHT_LIMIT 16384
%define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/linux/ia32/config/aom_config.h
View file @ d969f8bf
......@@ -25,9 +25,7 @@
#define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
#define CONFIG_COLLECT_RD_STATS 0
#define CONFIG_DEBUG 0
#define CONFIG_DECODE_PERF_TESTS 0
#define CONFIG_DIST_8X8 1
#define CONFIG_ENCODE_PERF_TESTS 0
#define CONFIG_ENTROPY_STATS 0
#define CONFIG_FILEOPTIONS 1
#define CONFIG_FP_MB_STATS 0
......@@ -50,7 +48,6 @@
#define CONFIG_SIZE_LIMIT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_STATIC 1
#define CONFIG_UNIT_TESTS 1
#define CONFIG_WEBM_IO 1
#define DECODE_HEIGHT_LIMIT 16384
#define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/linux/x64/config/aom_config.asm
View file @ d969f8bf
......@@ -13,9 +13,7 @@
%define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
%define CONFIG_COLLECT_RD_STATS 0
%define CONFIG_DEBUG 0
%define CONFIG_DECODE_PERF_TESTS 0
%define CONFIG_DIST_8X8 1
%define CONFIG_ENCODE_PERF_TESTS 0
%define CONFIG_ENTROPY_STATS 0
%define CONFIG_FILEOPTIONS 1
%define CONFIG_FP_MB_STATS 0
......@@ -38,7 +36,6 @@
%define CONFIG_SIZE_LIMIT 1
%define CONFIG_SPATIAL_RESAMPLING 1
%define CONFIG_STATIC 1
%define CONFIG_UNIT_TESTS 1
%define CONFIG_WEBM_IO 1
%define DECODE_HEIGHT_LIMIT 16384
%define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/linux/x64/config/aom_config.h
View file @ d969f8bf
......@@ -25,9 +25,7 @@
#define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
#define CONFIG_COLLECT_RD_STATS 0
#define CONFIG_DEBUG 0
#define CONFIG_DECODE_PERF_TESTS 0
#define CONFIG_DIST_8X8 1
#define CONFIG_ENCODE_PERF_TESTS 0
#define CONFIG_ENTROPY_STATS 0
#define CONFIG_FILEOPTIONS 1
#define CONFIG_FP_MB_STATS 0
......@@ -50,7 +48,6 @@
#define CONFIG_SIZE_LIMIT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_STATIC 1
#define CONFIG_UNIT_TESTS 1
#define CONFIG_WEBM_IO 1
#define DECODE_HEIGHT_LIMIT 16384
#define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/win/ia32/config/aom_config.asm
View file @ d969f8bf
......@@ -13,9 +13,7 @@
%define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
%define CONFIG_COLLECT_RD_STATS 0
%define CONFIG_DEBUG 0
%define CONFIG_DECODE_PERF_TESTS 0
%define CONFIG_DIST_8X8 1
%define CONFIG_ENCODE_PERF_TESTS 0
%define CONFIG_ENTROPY_STATS 0
%define CONFIG_FILEOPTIONS 1
%define CONFIG_FP_MB_STATS 0
......@@ -38,7 +36,6 @@
%define CONFIG_SIZE_LIMIT 1
%define CONFIG_SPATIAL_RESAMPLING 1
%define CONFIG_STATIC 1
%define CONFIG_UNIT_TESTS 1
%define CONFIG_WEBM_IO 1
%define DECODE_HEIGHT_LIMIT 16384
%define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/win/ia32/config/aom_config.h
View file @ d969f8bf
......@@ -25,9 +25,7 @@
#define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
#define CONFIG_COLLECT_RD_STATS 0
#define CONFIG_DEBUG 0
#define CONFIG_DECODE_PERF_TESTS 0
#define CONFIG_DIST_8X8 1
#define CONFIG_ENCODE_PERF_TESTS 0
#define CONFIG_ENTROPY_STATS 0
#define CONFIG_FILEOPTIONS 1
#define CONFIG_FP_MB_STATS 0
......@@ -50,7 +48,6 @@
#define CONFIG_SIZE_LIMIT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_STATIC 1
#define CONFIG_UNIT_TESTS 1
#define CONFIG_WEBM_IO 1
#define DECODE_HEIGHT_LIMIT 16384
#define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/win/x64/config/aom_config.asm
View file @ d969f8bf
......@@ -13,9 +13,7 @@
%define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
%define CONFIG_COLLECT_RD_STATS 0
%define CONFIG_DEBUG 0
%define CONFIG_DECODE_PERF_TESTS 0
%define CONFIG_DIST_8X8 1
%define CONFIG_ENCODE_PERF_TESTS 0
%define CONFIG_ENTROPY_STATS 0
%define CONFIG_FILEOPTIONS 1
%define CONFIG_FP_MB_STATS 0
......@@ -38,7 +36,6 @@
%define CONFIG_SIZE_LIMIT 1
%define CONFIG_SPATIAL_RESAMPLING 1
%define CONFIG_STATIC 1
%define CONFIG_UNIT_TESTS 1
%define CONFIG_WEBM_IO 1
%define DECODE_HEIGHT_LIMIT 16384
%define DECODE_WIDTH_LIMIT 16384
......
third_party/libaom/source/config/win/x64/config/aom_config.h
View file @ d969f8bf
......@@ -25,9 +25,7 @@
#define CONFIG_COLLECT_INTER_MODE_RD_STATS 1
#define CONFIG_COLLECT_RD_STATS 0
#define CONFIG_DEBUG 0
#define CONFIG_DECODE_PERF_TESTS 0
#define CONFIG_DIST_8X8 1
#define CONFIG_ENCODE_PERF_TESTS 0
#define CONFIG_ENTROPY_STATS 0
#define CONFIG_FILEOPTIONS 1
#define CONFIG_FP_MB_STATS 0
......@@ -50,7 +48,6 @@
#define CONFIG_SIZE_LIMIT 1
#define CONFIG_SPATIAL_RESAMPLING 1
#define CONFIG_STATIC 1
#define CONFIG_UNIT_TESTS 1
#define CONFIG_WEBM_IO 1
#define DECODE_HEIGHT_LIMIT 16384
#define DECODE_WIDTH_LIMIT 16384
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment