diff options
Diffstat (limited to 'media/libaom/config/linux/arm')
| -rw-r--r-- | media/libaom/config/linux/arm/aom_config.asm | 63 | ||||
| -rw-r--r-- | media/libaom/config/linux/arm/aom_config.h | 63 | ||||
| -rw-r--r-- | media/libaom/config/linux/arm/aom_dsp_rtcd.h | 99 | ||||
| -rw-r--r-- | media/libaom/config/linux/arm/av1_rtcd.h | 179 |
4 files changed, 207 insertions, 197 deletions
diff --git a/media/libaom/config/linux/arm/aom_config.asm b/media/libaom/config/linux/arm/aom_config.asm index 70a8ca732..1da814ec1 100644 --- a/media/libaom/config/linux/arm/aom_config.asm +++ b/media/libaom/config/linux/arm/aom_config.asm @@ -49,8 +49,6 @@ .equ CONFIG_STATIC_MSVCRT , 0 .equ CONFIG_SPATIAL_RESAMPLING , 1 .equ CONFIG_REALTIME_ONLY , 1 -.equ CONFIG_ONTHEFLY_BITPACKING , 0 -.equ CONFIG_ERROR_CONCEALMENT , 0 .equ CONFIG_SHARED , 0 .equ CONFIG_STATIC , 1 .equ CONFIG_SMALL , 0 @@ -63,73 +61,71 @@ .equ CONFIG_INSPECTION , 0 .equ CONFIG_DECODE_PERF_TESTS , 0 .equ CONFIG_ENCODE_PERF_TESTS , 0 +.equ CONFIG_BITSTREAM_DEBUG , 0 +.equ CONFIG_SYMBOLRATE , 0 .equ CONFIG_COEFFICIENT_RANGE_CHECKING , 0 .equ CONFIG_LOWBITDEPTH , 1 .equ CONFIG_HIGHBITDEPTH , 1 .equ CONFIG_EXPERIMENTAL , 0 .equ CONFIG_SIZE_LIMIT , 1 -.equ CONFIG_COLORSPACE_HEADERS , 0 .equ CONFIG_FP_MB_STATS , 0 .equ CONFIG_CDEF , 1 +.equ CONFIG_CDEF_SINGLEPASS , 1 .equ CONFIG_VAR_TX , 1 .equ CONFIG_RECT_TX , 1 .equ CONFIG_RECT_TX_EXT , 0 .equ CONFIG_TPL_MV , 0 .equ CONFIG_DUAL_FILTER , 1 -.equ CONFIG_CONVOLVE_ROUND , 0 +.equ CONFIG_CONVOLVE_ROUND , 1 .equ CONFIG_COMPOUND_ROUND , 0 .equ CONFIG_EXT_TX , 1 -.equ CONFIG_DPCM_INTRA , 0 .equ CONFIG_TX64X64 , 0 .equ CONFIG_EXT_INTRA , 1 .equ CONFIG_INTRA_INTERP , 0 .equ CONFIG_FILTER_INTRA , 0 -.equ CONFIG_INTRA_EDGE , 0 +.equ CONFIG_INTRA_EDGE , 1 .equ CONFIG_INTRABC , 0 -.equ CONFIG_EXT_INTER , 1 .equ CONFIG_INTERINTRA , 1 .equ CONFIG_WEDGE , 1 .equ CONFIG_COMPOUND_SEGMENT , 1 .equ CONFIG_EXT_REFS , 1 -.equ CONFIG_ALTREF2 , 0 -.equ CONFIG_SPEED_REFS , 0 -.equ CONFIG_GF_GROUPS , 0 -.equ CONFIG_FLEX_REFS , 0 .equ CONFIG_GLOBAL_MOTION , 1 .equ CONFIG_NEW_QUANT , 0 .equ CONFIG_SUPERTX , 0 .equ CONFIG_ANS , 0 -.equ CONFIG_LOOP_RESTORATION , 0 +.equ CONFIG_LOOP_RESTORATION , 1 +.equ CONFIG_STRIPED_LOOP_RESTORATION , 0 .equ CONFIG_EXT_PARTITION , 0 .equ CONFIG_EXT_PARTITION_TYPES , 0 +.equ CONFIG_EXT_PARTITION_TYPES_AB , 0 .equ CONFIG_UNPOISON_PARTITION_CTX , 0 .equ CONFIG_EXT_TILE , 0 .equ CONFIG_MOTION_VAR , 1 .equ CONFIG_NCOBMC , 0 .equ CONFIG_WARPED_MOTION , 1 .equ CONFIG_Q_ADAPT_PROBS , 0 -.equ CONFIG_BITSTREAM_DEBUG , 0 .equ CONFIG_INTER_STATS_ONLY , 0 -.equ CONFIG_ALT_INTRA , 1 -.equ CONFIG_PALETTE , 1 .equ CONFIG_PALETTE_DELTA_ENCODING , 0 .equ CONFIG_RAWBITS , 0 -.equ CONFIG_EC_SMALLMUL , 1 +.equ CONFIG_KF_CTX , 0 .equ CONFIG_PVQ , 0 .equ CONFIG_CFL , 0 .equ CONFIG_XIPHRC , 0 .equ CONFIG_DCT_ONLY , 0 +.equ CONFIG_DAALA_TX , 0 .equ CONFIG_DAALA_DCT4 , 0 .equ CONFIG_DAALA_DCT8 , 0 +.equ CONFIG_DAALA_DCT16 , 0 +.equ CONFIG_DAALA_DCT32 , 0 +.equ CONFIG_DAALA_DCT64 , 0 .equ CONFIG_CB4X4 , 1 .equ CONFIG_CHROMA_2X2 , 0 .equ CONFIG_CHROMA_SUB8X8 , 1 .equ CONFIG_FRAME_SIZE , 0 -.equ CONFIG_DELTA_Q , 1 .equ CONFIG_EXT_DELTA_Q , 1 .equ CONFIG_ADAPT_SCAN , 0 -.equ CONFIG_FILTER_7BIT , 1 .equ CONFIG_PARALLEL_DEBLOCKING , 1 +.equ CONFIG_DEBLOCK_13TAP , 0 .equ CONFIG_LOOPFILTERING_ACROSS_TILES , 1 .equ CONFIG_TEMPMV_SIGNALING , 1 .equ CONFIG_RD_DEBUG , 0 @@ -138,30 +134,47 @@ .equ CONFIG_ENTROPY_STATS , 0 .equ CONFIG_MASKED_TX , 0 .equ CONFIG_DEPENDENT_HORZTILES , 0 -.equ CONFIG_DIST_8X8 , 0 -.equ CONFIG_DAALA_DIST , 0 -.equ CONFIG_TRIPRED , 0 +.equ CONFIG_DIST_8X8 , 1 .equ CONFIG_PALETTE_THROUGHPUT , 1 .equ CONFIG_REF_ADAPT , 0 .equ CONFIG_LV_MAP , 0 +.equ CONFIG_CTX1D , 0 .equ CONFIG_TXK_SEL , 0 .equ CONFIG_MV_COMPRESS , 1 +.equ CONFIG_SEGMENT_ZEROMV , 0 .equ CONFIG_FRAME_SUPERRES , 0 .equ CONFIG_NEW_MULTISYMBOL , 0 .equ CONFIG_COMPOUND_SINGLEREF , 0 -.equ CONFIG_AOM_QM , 0 +.equ CONFIG_AOM_QM , 1 .equ CONFIG_ONE_SIDED_COMPOUND , 1 -.equ CONFIG_EXT_COMP_REFS , 0 +.equ CONFIG_EXT_COMP_REFS , 1 .equ CONFIG_SMOOTH_HV , 1 .equ CONFIG_VAR_REFS , 0 -.equ CONFIG_RECT_INTRA_PRED , 1 .equ CONFIG_LGT , 0 +.equ CONFIG_LGT_FROM_PRED , 0 .equ CONFIG_SBL_SYMBOL , 0 .equ CONFIG_NCOBMC_ADAPT_WEIGHT , 0 .equ CONFIG_BGSPRITE , 0 .equ CONFIG_VAR_TX_NO_TX_MODE , 0 .equ CONFIG_MRC_TX , 0 .equ CONFIG_LPF_DIRECT , 0 -.equ CONFIG_UV_LVL , 0 +.equ CONFIG_LOOPFILTER_LEVEL , 0 +.equ CONFIG_NO_FRAME_CONTEXT_SIGNALING , 0 +.equ CONFIG_TXMG , 1 +.equ CONFIG_MAX_TILE , 0 +.equ CONFIG_HASH_ME , 0 +.equ CONFIG_COLORSPACE_HEADERS , 0 +.equ CONFIG_MFMV , 0 +.equ CONFIG_FRAME_MARKER , 0 +.equ CONFIG_JNT_COMP , 0 +.equ CONFIG_FRAME_SIGN_BIAS , 0 +.equ CONFIG_EXT_SKIP , 0 +.equ CONFIG_OBU , 0 +.equ CONFIG_AMVR , 0 +.equ CONFIG_LPF_SB , 0 +.equ CONFIG_OPT_REF_MV , 0 +.equ CONFIG_TMV , 0 +.equ CONFIG_RESTRICT_COMPRESSED_HDR , 0 +.equ CONFIG_HORZONLY_FRAME_SUPERRES , 0 .equ CONFIG_ANALYZER , 0 .section .note.GNU-stack,"",%progbits diff --git a/media/libaom/config/linux/arm/aom_config.h b/media/libaom/config/linux/arm/aom_config.h index 8f4cba92e..07653806c 100644 --- a/media/libaom/config/linux/arm/aom_config.h +++ b/media/libaom/config/linux/arm/aom_config.h @@ -59,8 +59,6 @@ #define CONFIG_STATIC_MSVCRT 0 #define CONFIG_SPATIAL_RESAMPLING 1 #define CONFIG_REALTIME_ONLY 1 -#define CONFIG_ONTHEFLY_BITPACKING 0 -#define CONFIG_ERROR_CONCEALMENT 0 #define CONFIG_SHARED 0 #define CONFIG_STATIC 1 #define CONFIG_SMALL 0 @@ -73,73 +71,71 @@ #define CONFIG_INSPECTION 0 #define CONFIG_DECODE_PERF_TESTS 0 #define CONFIG_ENCODE_PERF_TESTS 0 +#define CONFIG_BITSTREAM_DEBUG 0 +#define CONFIG_SYMBOLRATE 0 #define CONFIG_COEFFICIENT_RANGE_CHECKING 0 #define CONFIG_LOWBITDEPTH 1 #define CONFIG_HIGHBITDEPTH 1 #define CONFIG_EXPERIMENTAL 0 #define CONFIG_SIZE_LIMIT 1 -#define CONFIG_COLORSPACE_HEADERS 0 #define CONFIG_FP_MB_STATS 0 #define CONFIG_CDEF 1 +#define CONFIG_CDEF_SINGLEPASS 1 #define CONFIG_VAR_TX 1 #define CONFIG_RECT_TX 1 #define CONFIG_RECT_TX_EXT 0 #define CONFIG_TPL_MV 0 #define CONFIG_DUAL_FILTER 1 -#define CONFIG_CONVOLVE_ROUND 0 +#define CONFIG_CONVOLVE_ROUND 1 #define CONFIG_COMPOUND_ROUND 0 #define CONFIG_EXT_TX 1 -#define CONFIG_DPCM_INTRA 0 #define CONFIG_TX64X64 0 #define CONFIG_EXT_INTRA 1 #define CONFIG_INTRA_INTERP 0 #define CONFIG_FILTER_INTRA 0 -#define CONFIG_INTRA_EDGE 0 +#define CONFIG_INTRA_EDGE 1 #define CONFIG_INTRABC 0 -#define CONFIG_EXT_INTER 1 #define CONFIG_INTERINTRA 1 #define CONFIG_WEDGE 1 #define CONFIG_COMPOUND_SEGMENT 1 #define CONFIG_EXT_REFS 1 -#define CONFIG_ALTREF2 0 -#define CONFIG_SPEED_REFS 0 -#define CONFIG_GF_GROUPS 0 -#define CONFIG_FLEX_REFS 0 #define CONFIG_GLOBAL_MOTION 1 #define CONFIG_NEW_QUANT 0 #define CONFIG_SUPERTX 0 #define CONFIG_ANS 0 -#define CONFIG_LOOP_RESTORATION 0 +#define CONFIG_LOOP_RESTORATION 1 +#define CONFIG_STRIPED_LOOP_RESTORATION 0 #define CONFIG_EXT_PARTITION 0 #define CONFIG_EXT_PARTITION_TYPES 0 +#define CONFIG_EXT_PARTITION_TYPES_AB 0 #define CONFIG_UNPOISON_PARTITION_CTX 0 #define CONFIG_EXT_TILE 0 #define CONFIG_MOTION_VAR 1 #define CONFIG_NCOBMC 0 #define CONFIG_WARPED_MOTION 1 #define CONFIG_Q_ADAPT_PROBS 0 -#define CONFIG_BITSTREAM_DEBUG 0 #define CONFIG_INTER_STATS_ONLY 0 -#define CONFIG_ALT_INTRA 1 -#define CONFIG_PALETTE 1 #define CONFIG_PALETTE_DELTA_ENCODING 0 #define CONFIG_RAWBITS 0 -#define CONFIG_EC_SMALLMUL 1 +#define CONFIG_KF_CTX 0 #define CONFIG_PVQ 0 #define CONFIG_CFL 0 #define CONFIG_XIPHRC 0 #define CONFIG_DCT_ONLY 0 +#define CONFIG_DAALA_TX 0 #define CONFIG_DAALA_DCT4 0 #define CONFIG_DAALA_DCT8 0 +#define CONFIG_DAALA_DCT16 0 +#define CONFIG_DAALA_DCT32 0 +#define CONFIG_DAALA_DCT64 0 #define CONFIG_CB4X4 1 #define CONFIG_CHROMA_2X2 0 #define CONFIG_CHROMA_SUB8X8 1 #define CONFIG_FRAME_SIZE 0 -#define CONFIG_DELTA_Q 1 #define CONFIG_EXT_DELTA_Q 1 #define CONFIG_ADAPT_SCAN 0 -#define CONFIG_FILTER_7BIT 1 #define CONFIG_PARALLEL_DEBLOCKING 1 +#define CONFIG_DEBLOCK_13TAP 0 #define CONFIG_LOOPFILTERING_ACROSS_TILES 1 #define CONFIG_TEMPMV_SIGNALING 1 #define CONFIG_RD_DEBUG 0 @@ -148,31 +144,48 @@ #define CONFIG_ENTROPY_STATS 0 #define CONFIG_MASKED_TX 0 #define CONFIG_DEPENDENT_HORZTILES 0 -#define CONFIG_DIST_8X8 0 -#define CONFIG_DAALA_DIST 0 -#define CONFIG_TRIPRED 0 +#define CONFIG_DIST_8X8 1 #define CONFIG_PALETTE_THROUGHPUT 1 #define CONFIG_REF_ADAPT 0 #define CONFIG_LV_MAP 0 +#define CONFIG_CTX1D 0 #define CONFIG_TXK_SEL 0 #define CONFIG_MV_COMPRESS 1 +#define CONFIG_SEGMENT_ZEROMV 0 #define CONFIG_FRAME_SUPERRES 0 #define CONFIG_NEW_MULTISYMBOL 0 #define CONFIG_COMPOUND_SINGLEREF 0 -#define CONFIG_AOM_QM 0 +#define CONFIG_AOM_QM 1 #define CONFIG_ONE_SIDED_COMPOUND 1 -#define CONFIG_EXT_COMP_REFS 0 +#define CONFIG_EXT_COMP_REFS 1 #define CONFIG_SMOOTH_HV 1 #define CONFIG_VAR_REFS 0 -#define CONFIG_RECT_INTRA_PRED 1 #define CONFIG_LGT 0 +#define CONFIG_LGT_FROM_PRED 0 #define CONFIG_SBL_SYMBOL 0 #define CONFIG_NCOBMC_ADAPT_WEIGHT 0 #define CONFIG_BGSPRITE 0 #define CONFIG_VAR_TX_NO_TX_MODE 0 #define CONFIG_MRC_TX 0 #define CONFIG_LPF_DIRECT 0 -#define CONFIG_UV_LVL 0 +#define CONFIG_LOOPFILTER_LEVEL 0 +#define CONFIG_NO_FRAME_CONTEXT_SIGNALING 0 +#define CONFIG_TXMG 1 +#define CONFIG_MAX_TILE 0 +#define CONFIG_HASH_ME 0 +#define CONFIG_COLORSPACE_HEADERS 0 +#define CONFIG_MFMV 0 +#define CONFIG_FRAME_MARKER 0 +#define CONFIG_JNT_COMP 0 +#define CONFIG_FRAME_SIGN_BIAS 0 +#define CONFIG_EXT_SKIP 0 +#define CONFIG_OBU 0 +#define CONFIG_AMVR 0 +#define CONFIG_LPF_SB 0 +#define CONFIG_OPT_REF_MV 0 +#define CONFIG_TMV 0 +#define CONFIG_RESTRICT_COMPRESSED_HDR 0 +#define CONFIG_HORZONLY_FRAME_SUPERRES 0 #define CONFIG_ANALYZER 0 #define DECODE_WIDTH_LIMIT 8192 #define DECODE_HEIGHT_LIMIT 4608 diff --git a/media/libaom/config/linux/arm/aom_dsp_rtcd.h b/media/libaom/config/linux/arm/aom_dsp_rtcd.h index e00871066..f3c4ef490 100644 --- a/media/libaom/config/linux/arm/aom_dsp_rtcd.h +++ b/media/libaom/config/linux/arm/aom_dsp_rtcd.h @@ -20,6 +20,9 @@ extern "C" { #endif +void aom_blend_a64_d32_mask_c(int32_t *dst, uint32_t dst_stride, const int32_t *src0, uint32_t src0_stride, const int32_t *src1, uint32_t src1_stride, const uint8_t *mask, uint32_t mask_stride, int h, int w, int suby, int subx); +#define aom_blend_a64_d32_mask aom_blend_a64_d32_mask_c + void aom_blend_a64_hmask_c(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 h, int w); #define aom_blend_a64_hmask aom_blend_a64_hmask_c @@ -45,6 +48,24 @@ void aom_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptr void aom_convolve8_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); RTCD_EXTERN void (*aom_convolve8)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +void aom_convolve8_add_src_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define aom_convolve8_add_src aom_convolve8_add_src_c + +void aom_convolve8_add_src_hip_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define aom_convolve8_add_src_hip aom_convolve8_add_src_hip_c + +void aom_convolve8_add_src_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define aom_convolve8_add_src_horiz aom_convolve8_add_src_horiz_c + +void aom_convolve8_add_src_horiz_hip_c(const uint8_t *src, ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define aom_convolve8_add_src_horiz_hip aom_convolve8_add_src_horiz_hip_c + +void aom_convolve8_add_src_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define aom_convolve8_add_src_vert aom_convolve8_add_src_vert_c + +void aom_convolve8_add_src_vert_hip_c(const uint16_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); +#define aom_convolve8_add_src_vert_hip aom_convolve8_add_src_vert_hip_c + void aom_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); void aom_convolve8_avg_neon(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); RTCD_EXTERN void (*aom_convolve8_avg)(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h); @@ -1245,6 +1266,24 @@ void aom_highbd_comp_mask_upsampled_pred_c(uint16_t *comp_pred, const uint8_t *p void aom_highbd_convolve8_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); #define aom_highbd_convolve8 aom_highbd_convolve8_c +void aom_highbd_convolve8_add_src_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); +#define aom_highbd_convolve8_add_src aom_highbd_convolve8_add_src_c + +void aom_highbd_convolve8_add_src_hip_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); +#define aom_highbd_convolve8_add_src_hip aom_highbd_convolve8_add_src_hip_c + +void aom_highbd_convolve8_add_src_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); +#define aom_highbd_convolve8_add_src_horiz aom_highbd_convolve8_add_src_horiz_c + +void aom_highbd_convolve8_add_src_horiz_hip_c(const uint8_t *src, ptrdiff_t src_stride, uint16_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); +#define aom_highbd_convolve8_add_src_horiz_hip aom_highbd_convolve8_add_src_horiz_hip_c + +void aom_highbd_convolve8_add_src_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); +#define aom_highbd_convolve8_add_src_vert aom_highbd_convolve8_add_src_vert_c + +void aom_highbd_convolve8_add_src_vert_hip_c(const uint16_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); +#define aom_highbd_convolve8_add_src_vert_hip aom_highbd_convolve8_add_src_vert_hip_c + void aom_highbd_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); #define aom_highbd_convolve8_avg aom_highbd_convolve8_avg_c @@ -2244,52 +2283,40 @@ void aom_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride #define aom_iwht4x4_1_add aom_iwht4x4_1_add_c void aom_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_horizontal_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -RTCD_EXTERN void (*aom_lpf_horizontal_4)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +#define aom_lpf_horizontal_4 aom_lpf_horizontal_4_c void aom_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_horizontal_4_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -RTCD_EXTERN void (*aom_lpf_horizontal_4_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); +#define aom_lpf_horizontal_4_dual aom_lpf_horizontal_4_dual_c void aom_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_horizontal_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -RTCD_EXTERN void (*aom_lpf_horizontal_8)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +#define aom_lpf_horizontal_8 aom_lpf_horizontal_8_c void aom_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_horizontal_8_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -RTCD_EXTERN void (*aom_lpf_horizontal_8_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); +#define aom_lpf_horizontal_8_dual aom_lpf_horizontal_8_dual_c void aom_lpf_horizontal_edge_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_horizontal_edge_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -RTCD_EXTERN void (*aom_lpf_horizontal_edge_16)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +#define aom_lpf_horizontal_edge_16 aom_lpf_horizontal_edge_16_c void aom_lpf_horizontal_edge_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_horizontal_edge_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -RTCD_EXTERN void (*aom_lpf_horizontal_edge_8)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +#define aom_lpf_horizontal_edge_8 aom_lpf_horizontal_edge_8_c void aom_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_vertical_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -RTCD_EXTERN void (*aom_lpf_vertical_16)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +#define aom_lpf_vertical_16 aom_lpf_vertical_16_c void aom_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_vertical_16_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -RTCD_EXTERN void (*aom_lpf_vertical_16_dual)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +#define aom_lpf_vertical_16_dual aom_lpf_vertical_16_dual_c void aom_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_vertical_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -RTCD_EXTERN void (*aom_lpf_vertical_4)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +#define aom_lpf_vertical_4 aom_lpf_vertical_4_c void aom_lpf_vertical_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_vertical_4_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -RTCD_EXTERN void (*aom_lpf_vertical_4_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); +#define aom_lpf_vertical_4_dual aom_lpf_vertical_4_dual_c void aom_lpf_vertical_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -void aom_lpf_vertical_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); -RTCD_EXTERN void (*aom_lpf_vertical_8)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh); +#define aom_lpf_vertical_8 aom_lpf_vertical_8_c void aom_lpf_vertical_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -void aom_lpf_vertical_8_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); -RTCD_EXTERN void (*aom_lpf_vertical_8_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1); +#define aom_lpf_vertical_8_dual aom_lpf_vertical_8_dual_c unsigned int aom_masked_sad16x16_c(const uint8_t *src, int src_stride, const uint8_t *ref, int ref_stride, const uint8_t *second_pred, const uint8_t *msk, int msk_stride, int invert_mask); #define aom_masked_sad16x16 aom_masked_sad16x16_c @@ -3126,30 +3153,6 @@ static void setup_rtcd_internal(void) if (flags & HAS_NEON) aom_int_pro_col = aom_int_pro_col_neon; aom_int_pro_row = aom_int_pro_row_c; if (flags & HAS_NEON) aom_int_pro_row = aom_int_pro_row_neon; - aom_lpf_horizontal_4 = aom_lpf_horizontal_4_c; - if (flags & HAS_NEON) aom_lpf_horizontal_4 = aom_lpf_horizontal_4_neon; - aom_lpf_horizontal_4_dual = aom_lpf_horizontal_4_dual_c; - if (flags & HAS_NEON) aom_lpf_horizontal_4_dual = aom_lpf_horizontal_4_dual_neon; - aom_lpf_horizontal_8 = aom_lpf_horizontal_8_c; - if (flags & HAS_NEON) aom_lpf_horizontal_8 = aom_lpf_horizontal_8_neon; - aom_lpf_horizontal_8_dual = aom_lpf_horizontal_8_dual_c; - if (flags & HAS_NEON) aom_lpf_horizontal_8_dual = aom_lpf_horizontal_8_dual_neon; - aom_lpf_horizontal_edge_16 = aom_lpf_horizontal_edge_16_c; - if (flags & HAS_NEON) aom_lpf_horizontal_edge_16 = aom_lpf_horizontal_edge_16_neon; - aom_lpf_horizontal_edge_8 = aom_lpf_horizontal_edge_8_c; - if (flags & HAS_NEON) aom_lpf_horizontal_edge_8 = aom_lpf_horizontal_edge_8_neon; - aom_lpf_vertical_16 = aom_lpf_vertical_16_c; - if (flags & HAS_NEON) aom_lpf_vertical_16 = aom_lpf_vertical_16_neon; - aom_lpf_vertical_16_dual = aom_lpf_vertical_16_dual_c; - if (flags & HAS_NEON) aom_lpf_vertical_16_dual = aom_lpf_vertical_16_dual_neon; - aom_lpf_vertical_4 = aom_lpf_vertical_4_c; - if (flags & HAS_NEON) aom_lpf_vertical_4 = aom_lpf_vertical_4_neon; - aom_lpf_vertical_4_dual = aom_lpf_vertical_4_dual_c; - if (flags & HAS_NEON) aom_lpf_vertical_4_dual = aom_lpf_vertical_4_dual_neon; - aom_lpf_vertical_8 = aom_lpf_vertical_8_c; - if (flags & HAS_NEON) aom_lpf_vertical_8 = aom_lpf_vertical_8_neon; - aom_lpf_vertical_8_dual = aom_lpf_vertical_8_dual_c; - if (flags & HAS_NEON) aom_lpf_vertical_8_dual = aom_lpf_vertical_8_dual_neon; aom_minmax_8x8 = aom_minmax_8x8_c; if (flags & HAS_NEON) aom_minmax_8x8 = aom_minmax_8x8_neon; aom_mse16x16 = aom_mse16x16_c; diff --git a/media/libaom/config/linux/arm/av1_rtcd.h b/media/libaom/config/linux/arm/av1_rtcd.h index 7e0fc1f78..c415e6dd9 100644 --- a/media/libaom/config/linux/arm/av1_rtcd.h +++ b/media/libaom/config/linux/arm/av1_rtcd.h @@ -31,43 +31,38 @@ struct search_site_config; struct mv; union int_mv; struct yv12_buffer_config; -typedef uint16_t od_dering_in; #ifdef __cplusplus extern "C" { #endif -void aom_clpf_block_c(uint8_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); -void aom_clpf_block_neon(uint8_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); -RTCD_EXTERN void (*aom_clpf_block)(uint8_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); +void apply_selfguided_restoration_c(uint8_t *dat, int width, int height, int stride, int eps, int *xqd, uint8_t *dst, int dst_stride, int32_t *tmpbuf); +#define apply_selfguided_restoration apply_selfguided_restoration_c -void aom_clpf_block_hbd_c(uint16_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); -void aom_clpf_block_hbd_neon(uint16_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); -RTCD_EXTERN void (*aom_clpf_block_hbd)(uint16_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); - -void aom_clpf_hblock_c(uint8_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); -void aom_clpf_hblock_neon(uint8_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); -RTCD_EXTERN void (*aom_clpf_hblock)(uint8_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); - -void aom_clpf_hblock_hbd_c(uint16_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); -void aom_clpf_hblock_hbd_neon(uint16_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); -RTCD_EXTERN void (*aom_clpf_hblock_hbd)(uint16_t *dst, const uint16_t *src, int dstride, int sstride, int sizex, int sizey, unsigned int strength, unsigned int bd); +void apply_selfguided_restoration_highbd_c(uint16_t *dat, int width, int height, int stride, int bit_depth, int eps, int *xqd, uint16_t *dst, int dst_stride, int32_t *tmpbuf); +#define apply_selfguided_restoration_highbd apply_selfguided_restoration_highbd_c int64_t av1_block_error_c(const tran_low_t *coeff, const tran_low_t *dqcoeff, intptr_t block_size, int64_t *ssz); #define av1_block_error av1_block_error_c +void av1_convolve_2d_c(const uint8_t *src, int src_stride, CONV_BUF_TYPE *dst, int dst_stride, int w, int h, InterpFilterParams *filter_params_x, InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params); +#define av1_convolve_2d av1_convolve_2d_c + +void av1_convolve_2d_scale_c(const uint8_t *src, int src_stride, CONV_BUF_TYPE *dst, int dst_stride, int w, int h, InterpFilterParams *filter_params_x, InterpFilterParams *filter_params_y, const int subpel_x_qn, const int x_step_qn, const int subpel_y_q4, const int y_step_qn, ConvolveParams *conv_params); +#define av1_convolve_2d_scale av1_convolve_2d_scale_c + void av1_convolve_horiz_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams fp, const int subpel_x_q4, int x_step_q4, ConvolveParams *conv_params); #define av1_convolve_horiz av1_convolve_horiz_c +void av1_convolve_rounding_c(const int32_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, int bits); +#define av1_convolve_rounding av1_convolve_rounding_c + void av1_convolve_vert_c(const uint8_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, const InterpFilterParams fp, const int subpel_x_q4, int x_step_q4, ConvolveParams *conv_params); #define av1_convolve_vert av1_convolve_vert_c int av1_diamond_search_sad_c(struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct aom_variance_vtable *fn_ptr, const struct mv *center_mv); #define av1_diamond_search_sad av1_diamond_search_sad_c -void av1_fdct8x8_quant_c(const int16_t *input, int stride, tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); -#define av1_fdct8x8_quant av1_fdct8x8_quant_c - void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht16x16 av1_fht16x16_c @@ -110,46 +105,49 @@ void av1_fht8x4_c(const int16_t *input, tran_low_t *output, int stride, struct t void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht8x8 av1_fht8x8_c +void av1_filter_intra_edge_c(uint8_t *p, int sz, int strength); +#define av1_filter_intra_edge av1_filter_intra_edge_c + +void av1_filter_intra_edge_high_c(uint16_t *p, int sz, int strength); +#define av1_filter_intra_edge_high av1_filter_intra_edge_high_c + int av1_full_range_search_c(const struct macroblock *x, const struct search_site_config *cfg, struct mv *ref_mv, struct mv *best_mv, int search_param, int sad_per_bit, int *num00, const struct aom_variance_vtable *fn_ptr, const struct mv *center_mv); #define av1_full_range_search av1_full_range_search_c int av1_full_search_sad_c(const struct macroblock *x, const struct mv *ref_mv, int sad_per_bit, int distance, const struct aom_variance_vtable *fn_ptr, const struct mv *center_mv, struct mv *best_mv); #define av1_full_search_sad av1_full_search_sad_c -void av1_fwd_idtx_c(const int16_t *src_diff, tran_low_t *coeff, int stride, int bs, int tx_type); +void av1_fwd_idtx_c(const int16_t *src_diff, tran_low_t *coeff, int stride, int bsx, int bsy, TX_TYPE tx_type); #define av1_fwd_idtx av1_fwd_idtx_c -void av1_fwd_txfm2d_16x16_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); +void av1_fwd_txfm2d_16x16_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_fwd_txfm2d_16x16 av1_fwd_txfm2d_16x16_c -void av1_fwd_txfm2d_16x32_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); +void av1_fwd_txfm2d_16x32_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_fwd_txfm2d_16x32 av1_fwd_txfm2d_16x32_c -void av1_fwd_txfm2d_16x8_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); +void av1_fwd_txfm2d_16x8_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_fwd_txfm2d_16x8 av1_fwd_txfm2d_16x8_c -void av1_fwd_txfm2d_32x16_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); +void av1_fwd_txfm2d_32x16_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_fwd_txfm2d_32x16 av1_fwd_txfm2d_32x16_c -void av1_fwd_txfm2d_32x32_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); +void av1_fwd_txfm2d_32x32_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_fwd_txfm2d_32x32 av1_fwd_txfm2d_32x32_c -void av1_fwd_txfm2d_4x4_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); +void av1_fwd_txfm2d_4x4_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_fwd_txfm2d_4x4 av1_fwd_txfm2d_4x4_c -void av1_fwd_txfm2d_4x8_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); +void av1_fwd_txfm2d_4x8_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_fwd_txfm2d_4x8 av1_fwd_txfm2d_4x8_c -void av1_fwd_txfm2d_64x64_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); -#define av1_fwd_txfm2d_64x64 av1_fwd_txfm2d_64x64_c - -void av1_fwd_txfm2d_8x16_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); +void av1_fwd_txfm2d_8x16_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_fwd_txfm2d_8x16 av1_fwd_txfm2d_8x16_c -void av1_fwd_txfm2d_8x4_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); +void av1_fwd_txfm2d_8x4_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_fwd_txfm2d_8x4 av1_fwd_txfm2d_8x4_c -void av1_fwd_txfm2d_8x8_c(const int16_t *input, int32_t *output, int stride, int tx_type, int bd); +void av1_fwd_txfm2d_8x8_c(const int16_t *input, int32_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_fwd_txfm2d_8x8 av1_fwd_txfm2d_8x8_c void av1_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride); @@ -176,6 +174,12 @@ void av1_highbd_convolve8_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint void av1_highbd_convolve8_vert_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); #define av1_highbd_convolve8_vert av1_highbd_convolve8_vert_c +void av1_highbd_convolve_2d_c(const uint16_t *src, int src_stride, CONV_BUF_TYPE *dst, int dst_stride, int w, int h, InterpFilterParams *filter_params_x, InterpFilterParams *filter_params_y, const int subpel_x_q4, const int subpel_y_q4, ConvolveParams *conv_params, int bd); +#define av1_highbd_convolve_2d av1_highbd_convolve_2d_c + +void av1_highbd_convolve_2d_scale_c(const uint16_t *src, int src_stride, CONV_BUF_TYPE *dst, int dst_stride, int w, int h, InterpFilterParams *filter_params_x, InterpFilterParams *filter_params_y, const int subpel_x_q4, const int x_step_qn, const int subpel_y_q4, const int y_step_qn, ConvolveParams *conv_params, int bd); +#define av1_highbd_convolve_2d_scale av1_highbd_convolve_2d_scale_c + void av1_highbd_convolve_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int x_step_q4, const int16_t *filter_y, int y_step_q4, int w, int h, int bps); #define av1_highbd_convolve_avg av1_highbd_convolve_avg_c @@ -188,6 +192,9 @@ void av1_highbd_convolve_horiz_c(const uint16_t *src, int src_stride, uint16_t * void av1_highbd_convolve_init_c(void); #define av1_highbd_convolve_init av1_highbd_convolve_init_c +void av1_highbd_convolve_rounding_c(const int32_t *src, int src_stride, uint8_t *dst, int dst_stride, int w, int h, int bits, int bd); +#define av1_highbd_convolve_rounding av1_highbd_convolve_rounding_c + void av1_highbd_convolve_vert_c(const uint16_t *src, int src_stride, uint16_t *dst, int dst_stride, int w, int h, const InterpFilterParams fp, const int subpel_x_q4, int x_step_q4, int avg, int bd); #define av1_highbd_convolve_vert av1_highbd_convolve_vert_c @@ -233,9 +240,6 @@ void av1_highbd_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int dest void av1_highbd_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht8x8_64_add av1_highbd_iht8x8_64_add_c -void av1_highbd_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, int log_scale); -#define av1_highbd_quantize_b av1_highbd_quantize_b_c - void av1_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, int log_scale); #define av1_highbd_quantize_fp av1_highbd_quantize_fp_c @@ -245,6 +249,12 @@ void av1_highbd_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, ui void av1_highbd_warp_affine_c(const int32_t *mat, const uint16_t *ref, int width, int height, int stride, uint16_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, int bd, ConvolveParams *conv_params, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta); #define av1_highbd_warp_affine av1_highbd_warp_affine_c +void av1_highpass_filter_c(uint8_t *dgd, int width, int height, int stride, int32_t *dst, int dst_stride, int r, int eps); +#define av1_highpass_filter av1_highpass_filter_c + +void av1_highpass_filter_highbd_c(uint16_t *dgd, int width, int height, int stride, int32_t *dst, int dst_stride, int r, int eps); +#define av1_highpass_filter_highbd av1_highpass_filter_highbd_c + void av1_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param); #define av1_iht16x16_256_add av1_iht16x16_256_add_c @@ -287,43 +297,40 @@ void av1_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride void av1_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht8x8_64_add av1_iht8x8_64_add_c -void av1_inv_txfm2d_add_16x16_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); +void av1_inv_txfm2d_add_16x16_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_16x16 av1_inv_txfm2d_add_16x16_c -void av1_inv_txfm2d_add_16x32_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); +void av1_inv_txfm2d_add_16x32_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_16x32 av1_inv_txfm2d_add_16x32_c -void av1_inv_txfm2d_add_16x8_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); +void av1_inv_txfm2d_add_16x8_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_16x8 av1_inv_txfm2d_add_16x8_c -void av1_inv_txfm2d_add_32x16_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); +void av1_inv_txfm2d_add_32x16_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_32x16 av1_inv_txfm2d_add_32x16_c -void av1_inv_txfm2d_add_32x32_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); +void av1_inv_txfm2d_add_32x32_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_32x32 av1_inv_txfm2d_add_32x32_c -void av1_inv_txfm2d_add_4x4_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); +void av1_inv_txfm2d_add_4x4_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_4x4 av1_inv_txfm2d_add_4x4_c -void av1_inv_txfm2d_add_4x8_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); +void av1_inv_txfm2d_add_4x8_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_4x8 av1_inv_txfm2d_add_4x8_c -void av1_inv_txfm2d_add_64x64_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); -#define av1_inv_txfm2d_add_64x64 av1_inv_txfm2d_add_64x64_c - -void av1_inv_txfm2d_add_8x16_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); +void av1_inv_txfm2d_add_8x16_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_8x16 av1_inv_txfm2d_add_8x16_c -void av1_inv_txfm2d_add_8x4_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); +void av1_inv_txfm2d_add_8x4_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_8x4 av1_inv_txfm2d_add_8x4_c -void av1_inv_txfm2d_add_8x8_c(const int32_t *input, uint16_t *output, int stride, int tx_type, int bd); +void av1_inv_txfm2d_add_8x8_c(const int32_t *input, uint16_t *output, int stride, TX_TYPE tx_type, int bd); #define av1_inv_txfm2d_add_8x8 av1_inv_txfm2d_add_8x8_c void av1_lowbd_convolve_init_c(void); #define av1_lowbd_convolve_init av1_lowbd_convolve_init_c -void av1_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, int log_scale); +void av1_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan, const qm_val_t * qm_ptr, const qm_val_t * iqm_ptr, int log_scale); #define av1_quantize_b av1_quantize_b_c void av1_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); @@ -332,9 +339,21 @@ void av1_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_ void av1_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan); #define av1_quantize_fp_32x32 av1_quantize_fp_32x32_c +void av1_selfguided_restoration_c(uint8_t *dgd, int width, int height, int stride, int32_t *dst, int dst_stride, int r, int eps); +#define av1_selfguided_restoration av1_selfguided_restoration_c + +void av1_selfguided_restoration_highbd_c(uint16_t *dgd, int width, int height, int stride, int32_t *dst, int dst_stride, int bit_depth, int r, int eps); +#define av1_selfguided_restoration_highbd av1_selfguided_restoration_highbd_c + void av1_temporal_filter_apply_c(uint8_t *frame1, unsigned int stride, uint8_t *frame2, unsigned int block_width, unsigned int block_height, int strength, int filter_weight, unsigned int *accumulator, uint16_t *count); #define av1_temporal_filter_apply av1_temporal_filter_apply_c +void av1_upsample_intra_edge_c(uint8_t *p, int sz); +#define av1_upsample_intra_edge av1_upsample_intra_edge_c + +void av1_upsample_intra_edge_high_c(uint16_t *p, int sz, int bd); +#define av1_upsample_intra_edge_high av1_upsample_intra_edge_high_c + void av1_warp_affine_c(const int32_t *mat, const uint8_t *ref, int width, int height, int stride, uint8_t *pred, int p_col, int p_row, int p_width, int p_height, int p_stride, int subsampling_x, int subsampling_y, ConvolveParams *conv_params, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta); #define av1_warp_affine av1_warp_affine_c @@ -347,24 +366,16 @@ int av1_wedge_sign_from_residuals_c(const int16_t *ds, const uint8_t *m, int N, uint64_t av1_wedge_sse_from_residuals_c(const int16_t *r1, const int16_t *d, const uint8_t *m, int N); #define av1_wedge_sse_from_residuals av1_wedge_sse_from_residuals_c -double compute_cross_correlation_c(unsigned char *im1, int stride1, int x1, int y1, unsigned char *im2, int stride2, int x2, int y2); -#define compute_cross_correlation compute_cross_correlation_c - -void copy_4x4_16bit_to_16bit_c(uint16_t *dst, int dstride, const uint16_t *src, int sstride); -void copy_4x4_16bit_to_16bit_neon(uint16_t *dst, int dstride, const uint16_t *src, int sstride); -RTCD_EXTERN void (*copy_4x4_16bit_to_16bit)(uint16_t *dst, int dstride, const uint16_t *src, int sstride); - -void copy_4x4_16bit_to_8bit_c(uint8_t *dst, int dstride, const uint16_t *src, int sstride); -void copy_4x4_16bit_to_8bit_neon(uint8_t *dst, int dstride, const uint16_t *src, int sstride); -RTCD_EXTERN void (*copy_4x4_16bit_to_8bit)(uint8_t *dst, int dstride, const uint16_t *src, int sstride); +void cdef_filter_block_c(uint8_t *dst8, uint16_t *dst16, int dstride, const uint16_t *in, int pri_strength, int sec_strength, int dir, int pri_damping, int sec_damping, int bsize, int max); +void cdef_filter_block_neon(uint8_t *dst8, uint16_t *dst16, int dstride, const uint16_t *in, int pri_strength, int sec_strength, int dir, int pri_damping, int sec_damping, int bsize, int max); +RTCD_EXTERN void (*cdef_filter_block)(uint8_t *dst8, uint16_t *dst16, int dstride, const uint16_t *in, int pri_strength, int sec_strength, int dir, int pri_damping, int sec_damping, int bsize, int max); -void copy_8x8_16bit_to_16bit_c(uint16_t *dst, int dstride, const uint16_t *src, int sstride); -void copy_8x8_16bit_to_16bit_neon(uint16_t *dst, int dstride, const uint16_t *src, int sstride); -RTCD_EXTERN void (*copy_8x8_16bit_to_16bit)(uint16_t *dst, int dstride, const uint16_t *src, int sstride); +int cdef_find_dir_c(const uint16_t *img, int stride, int32_t *var, int coeff_shift); +int cdef_find_dir_neon(const uint16_t *img, int stride, int32_t *var, int coeff_shift); +RTCD_EXTERN int (*cdef_find_dir)(const uint16_t *img, int stride, int32_t *var, int coeff_shift); -void copy_8x8_16bit_to_8bit_c(uint8_t *dst, int dstride, const uint16_t *src, int sstride); -void copy_8x8_16bit_to_8bit_neon(uint8_t *dst, int dstride, const uint16_t *src, int sstride); -RTCD_EXTERN void (*copy_8x8_16bit_to_8bit)(uint8_t *dst, int dstride, const uint16_t *src, int sstride); +double compute_cross_correlation_c(unsigned char *im1, int stride1, int x1, int y1, unsigned char *im2, int stride2, int x2, int y2); +#define compute_cross_correlation compute_cross_correlation_c void copy_rect8_16bit_to_16bit_c(uint16_t *dst, int dstride, const uint16_t *src, int sstride, int v, int h); void copy_rect8_16bit_to_16bit_neon(uint16_t *dst, int dstride, const uint16_t *src, int sstride, int v, int h); @@ -374,18 +385,6 @@ void copy_rect8_8bit_to_16bit_c(uint16_t *dst, int dstride, const uint8_t *src, void copy_rect8_8bit_to_16bit_neon(uint16_t *dst, int dstride, const uint8_t *src, int sstride, int v, int h); RTCD_EXTERN void (*copy_rect8_8bit_to_16bit)(uint16_t *dst, int dstride, const uint8_t *src, int sstride, int v, int h); -int od_dir_find8_c(const od_dering_in *img, int stride, int32_t *var, int coeff_shift); -int od_dir_find8_neon(const od_dering_in *img, int stride, int32_t *var, int coeff_shift); -RTCD_EXTERN int (*od_dir_find8)(const od_dering_in *img, int stride, int32_t *var, int coeff_shift); - -void od_filter_dering_direction_4x4_c(uint16_t *y, int ystride, const uint16_t *in, int threshold, int dir, int damping); -void od_filter_dering_direction_4x4_neon(uint16_t *y, int ystride, const uint16_t *in, int threshold, int dir, int damping); -RTCD_EXTERN void (*od_filter_dering_direction_4x4)(uint16_t *y, int ystride, const uint16_t *in, int threshold, int dir, int damping); - -void od_filter_dering_direction_8x8_c(uint16_t *y, int ystride, const uint16_t *in, int threshold, int dir, int damping); -void od_filter_dering_direction_8x8_neon(uint16_t *y, int ystride, const uint16_t *in, int threshold, int dir, int damping); -RTCD_EXTERN void (*od_filter_dering_direction_8x8)(uint16_t *y, int ystride, const uint16_t *in, int threshold, int dir, int damping); - void aom_rtcd(void); #include "aom_config.h" @@ -398,32 +397,14 @@ static void setup_rtcd_internal(void) (void)flags; - aom_clpf_block = aom_clpf_block_c; - if (flags & HAS_NEON) aom_clpf_block = aom_clpf_block_neon; - aom_clpf_block_hbd = aom_clpf_block_hbd_c; - if (flags & HAS_NEON) aom_clpf_block_hbd = aom_clpf_block_hbd_neon; - aom_clpf_hblock = aom_clpf_hblock_c; - if (flags & HAS_NEON) aom_clpf_hblock = aom_clpf_hblock_neon; - aom_clpf_hblock_hbd = aom_clpf_hblock_hbd_c; - if (flags & HAS_NEON) aom_clpf_hblock_hbd = aom_clpf_hblock_hbd_neon; - copy_4x4_16bit_to_16bit = copy_4x4_16bit_to_16bit_c; - if (flags & HAS_NEON) copy_4x4_16bit_to_16bit = copy_4x4_16bit_to_16bit_neon; - copy_4x4_16bit_to_8bit = copy_4x4_16bit_to_8bit_c; - if (flags & HAS_NEON) copy_4x4_16bit_to_8bit = copy_4x4_16bit_to_8bit_neon; - copy_8x8_16bit_to_16bit = copy_8x8_16bit_to_16bit_c; - if (flags & HAS_NEON) copy_8x8_16bit_to_16bit = copy_8x8_16bit_to_16bit_neon; - copy_8x8_16bit_to_8bit = copy_8x8_16bit_to_8bit_c; - if (flags & HAS_NEON) copy_8x8_16bit_to_8bit = copy_8x8_16bit_to_8bit_neon; + cdef_filter_block = cdef_filter_block_c; + if (flags & HAS_NEON) cdef_filter_block = cdef_filter_block_neon; + cdef_find_dir = cdef_find_dir_c; + if (flags & HAS_NEON) cdef_find_dir = cdef_find_dir_neon; copy_rect8_16bit_to_16bit = copy_rect8_16bit_to_16bit_c; if (flags & HAS_NEON) copy_rect8_16bit_to_16bit = copy_rect8_16bit_to_16bit_neon; copy_rect8_8bit_to_16bit = copy_rect8_8bit_to_16bit_c; if (flags & HAS_NEON) copy_rect8_8bit_to_16bit = copy_rect8_8bit_to_16bit_neon; - od_dir_find8 = od_dir_find8_c; - if (flags & HAS_NEON) od_dir_find8 = od_dir_find8_neon; - od_filter_dering_direction_4x4 = od_filter_dering_direction_4x4_c; - if (flags & HAS_NEON) od_filter_dering_direction_4x4 = od_filter_dering_direction_4x4_neon; - od_filter_dering_direction_8x8 = od_filter_dering_direction_8x8_c; - if (flags & HAS_NEON) od_filter_dering_direction_8x8 = od_filter_dering_direction_8x8_neon; } #endif |