diff options
Diffstat (limited to 'media/libaom/config/generic')
| -rw-r--r-- | media/libaom/config/generic/aom_config.asm | 27 | ||||
| -rw-r--r-- | media/libaom/config/generic/aom_config.h | 29 | ||||
| -rw-r--r-- | media/libaom/config/generic/aom_dsp_rtcd.h | 703 | ||||
| -rw-r--r-- | media/libaom/config/generic/av1_rtcd.h | 166 |
4 files changed, 785 insertions, 140 deletions
diff --git a/media/libaom/config/generic/aom_config.asm b/media/libaom/config/generic/aom_config.asm index 896de4760..483fbc80f 100644 --- a/media/libaom/config/generic/aom_config.asm +++ b/media/libaom/config/generic/aom_config.asm @@ -68,6 +68,7 @@ .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_VAR_TX , 1 @@ -90,6 +91,10 @@ .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 @@ -104,6 +109,7 @@ .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 @@ -112,6 +118,9 @@ .equ CONFIG_PVQ , 0 .equ CONFIG_CFL , 0 .equ CONFIG_XIPHRC , 0 +.equ CONFIG_DCT_ONLY , 0 +.equ CONFIG_DAALA_DCT4 , 0 +.equ CONFIG_DAALA_DCT8 , 0 .equ CONFIG_CB4X4 , 1 .equ CONFIG_CHROMA_2X2 , 0 .equ CONFIG_CHROMA_SUB8X8 , 1 @@ -120,11 +129,8 @@ .equ CONFIG_EXT_DELTA_Q , 1 .equ CONFIG_ADAPT_SCAN , 0 .equ CONFIG_FILTER_7BIT , 1 -.equ CONFIG_PARALLEL_DEBLOCKING , 0 -.equ CONFIG_PARALLEL_DEBLOCKING_15TAP , 0 +.equ CONFIG_PARALLEL_DEBLOCKING , 1 .equ CONFIG_LOOPFILTERING_ACROSS_TILES , 1 -.equ CONFIG_TILE_GROUPS , 1 -.equ CONFIG_EC_ADAPT , 1 .equ CONFIG_TEMPMV_SIGNALING , 1 .equ CONFIG_RD_DEBUG , 0 .equ CONFIG_REFERENCE_BUFFER , 1 @@ -132,6 +138,7 @@ .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_PALETTE_THROUGHPUT , 1 @@ -144,7 +151,17 @@ .equ CONFIG_COMPOUND_SINGLEREF , 0 .equ CONFIG_AOM_QM , 0 .equ CONFIG_ONE_SIDED_COMPOUND , 1 -.equ CONFIG_SMOOTH_HV , 0 +.equ CONFIG_EXT_COMP_REFS , 0 +.equ CONFIG_SMOOTH_HV , 1 .equ CONFIG_VAR_REFS , 0 +.equ CONFIG_RECT_INTRA_PRED , 1 +.equ CONFIG_LGT , 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_ANALYZER , 0 .section .note.GNU-stack,"",%progbits diff --git a/media/libaom/config/generic/aom_config.h b/media/libaom/config/generic/aom_config.h index bd2c4aa6a..27934329c 100644 --- a/media/libaom/config/generic/aom_config.h +++ b/media/libaom/config/generic/aom_config.h @@ -9,7 +9,7 @@ /* This file automatically generated by configure. Do not edit! */ #ifndef AOM_CONFIG_H #define AOM_CONFIG_H -#define RESTRICT +#define RESTRICT #define INLINE inline #define ARCH_ARM 0 #define ARCH_MIPS 0 @@ -78,6 +78,7 @@ #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_VAR_TX 1 @@ -100,6 +101,10 @@ #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 @@ -114,6 +119,7 @@ #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 @@ -122,6 +128,9 @@ #define CONFIG_PVQ 0 #define CONFIG_CFL 0 #define CONFIG_XIPHRC 0 +#define CONFIG_DCT_ONLY 0 +#define CONFIG_DAALA_DCT4 0 +#define CONFIG_DAALA_DCT8 0 #define CONFIG_CB4X4 1 #define CONFIG_CHROMA_2X2 0 #define CONFIG_CHROMA_SUB8X8 1 @@ -130,11 +139,8 @@ #define CONFIG_EXT_DELTA_Q 1 #define CONFIG_ADAPT_SCAN 0 #define CONFIG_FILTER_7BIT 1 -#define CONFIG_PARALLEL_DEBLOCKING 0 -#define CONFIG_PARALLEL_DEBLOCKING_15TAP 0 +#define CONFIG_PARALLEL_DEBLOCKING 1 #define CONFIG_LOOPFILTERING_ACROSS_TILES 1 -#define CONFIG_TILE_GROUPS 1 -#define CONFIG_EC_ADAPT 1 #define CONFIG_TEMPMV_SIGNALING 1 #define CONFIG_RD_DEBUG 0 #define CONFIG_REFERENCE_BUFFER 1 @@ -142,6 +148,7 @@ #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_PALETTE_THROUGHPUT 1 @@ -154,8 +161,18 @@ #define CONFIG_COMPOUND_SINGLEREF 0 #define CONFIG_AOM_QM 0 #define CONFIG_ONE_SIDED_COMPOUND 1 -#define CONFIG_SMOOTH_HV 0 +#define CONFIG_EXT_COMP_REFS 0 +#define CONFIG_SMOOTH_HV 1 #define CONFIG_VAR_REFS 0 +#define CONFIG_RECT_INTRA_PRED 1 +#define CONFIG_LGT 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_ANALYZER 0 #define DECODE_WIDTH_LIMIT 8192 #define DECODE_HEIGHT_LIMIT 4608 diff --git a/media/libaom/config/generic/aom_dsp_rtcd.h b/media/libaom/config/generic/aom_dsp_rtcd.h index 7c3dd37e7..259eb3f1d 100644 --- a/media/libaom/config/generic/aom_dsp_rtcd.h +++ b/media/libaom/config/generic/aom_dsp_rtcd.h @@ -32,13 +32,13 @@ void aom_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride, const uint8_t *src void aom_comp_avg_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride); #define aom_comp_avg_pred aom_comp_avg_pred_c -void aom_comp_avg_upsampled_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride); +void aom_comp_avg_upsampled_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, int subsample_x_q3, int subsample_y_q3, const uint8_t *ref, int ref_stride); #define aom_comp_avg_upsampled_pred aom_comp_avg_upsampled_pred_c void aom_comp_mask_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask); #define aom_comp_mask_pred aom_comp_mask_pred_c -void aom_comp_mask_upsampled_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, const uint8_t *ref, int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask); +void aom_comp_mask_upsampled_pred_c(uint8_t *comp_pred, const uint8_t *pred, int width, int height, int subsample_x_q3, int subsample_y_q3, const uint8_t *ref, int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask); #define aom_comp_mask_upsampled_pred aom_comp_mask_upsampled_pred_c void aom_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); @@ -50,15 +50,33 @@ void aom_convolve8_avg_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, void aom_convolve8_avg_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_avg_horiz aom_convolve8_avg_horiz_c +void aom_convolve8_avg_horiz_scale_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int subpel_x, int x_step_q4, const int16_t *filter_y, int subpel_y, int y_step_q4, int w, int h); +#define aom_convolve8_avg_horiz_scale aom_convolve8_avg_horiz_scale_c + +void aom_convolve8_avg_scale_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int subpel_x, int x_step_q4, const int16_t *filter_y, int subpel_y, int y_step_q4, int w, int h); +#define aom_convolve8_avg_scale aom_convolve8_avg_scale_c + void aom_convolve8_avg_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_avg_vert aom_convolve8_avg_vert_c +void aom_convolve8_avg_vert_scale_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int subpel_x, int x_step_q4, const int16_t *filter_y, int subpel_y, int y_step_q4, int w, int h); +#define aom_convolve8_avg_vert_scale aom_convolve8_avg_vert_scale_c + void aom_convolve8_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_horiz aom_convolve8_horiz_c +void aom_convolve8_horiz_scale_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int subpel_x, int x_step_q4, const int16_t *filter_y, int subpel_y, int y_step_q4, int w, int h); +#define aom_convolve8_horiz_scale aom_convolve8_horiz_scale_c + +void aom_convolve8_scale_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int subpel_x, int x_step_q4, const int16_t *filter_y, int subpel_y, int y_step_q4, int w, int h); +#define aom_convolve8_scale aom_convolve8_scale_c + void aom_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); #define aom_convolve8_vert aom_convolve8_vert_c +void aom_convolve8_vert_scale_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, ptrdiff_t dst_stride, const int16_t *filter_x, int subpel_x, int x_step_q4, const int16_t *filter_y, int subpel_y, int y_step_q4, int w, int h); +#define aom_convolve8_vert_scale aom_convolve8_vert_scale_c + void aom_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); #define aom_convolve_avg aom_convolve_avg_c @@ -68,165 +86,339 @@ void aom_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, void aom_d117_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d117_predictor_16x16 aom_d117_predictor_16x16_c +void aom_d117_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d117_predictor_16x32 aom_d117_predictor_16x32_c + +void aom_d117_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d117_predictor_16x8 aom_d117_predictor_16x8_c + void aom_d117_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d117_predictor_2x2 aom_d117_predictor_2x2_c +void aom_d117_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d117_predictor_32x16 aom_d117_predictor_32x16_c + void aom_d117_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d117_predictor_32x32 aom_d117_predictor_32x32_c void aom_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d117_predictor_4x4 aom_d117_predictor_4x4_c +void aom_d117_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d117_predictor_4x8 aom_d117_predictor_4x8_c + +void aom_d117_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d117_predictor_8x16 aom_d117_predictor_8x16_c + +void aom_d117_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d117_predictor_8x4 aom_d117_predictor_8x4_c + void aom_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d117_predictor_8x8 aom_d117_predictor_8x8_c void aom_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d135_predictor_16x16 aom_d135_predictor_16x16_c +void aom_d135_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d135_predictor_16x32 aom_d135_predictor_16x32_c + +void aom_d135_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d135_predictor_16x8 aom_d135_predictor_16x8_c + void aom_d135_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d135_predictor_2x2 aom_d135_predictor_2x2_c +void aom_d135_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d135_predictor_32x16 aom_d135_predictor_32x16_c + void aom_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d135_predictor_32x32 aom_d135_predictor_32x32_c void aom_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d135_predictor_4x4 aom_d135_predictor_4x4_c +void aom_d135_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d135_predictor_4x8 aom_d135_predictor_4x8_c + +void aom_d135_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d135_predictor_8x16 aom_d135_predictor_8x16_c + +void aom_d135_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d135_predictor_8x4 aom_d135_predictor_8x4_c + void aom_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d135_predictor_8x8 aom_d135_predictor_8x8_c void aom_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d153_predictor_16x16 aom_d153_predictor_16x16_c +void aom_d153_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d153_predictor_16x32 aom_d153_predictor_16x32_c + +void aom_d153_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d153_predictor_16x8 aom_d153_predictor_16x8_c + void aom_d153_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d153_predictor_2x2 aom_d153_predictor_2x2_c +void aom_d153_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d153_predictor_32x16 aom_d153_predictor_32x16_c + void aom_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d153_predictor_32x32 aom_d153_predictor_32x32_c void aom_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d153_predictor_4x4 aom_d153_predictor_4x4_c +void aom_d153_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d153_predictor_4x8 aom_d153_predictor_4x8_c + +void aom_d153_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d153_predictor_8x16 aom_d153_predictor_8x16_c + +void aom_d153_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d153_predictor_8x4 aom_d153_predictor_8x4_c + void aom_d153_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d153_predictor_8x8 aom_d153_predictor_8x8_c void aom_d207e_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d207e_predictor_16x16 aom_d207e_predictor_16x16_c +void aom_d207e_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d207e_predictor_16x32 aom_d207e_predictor_16x32_c + +void aom_d207e_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d207e_predictor_16x8 aom_d207e_predictor_16x8_c + void aom_d207e_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d207e_predictor_2x2 aom_d207e_predictor_2x2_c +void aom_d207e_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d207e_predictor_32x16 aom_d207e_predictor_32x16_c + void aom_d207e_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d207e_predictor_32x32 aom_d207e_predictor_32x32_c void aom_d207e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d207e_predictor_4x4 aom_d207e_predictor_4x4_c +void aom_d207e_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d207e_predictor_4x8 aom_d207e_predictor_4x8_c + +void aom_d207e_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d207e_predictor_8x16 aom_d207e_predictor_8x16_c + +void aom_d207e_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d207e_predictor_8x4 aom_d207e_predictor_8x4_c + void aom_d207e_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d207e_predictor_8x8 aom_d207e_predictor_8x8_c void aom_d45e_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d45e_predictor_16x16 aom_d45e_predictor_16x16_c +void aom_d45e_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d45e_predictor_16x32 aom_d45e_predictor_16x32_c + +void aom_d45e_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d45e_predictor_16x8 aom_d45e_predictor_16x8_c + void aom_d45e_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d45e_predictor_2x2 aom_d45e_predictor_2x2_c +void aom_d45e_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d45e_predictor_32x16 aom_d45e_predictor_32x16_c + void aom_d45e_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d45e_predictor_32x32 aom_d45e_predictor_32x32_c void aom_d45e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d45e_predictor_4x4 aom_d45e_predictor_4x4_c +void aom_d45e_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d45e_predictor_4x8 aom_d45e_predictor_4x8_c + +void aom_d45e_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d45e_predictor_8x16 aom_d45e_predictor_8x16_c + +void aom_d45e_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d45e_predictor_8x4 aom_d45e_predictor_8x4_c + void aom_d45e_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d45e_predictor_8x8 aom_d45e_predictor_8x8_c void aom_d63e_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d63e_predictor_16x16 aom_d63e_predictor_16x16_c +void aom_d63e_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d63e_predictor_16x32 aom_d63e_predictor_16x32_c + +void aom_d63e_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d63e_predictor_16x8 aom_d63e_predictor_16x8_c + void aom_d63e_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d63e_predictor_2x2 aom_d63e_predictor_2x2_c +void aom_d63e_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d63e_predictor_32x16 aom_d63e_predictor_32x16_c + void aom_d63e_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d63e_predictor_32x32 aom_d63e_predictor_32x32_c void aom_d63e_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d63e_predictor_4x4 aom_d63e_predictor_4x4_c +void aom_d63e_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d63e_predictor_4x8 aom_d63e_predictor_4x8_c + +void aom_d63e_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d63e_predictor_8x16 aom_d63e_predictor_8x16_c + +void aom_d63e_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_d63e_predictor_8x4 aom_d63e_predictor_8x4_c + void aom_d63e_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_d63e_predictor_8x8 aom_d63e_predictor_8x8_c void aom_dc_128_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_128_predictor_16x16 aom_dc_128_predictor_16x16_c +void aom_dc_128_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_128_predictor_16x32 aom_dc_128_predictor_16x32_c + +void aom_dc_128_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_128_predictor_16x8 aom_dc_128_predictor_16x8_c + void aom_dc_128_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_128_predictor_2x2 aom_dc_128_predictor_2x2_c +void aom_dc_128_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_128_predictor_32x16 aom_dc_128_predictor_32x16_c + void aom_dc_128_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_128_predictor_32x32 aom_dc_128_predictor_32x32_c void aom_dc_128_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_128_predictor_4x4 aom_dc_128_predictor_4x4_c +void aom_dc_128_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_128_predictor_4x8 aom_dc_128_predictor_4x8_c + +void aom_dc_128_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_128_predictor_8x16 aom_dc_128_predictor_8x16_c + +void aom_dc_128_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_128_predictor_8x4 aom_dc_128_predictor_8x4_c + void aom_dc_128_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_128_predictor_8x8 aom_dc_128_predictor_8x8_c void aom_dc_left_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_left_predictor_16x16 aom_dc_left_predictor_16x16_c +void aom_dc_left_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_left_predictor_16x32 aom_dc_left_predictor_16x32_c + +void aom_dc_left_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_left_predictor_16x8 aom_dc_left_predictor_16x8_c + void aom_dc_left_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_left_predictor_2x2 aom_dc_left_predictor_2x2_c +void aom_dc_left_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_left_predictor_32x16 aom_dc_left_predictor_32x16_c + void aom_dc_left_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_left_predictor_32x32 aom_dc_left_predictor_32x32_c void aom_dc_left_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_left_predictor_4x4 aom_dc_left_predictor_4x4_c +void aom_dc_left_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_left_predictor_4x8 aom_dc_left_predictor_4x8_c + +void aom_dc_left_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_left_predictor_8x16 aom_dc_left_predictor_8x16_c + +void aom_dc_left_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_left_predictor_8x4 aom_dc_left_predictor_8x4_c + void aom_dc_left_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_left_predictor_8x8 aom_dc_left_predictor_8x8_c void aom_dc_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_predictor_16x16 aom_dc_predictor_16x16_c +void aom_dc_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_predictor_16x32 aom_dc_predictor_16x32_c + +void aom_dc_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_predictor_16x8 aom_dc_predictor_16x8_c + void aom_dc_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_predictor_2x2 aom_dc_predictor_2x2_c +void aom_dc_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_predictor_32x16 aom_dc_predictor_32x16_c + void aom_dc_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_predictor_32x32 aom_dc_predictor_32x32_c void aom_dc_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_predictor_4x4 aom_dc_predictor_4x4_c +void aom_dc_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_predictor_4x8 aom_dc_predictor_4x8_c + +void aom_dc_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_predictor_8x16 aom_dc_predictor_8x16_c + +void aom_dc_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_predictor_8x4 aom_dc_predictor_8x4_c + void aom_dc_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_predictor_8x8 aom_dc_predictor_8x8_c void aom_dc_top_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_top_predictor_16x16 aom_dc_top_predictor_16x16_c +void aom_dc_top_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_top_predictor_16x32 aom_dc_top_predictor_16x32_c + +void aom_dc_top_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_top_predictor_16x8 aom_dc_top_predictor_16x8_c + void aom_dc_top_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_top_predictor_2x2 aom_dc_top_predictor_2x2_c +void aom_dc_top_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_top_predictor_32x16 aom_dc_top_predictor_32x16_c + void aom_dc_top_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_top_predictor_32x32 aom_dc_top_predictor_32x32_c void aom_dc_top_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_top_predictor_4x4 aom_dc_top_predictor_4x4_c +void aom_dc_top_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_top_predictor_4x8 aom_dc_top_predictor_4x8_c + +void aom_dc_top_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_top_predictor_8x16 aom_dc_top_predictor_8x16_c + +void aom_dc_top_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_dc_top_predictor_8x4 aom_dc_top_predictor_8x4_c + void aom_dc_top_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_dc_top_predictor_8x8 aom_dc_top_predictor_8x8_c void aom_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); #define aom_fdct16x16 aom_fdct16x16_c -void aom_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); -#define aom_fdct16x16_1 aom_fdct16x16_1_c - void aom_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); #define aom_fdct32x32 aom_fdct32x32_c -void aom_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); -#define aom_fdct32x32_1 aom_fdct32x32_1_c - void aom_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); #define aom_fdct32x32_rd aom_fdct32x32_rd_c @@ -239,9 +431,6 @@ void aom_fdct4x4_1_c(const int16_t *input, tran_low_t *output, int stride); void aom_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); #define aom_fdct8x8 aom_fdct8x8_c -void aom_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); -#define aom_fdct8x8_1 aom_fdct8x8_1_c - void aom_get16x16var_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse, int *sum); #define aom_get16x16var aom_get16x16var_c @@ -257,15 +446,33 @@ unsigned int aom_get_mb_ss_c(const int16_t *); void aom_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_h_predictor_16x16 aom_h_predictor_16x16_c +void aom_h_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_h_predictor_16x32 aom_h_predictor_16x32_c + +void aom_h_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_h_predictor_16x8 aom_h_predictor_16x8_c + void aom_h_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_h_predictor_2x2 aom_h_predictor_2x2_c +void aom_h_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_h_predictor_32x16 aom_h_predictor_32x16_c + void aom_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_h_predictor_32x32 aom_h_predictor_32x32_c void aom_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_h_predictor_4x4 aom_h_predictor_4x4_c +void aom_h_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_h_predictor_4x8 aom_h_predictor_4x8_c + +void aom_h_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_h_predictor_8x16 aom_h_predictor_8x16_c + +void aom_h_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_h_predictor_8x4 aom_h_predictor_8x4_c + void aom_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_h_predictor_8x8 aom_h_predictor_8x8_c @@ -992,13 +1199,13 @@ void aom_highbd_blend_a64_vmask_c(uint8_t *dst, uint32_t dst_stride, const uint8 void aom_highbd_comp_avg_pred_c(uint16_t *comp_pred, const uint8_t *pred8, int width, int height, const uint8_t *ref8, int ref_stride); #define aom_highbd_comp_avg_pred aom_highbd_comp_avg_pred_c -void aom_highbd_comp_avg_upsampled_pred_c(uint16_t *comp_pred, const uint8_t *pred8, int width, int height, const uint8_t *ref8, int ref_stride); +void aom_highbd_comp_avg_upsampled_pred_c(uint16_t *comp_pred, const uint8_t *pred8, int width, int height, int subsample_x_q3, int subsample_y_q3, const uint8_t *ref8, int ref_stride, int bd); #define aom_highbd_comp_avg_upsampled_pred aom_highbd_comp_avg_upsampled_pred_c void aom_highbd_comp_mask_pred_c(uint16_t *comp_pred, const uint8_t *pred8, int width, int height, const uint8_t *ref8, int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask); #define aom_highbd_comp_mask_pred aom_highbd_comp_mask_pred_c -void aom_highbd_comp_mask_upsampled_pred_c(uint16_t *comp_pred, const uint8_t *pred8, int width, int height, const uint8_t *ref8, int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask); +void aom_highbd_comp_mask_upsampled_pred_c(uint16_t *comp_pred, const uint8_t *pred8, int width, int height, int subsample_x_q3, int subsample_y_q3, const uint8_t *ref8, int ref_stride, const uint8_t *mask, int mask_stride, int invert_mask, int bd); #define aom_highbd_comp_mask_upsampled_pred aom_highbd_comp_mask_upsampled_pred_c 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); @@ -1028,165 +1235,339 @@ void aom_highbd_convolve_copy_c(const uint8_t *src, ptrdiff_t src_stride, uint8_ void aom_highbd_d117_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d117_predictor_16x16 aom_highbd_d117_predictor_16x16_c +void aom_highbd_d117_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d117_predictor_16x32 aom_highbd_d117_predictor_16x32_c + +void aom_highbd_d117_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d117_predictor_16x8 aom_highbd_d117_predictor_16x8_c + void aom_highbd_d117_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d117_predictor_2x2 aom_highbd_d117_predictor_2x2_c +void aom_highbd_d117_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d117_predictor_32x16 aom_highbd_d117_predictor_32x16_c + void aom_highbd_d117_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d117_predictor_32x32 aom_highbd_d117_predictor_32x32_c void aom_highbd_d117_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d117_predictor_4x4 aom_highbd_d117_predictor_4x4_c +void aom_highbd_d117_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d117_predictor_4x8 aom_highbd_d117_predictor_4x8_c + +void aom_highbd_d117_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d117_predictor_8x16 aom_highbd_d117_predictor_8x16_c + +void aom_highbd_d117_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d117_predictor_8x4 aom_highbd_d117_predictor_8x4_c + void aom_highbd_d117_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d117_predictor_8x8 aom_highbd_d117_predictor_8x8_c void aom_highbd_d135_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d135_predictor_16x16 aom_highbd_d135_predictor_16x16_c +void aom_highbd_d135_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d135_predictor_16x32 aom_highbd_d135_predictor_16x32_c + +void aom_highbd_d135_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d135_predictor_16x8 aom_highbd_d135_predictor_16x8_c + void aom_highbd_d135_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d135_predictor_2x2 aom_highbd_d135_predictor_2x2_c +void aom_highbd_d135_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d135_predictor_32x16 aom_highbd_d135_predictor_32x16_c + void aom_highbd_d135_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d135_predictor_32x32 aom_highbd_d135_predictor_32x32_c void aom_highbd_d135_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d135_predictor_4x4 aom_highbd_d135_predictor_4x4_c +void aom_highbd_d135_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d135_predictor_4x8 aom_highbd_d135_predictor_4x8_c + +void aom_highbd_d135_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d135_predictor_8x16 aom_highbd_d135_predictor_8x16_c + +void aom_highbd_d135_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d135_predictor_8x4 aom_highbd_d135_predictor_8x4_c + void aom_highbd_d135_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d135_predictor_8x8 aom_highbd_d135_predictor_8x8_c void aom_highbd_d153_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d153_predictor_16x16 aom_highbd_d153_predictor_16x16_c +void aom_highbd_d153_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d153_predictor_16x32 aom_highbd_d153_predictor_16x32_c + +void aom_highbd_d153_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d153_predictor_16x8 aom_highbd_d153_predictor_16x8_c + void aom_highbd_d153_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d153_predictor_2x2 aom_highbd_d153_predictor_2x2_c +void aom_highbd_d153_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d153_predictor_32x16 aom_highbd_d153_predictor_32x16_c + void aom_highbd_d153_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d153_predictor_32x32 aom_highbd_d153_predictor_32x32_c void aom_highbd_d153_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d153_predictor_4x4 aom_highbd_d153_predictor_4x4_c +void aom_highbd_d153_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d153_predictor_4x8 aom_highbd_d153_predictor_4x8_c + +void aom_highbd_d153_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d153_predictor_8x16 aom_highbd_d153_predictor_8x16_c + +void aom_highbd_d153_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d153_predictor_8x4 aom_highbd_d153_predictor_8x4_c + void aom_highbd_d153_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d153_predictor_8x8 aom_highbd_d153_predictor_8x8_c void aom_highbd_d207e_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d207e_predictor_16x16 aom_highbd_d207e_predictor_16x16_c +void aom_highbd_d207e_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d207e_predictor_16x32 aom_highbd_d207e_predictor_16x32_c + +void aom_highbd_d207e_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d207e_predictor_16x8 aom_highbd_d207e_predictor_16x8_c + void aom_highbd_d207e_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d207e_predictor_2x2 aom_highbd_d207e_predictor_2x2_c +void aom_highbd_d207e_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d207e_predictor_32x16 aom_highbd_d207e_predictor_32x16_c + void aom_highbd_d207e_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d207e_predictor_32x32 aom_highbd_d207e_predictor_32x32_c void aom_highbd_d207e_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d207e_predictor_4x4 aom_highbd_d207e_predictor_4x4_c +void aom_highbd_d207e_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d207e_predictor_4x8 aom_highbd_d207e_predictor_4x8_c + +void aom_highbd_d207e_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d207e_predictor_8x16 aom_highbd_d207e_predictor_8x16_c + +void aom_highbd_d207e_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d207e_predictor_8x4 aom_highbd_d207e_predictor_8x4_c + void aom_highbd_d207e_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d207e_predictor_8x8 aom_highbd_d207e_predictor_8x8_c void aom_highbd_d45e_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d45e_predictor_16x16 aom_highbd_d45e_predictor_16x16_c +void aom_highbd_d45e_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d45e_predictor_16x32 aom_highbd_d45e_predictor_16x32_c + +void aom_highbd_d45e_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d45e_predictor_16x8 aom_highbd_d45e_predictor_16x8_c + void aom_highbd_d45e_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d45e_predictor_2x2 aom_highbd_d45e_predictor_2x2_c +void aom_highbd_d45e_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d45e_predictor_32x16 aom_highbd_d45e_predictor_32x16_c + void aom_highbd_d45e_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d45e_predictor_32x32 aom_highbd_d45e_predictor_32x32_c void aom_highbd_d45e_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d45e_predictor_4x4 aom_highbd_d45e_predictor_4x4_c +void aom_highbd_d45e_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d45e_predictor_4x8 aom_highbd_d45e_predictor_4x8_c + +void aom_highbd_d45e_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d45e_predictor_8x16 aom_highbd_d45e_predictor_8x16_c + +void aom_highbd_d45e_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d45e_predictor_8x4 aom_highbd_d45e_predictor_8x4_c + void aom_highbd_d45e_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d45e_predictor_8x8 aom_highbd_d45e_predictor_8x8_c void aom_highbd_d63e_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d63e_predictor_16x16 aom_highbd_d63e_predictor_16x16_c +void aom_highbd_d63e_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d63e_predictor_16x32 aom_highbd_d63e_predictor_16x32_c + +void aom_highbd_d63e_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d63e_predictor_16x8 aom_highbd_d63e_predictor_16x8_c + void aom_highbd_d63e_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d63e_predictor_2x2 aom_highbd_d63e_predictor_2x2_c +void aom_highbd_d63e_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d63e_predictor_32x16 aom_highbd_d63e_predictor_32x16_c + void aom_highbd_d63e_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d63e_predictor_32x32 aom_highbd_d63e_predictor_32x32_c void aom_highbd_d63e_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d63e_predictor_4x4 aom_highbd_d63e_predictor_4x4_c +void aom_highbd_d63e_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d63e_predictor_4x8 aom_highbd_d63e_predictor_4x8_c + +void aom_highbd_d63e_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d63e_predictor_8x16 aom_highbd_d63e_predictor_8x16_c + +void aom_highbd_d63e_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_d63e_predictor_8x4 aom_highbd_d63e_predictor_8x4_c + void aom_highbd_d63e_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_d63e_predictor_8x8 aom_highbd_d63e_predictor_8x8_c void aom_highbd_dc_128_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_128_predictor_16x16 aom_highbd_dc_128_predictor_16x16_c +void aom_highbd_dc_128_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_128_predictor_16x32 aom_highbd_dc_128_predictor_16x32_c + +void aom_highbd_dc_128_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_128_predictor_16x8 aom_highbd_dc_128_predictor_16x8_c + void aom_highbd_dc_128_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_128_predictor_2x2 aom_highbd_dc_128_predictor_2x2_c +void aom_highbd_dc_128_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_128_predictor_32x16 aom_highbd_dc_128_predictor_32x16_c + void aom_highbd_dc_128_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_128_predictor_32x32 aom_highbd_dc_128_predictor_32x32_c void aom_highbd_dc_128_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_128_predictor_4x4 aom_highbd_dc_128_predictor_4x4_c +void aom_highbd_dc_128_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_128_predictor_4x8 aom_highbd_dc_128_predictor_4x8_c + +void aom_highbd_dc_128_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_128_predictor_8x16 aom_highbd_dc_128_predictor_8x16_c + +void aom_highbd_dc_128_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_128_predictor_8x4 aom_highbd_dc_128_predictor_8x4_c + void aom_highbd_dc_128_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_128_predictor_8x8 aom_highbd_dc_128_predictor_8x8_c void aom_highbd_dc_left_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_left_predictor_16x16 aom_highbd_dc_left_predictor_16x16_c +void aom_highbd_dc_left_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_left_predictor_16x32 aom_highbd_dc_left_predictor_16x32_c + +void aom_highbd_dc_left_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_left_predictor_16x8 aom_highbd_dc_left_predictor_16x8_c + void aom_highbd_dc_left_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_left_predictor_2x2 aom_highbd_dc_left_predictor_2x2_c +void aom_highbd_dc_left_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_left_predictor_32x16 aom_highbd_dc_left_predictor_32x16_c + void aom_highbd_dc_left_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_left_predictor_32x32 aom_highbd_dc_left_predictor_32x32_c void aom_highbd_dc_left_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_left_predictor_4x4 aom_highbd_dc_left_predictor_4x4_c +void aom_highbd_dc_left_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_left_predictor_4x8 aom_highbd_dc_left_predictor_4x8_c + +void aom_highbd_dc_left_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_left_predictor_8x16 aom_highbd_dc_left_predictor_8x16_c + +void aom_highbd_dc_left_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_left_predictor_8x4 aom_highbd_dc_left_predictor_8x4_c + void aom_highbd_dc_left_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_left_predictor_8x8 aom_highbd_dc_left_predictor_8x8_c void aom_highbd_dc_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_predictor_16x16 aom_highbd_dc_predictor_16x16_c +void aom_highbd_dc_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_predictor_16x32 aom_highbd_dc_predictor_16x32_c + +void aom_highbd_dc_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_predictor_16x8 aom_highbd_dc_predictor_16x8_c + void aom_highbd_dc_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_predictor_2x2 aom_highbd_dc_predictor_2x2_c +void aom_highbd_dc_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_predictor_32x16 aom_highbd_dc_predictor_32x16_c + void aom_highbd_dc_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_predictor_32x32 aom_highbd_dc_predictor_32x32_c void aom_highbd_dc_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_predictor_4x4 aom_highbd_dc_predictor_4x4_c +void aom_highbd_dc_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_predictor_4x8 aom_highbd_dc_predictor_4x8_c + +void aom_highbd_dc_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_predictor_8x16 aom_highbd_dc_predictor_8x16_c + +void aom_highbd_dc_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_predictor_8x4 aom_highbd_dc_predictor_8x4_c + void aom_highbd_dc_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_predictor_8x8 aom_highbd_dc_predictor_8x8_c void aom_highbd_dc_top_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_top_predictor_16x16 aom_highbd_dc_top_predictor_16x16_c +void aom_highbd_dc_top_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_top_predictor_16x32 aom_highbd_dc_top_predictor_16x32_c + +void aom_highbd_dc_top_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_top_predictor_16x8 aom_highbd_dc_top_predictor_16x8_c + void aom_highbd_dc_top_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_top_predictor_2x2 aom_highbd_dc_top_predictor_2x2_c +void aom_highbd_dc_top_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_top_predictor_32x16 aom_highbd_dc_top_predictor_32x16_c + void aom_highbd_dc_top_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_top_predictor_32x32 aom_highbd_dc_top_predictor_32x32_c void aom_highbd_dc_top_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_top_predictor_4x4 aom_highbd_dc_top_predictor_4x4_c +void aom_highbd_dc_top_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_top_predictor_4x8 aom_highbd_dc_top_predictor_4x8_c + +void aom_highbd_dc_top_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_top_predictor_8x16 aom_highbd_dc_top_predictor_8x16_c + +void aom_highbd_dc_top_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_dc_top_predictor_8x4 aom_highbd_dc_top_predictor_8x4_c + void aom_highbd_dc_top_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_dc_top_predictor_8x8 aom_highbd_dc_top_predictor_8x8_c void aom_highbd_fdct16x16_c(const int16_t *input, tran_low_t *output, int stride); #define aom_highbd_fdct16x16 aom_highbd_fdct16x16_c -void aom_highbd_fdct16x16_1_c(const int16_t *input, tran_low_t *output, int stride); -#define aom_highbd_fdct16x16_1 aom_highbd_fdct16x16_1_c - void aom_highbd_fdct32x32_c(const int16_t *input, tran_low_t *output, int stride); #define aom_highbd_fdct32x32 aom_highbd_fdct32x32_c -void aom_highbd_fdct32x32_1_c(const int16_t *input, tran_low_t *output, int stride); -#define aom_highbd_fdct32x32_1 aom_highbd_fdct32x32_1_c - void aom_highbd_fdct32x32_rd_c(const int16_t *input, tran_low_t *output, int stride); #define aom_highbd_fdct32x32_rd aom_highbd_fdct32x32_rd_c @@ -1196,44 +1577,38 @@ void aom_highbd_fdct4x4_c(const int16_t *input, tran_low_t *output, int stride); void aom_highbd_fdct8x8_c(const int16_t *input, tran_low_t *output, int stride); #define aom_highbd_fdct8x8 aom_highbd_fdct8x8_c -void aom_highbd_fdct8x8_1_c(const int16_t *input, tran_low_t *output, int stride); -#define aom_highbd_fdct8x8_1 aom_highbd_fdct8x8_1_c - void aom_highbd_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_h_predictor_16x16 aom_highbd_h_predictor_16x16_c +void aom_highbd_h_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_h_predictor_16x32 aom_highbd_h_predictor_16x32_c + +void aom_highbd_h_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_h_predictor_16x8 aom_highbd_h_predictor_16x8_c + void aom_highbd_h_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_h_predictor_2x2 aom_highbd_h_predictor_2x2_c +void aom_highbd_h_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_h_predictor_32x16 aom_highbd_h_predictor_32x16_c + void aom_highbd_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_h_predictor_32x32 aom_highbd_h_predictor_32x32_c void aom_highbd_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_h_predictor_4x4 aom_highbd_h_predictor_4x4_c -void aom_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); -#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c - -void aom_highbd_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd); -#define aom_highbd_idct16x16_1_add aom_highbd_idct16x16_1_add_c +void aom_highbd_h_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_h_predictor_4x8 aom_highbd_h_predictor_4x8_c -void aom_highbd_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd); -#define aom_highbd_idct32x32_1024_add aom_highbd_idct32x32_1024_add_c +void aom_highbd_h_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_h_predictor_8x16 aom_highbd_h_predictor_8x16_c -void aom_highbd_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd); -#define aom_highbd_idct32x32_1_add aom_highbd_idct32x32_1_add_c +void aom_highbd_h_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_h_predictor_8x4 aom_highbd_h_predictor_8x4_c -void aom_highbd_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd); -#define aom_highbd_idct32x32_34_add aom_highbd_idct32x32_34_add_c - -void aom_highbd_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd); -#define aom_highbd_idct4x4_16_add aom_highbd_idct4x4_16_add_c - -void aom_highbd_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd); -#define aom_highbd_idct4x4_1_add aom_highbd_idct4x4_1_add_c - -void aom_highbd_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd); -#define aom_highbd_idct8x8_1_add aom_highbd_idct8x8_1_add_c +void aom_highbd_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_h_predictor_8x8 aom_highbd_h_predictor_8x8_c void aom_highbd_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int bd); #define aom_highbd_iwht4x4_16_add aom_highbd_iwht4x4_16_add_c @@ -1439,15 +1814,33 @@ unsigned int aom_highbd_obmc_variance8x8_c(const uint8_t *pre, int pre_stride, c void aom_highbd_paeth_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_paeth_predictor_16x16 aom_highbd_paeth_predictor_16x16_c +void aom_highbd_paeth_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_paeth_predictor_16x32 aom_highbd_paeth_predictor_16x32_c + +void aom_highbd_paeth_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_paeth_predictor_16x8 aom_highbd_paeth_predictor_16x8_c + void aom_highbd_paeth_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_paeth_predictor_2x2 aom_highbd_paeth_predictor_2x2_c +void aom_highbd_paeth_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_paeth_predictor_32x16 aom_highbd_paeth_predictor_32x16_c + void aom_highbd_paeth_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_paeth_predictor_32x32 aom_highbd_paeth_predictor_32x32_c void aom_highbd_paeth_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_paeth_predictor_4x4 aom_highbd_paeth_predictor_4x4_c +void aom_highbd_paeth_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_paeth_predictor_4x8 aom_highbd_paeth_predictor_4x8_c + +void aom_highbd_paeth_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_paeth_predictor_8x16 aom_highbd_paeth_predictor_8x16_c + +void aom_highbd_paeth_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_paeth_predictor_8x4 aom_highbd_paeth_predictor_8x4_c + void aom_highbd_paeth_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_paeth_predictor_8x8 aom_highbd_paeth_predictor_8x8_c @@ -1625,39 +2018,141 @@ void aom_highbd_sad8x8x4d_c(const uint8_t *src_ptr, int src_stride, const uint8_ void aom_highbd_sad8x8x8_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array); #define aom_highbd_sad8x8x8 aom_highbd_sad8x8x8_c +void aom_highbd_smooth_h_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_16x16 aom_highbd_smooth_h_predictor_16x16_c + +void aom_highbd_smooth_h_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_16x32 aom_highbd_smooth_h_predictor_16x32_c + +void aom_highbd_smooth_h_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_16x8 aom_highbd_smooth_h_predictor_16x8_c + +void aom_highbd_smooth_h_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_2x2 aom_highbd_smooth_h_predictor_2x2_c + +void aom_highbd_smooth_h_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_32x16 aom_highbd_smooth_h_predictor_32x16_c + +void aom_highbd_smooth_h_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_32x32 aom_highbd_smooth_h_predictor_32x32_c + +void aom_highbd_smooth_h_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_4x4 aom_highbd_smooth_h_predictor_4x4_c + +void aom_highbd_smooth_h_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_4x8 aom_highbd_smooth_h_predictor_4x8_c + +void aom_highbd_smooth_h_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_8x16 aom_highbd_smooth_h_predictor_8x16_c + +void aom_highbd_smooth_h_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_8x4 aom_highbd_smooth_h_predictor_8x4_c + +void aom_highbd_smooth_h_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_h_predictor_8x8 aom_highbd_smooth_h_predictor_8x8_c + void aom_highbd_smooth_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_smooth_predictor_16x16 aom_highbd_smooth_predictor_16x16_c +void aom_highbd_smooth_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_predictor_16x32 aom_highbd_smooth_predictor_16x32_c + +void aom_highbd_smooth_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_predictor_16x8 aom_highbd_smooth_predictor_16x8_c + void aom_highbd_smooth_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_smooth_predictor_2x2 aom_highbd_smooth_predictor_2x2_c +void aom_highbd_smooth_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_predictor_32x16 aom_highbd_smooth_predictor_32x16_c + void aom_highbd_smooth_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_smooth_predictor_32x32 aom_highbd_smooth_predictor_32x32_c void aom_highbd_smooth_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_smooth_predictor_4x4 aom_highbd_smooth_predictor_4x4_c +void aom_highbd_smooth_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_predictor_4x8 aom_highbd_smooth_predictor_4x8_c + +void aom_highbd_smooth_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_predictor_8x16 aom_highbd_smooth_predictor_8x16_c + +void aom_highbd_smooth_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_predictor_8x4 aom_highbd_smooth_predictor_8x4_c + void aom_highbd_smooth_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_smooth_predictor_8x8 aom_highbd_smooth_predictor_8x8_c +void aom_highbd_smooth_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_16x16 aom_highbd_smooth_v_predictor_16x16_c + +void aom_highbd_smooth_v_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_16x32 aom_highbd_smooth_v_predictor_16x32_c + +void aom_highbd_smooth_v_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_16x8 aom_highbd_smooth_v_predictor_16x8_c + +void aom_highbd_smooth_v_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_2x2 aom_highbd_smooth_v_predictor_2x2_c + +void aom_highbd_smooth_v_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_32x16 aom_highbd_smooth_v_predictor_32x16_c + +void aom_highbd_smooth_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_32x32 aom_highbd_smooth_v_predictor_32x32_c + +void aom_highbd_smooth_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_4x4 aom_highbd_smooth_v_predictor_4x4_c + +void aom_highbd_smooth_v_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_4x8 aom_highbd_smooth_v_predictor_4x8_c + +void aom_highbd_smooth_v_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_8x16 aom_highbd_smooth_v_predictor_8x16_c + +void aom_highbd_smooth_v_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_8x4 aom_highbd_smooth_v_predictor_8x4_c + +void aom_highbd_smooth_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_smooth_v_predictor_8x8 aom_highbd_smooth_v_predictor_8x8_c + void aom_highbd_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride, int bd); #define aom_highbd_subtract_block aom_highbd_subtract_block_c -void aom_highbd_upsampled_pred_c(uint16_t *comp_pred, int width, int height, const uint8_t *ref8, int ref_stride); +void aom_highbd_upsampled_pred_c(uint16_t *comp_pred, int width, int height, int subsample_x_q3, int subsample_y_q3, const uint8_t *ref8, int ref_stride, int bd); #define aom_highbd_upsampled_pred aom_highbd_upsampled_pred_c void aom_highbd_v_predictor_16x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_v_predictor_16x16 aom_highbd_v_predictor_16x16_c +void aom_highbd_v_predictor_16x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_v_predictor_16x32 aom_highbd_v_predictor_16x32_c + +void aom_highbd_v_predictor_16x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_v_predictor_16x8 aom_highbd_v_predictor_16x8_c + void aom_highbd_v_predictor_2x2_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_v_predictor_2x2 aom_highbd_v_predictor_2x2_c +void aom_highbd_v_predictor_32x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_v_predictor_32x16 aom_highbd_v_predictor_32x16_c + void aom_highbd_v_predictor_32x32_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_v_predictor_32x32 aom_highbd_v_predictor_32x32_c void aom_highbd_v_predictor_4x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_v_predictor_4x4 aom_highbd_v_predictor_4x4_c +void aom_highbd_v_predictor_4x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_v_predictor_4x8 aom_highbd_v_predictor_4x8_c + +void aom_highbd_v_predictor_8x16_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_v_predictor_8x16 aom_highbd_v_predictor_8x16_c + +void aom_highbd_v_predictor_8x4_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); +#define aom_highbd_v_predictor_8x4 aom_highbd_v_predictor_8x4_c + void aom_highbd_v_predictor_8x8_c(uint16_t *dst, ptrdiff_t y_stride, const uint16_t *above, const uint16_t *left, int bd); #define aom_highbd_v_predictor_8x8 aom_highbd_v_predictor_8x8_c @@ -1961,15 +2456,33 @@ unsigned int aom_obmc_variance8x8_c(const uint8_t *pre, int pre_stride, const in void aom_paeth_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_paeth_predictor_16x16 aom_paeth_predictor_16x16_c +void aom_paeth_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_paeth_predictor_16x32 aom_paeth_predictor_16x32_c + +void aom_paeth_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_paeth_predictor_16x8 aom_paeth_predictor_16x8_c + void aom_paeth_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_paeth_predictor_2x2 aom_paeth_predictor_2x2_c +void aom_paeth_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_paeth_predictor_32x16 aom_paeth_predictor_32x16_c + void aom_paeth_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_paeth_predictor_32x32 aom_paeth_predictor_32x32_c void aom_paeth_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_paeth_predictor_4x4 aom_paeth_predictor_4x4_c +void aom_paeth_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_paeth_predictor_4x8 aom_paeth_predictor_4x8_c + +void aom_paeth_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_paeth_predictor_8x16 aom_paeth_predictor_8x16_c + +void aom_paeth_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_paeth_predictor_8x4 aom_paeth_predictor_8x4_c + void aom_paeth_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_paeth_predictor_8x8 aom_paeth_predictor_8x8_c @@ -2168,21 +2681,105 @@ void aom_scaled_horiz_c(const uint8_t *src, ptrdiff_t src_stride, uint8_t *dst, void aom_scaled_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_scaled_vert aom_scaled_vert_c +void aom_smooth_h_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_16x16 aom_smooth_h_predictor_16x16_c + +void aom_smooth_h_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_16x32 aom_smooth_h_predictor_16x32_c + +void aom_smooth_h_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_16x8 aom_smooth_h_predictor_16x8_c + +void aom_smooth_h_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_2x2 aom_smooth_h_predictor_2x2_c + +void aom_smooth_h_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_32x16 aom_smooth_h_predictor_32x16_c + +void aom_smooth_h_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_32x32 aom_smooth_h_predictor_32x32_c + +void aom_smooth_h_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_4x4 aom_smooth_h_predictor_4x4_c + +void aom_smooth_h_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_4x8 aom_smooth_h_predictor_4x8_c + +void aom_smooth_h_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_8x16 aom_smooth_h_predictor_8x16_c + +void aom_smooth_h_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_8x4 aom_smooth_h_predictor_8x4_c + +void aom_smooth_h_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_h_predictor_8x8 aom_smooth_h_predictor_8x8_c + void aom_smooth_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_smooth_predictor_16x16 aom_smooth_predictor_16x16_c +void aom_smooth_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_predictor_16x32 aom_smooth_predictor_16x32_c + +void aom_smooth_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_predictor_16x8 aom_smooth_predictor_16x8_c + void aom_smooth_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_smooth_predictor_2x2 aom_smooth_predictor_2x2_c +void aom_smooth_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_predictor_32x16 aom_smooth_predictor_32x16_c + void aom_smooth_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_smooth_predictor_32x32 aom_smooth_predictor_32x32_c void aom_smooth_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_smooth_predictor_4x4 aom_smooth_predictor_4x4_c +void aom_smooth_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_predictor_4x8 aom_smooth_predictor_4x8_c + +void aom_smooth_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_predictor_8x16 aom_smooth_predictor_8x16_c + +void aom_smooth_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_predictor_8x4 aom_smooth_predictor_8x4_c + void aom_smooth_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_smooth_predictor_8x8 aom_smooth_predictor_8x8_c +void aom_smooth_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_16x16 aom_smooth_v_predictor_16x16_c + +void aom_smooth_v_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_16x32 aom_smooth_v_predictor_16x32_c + +void aom_smooth_v_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_16x8 aom_smooth_v_predictor_16x8_c + +void aom_smooth_v_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_2x2 aom_smooth_v_predictor_2x2_c + +void aom_smooth_v_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_32x16 aom_smooth_v_predictor_32x16_c + +void aom_smooth_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_32x32 aom_smooth_v_predictor_32x32_c + +void aom_smooth_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_4x4 aom_smooth_v_predictor_4x4_c + +void aom_smooth_v_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_4x8 aom_smooth_v_predictor_4x8_c + +void aom_smooth_v_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_8x16 aom_smooth_v_predictor_8x16_c + +void aom_smooth_v_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_8x4 aom_smooth_v_predictor_8x4_c + +void aom_smooth_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_smooth_v_predictor_8x8 aom_smooth_v_predictor_8x8_c + uint32_t aom_sub_pixel_avg_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred); #define aom_sub_pixel_avg_variance16x16 aom_sub_pixel_avg_variance16x16_c @@ -2270,21 +2867,39 @@ uint64_t aom_sum_squares_2d_i16_c(const int16_t *src, int stride, int width, int uint64_t aom_sum_squares_i16_c(const int16_t *src, uint32_t N); #define aom_sum_squares_i16 aom_sum_squares_i16_c -void aom_upsampled_pred_c(uint8_t *comp_pred, int width, int height, const uint8_t *ref, int ref_stride); +void aom_upsampled_pred_c(uint8_t *comp_pred, int width, int height, int subsample_x_q3, int subsample_y_q3, const uint8_t *ref, int ref_stride); #define aom_upsampled_pred aom_upsampled_pred_c void aom_v_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_v_predictor_16x16 aom_v_predictor_16x16_c +void aom_v_predictor_16x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_v_predictor_16x32 aom_v_predictor_16x32_c + +void aom_v_predictor_16x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_v_predictor_16x8 aom_v_predictor_16x8_c + void aom_v_predictor_2x2_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_v_predictor_2x2 aom_v_predictor_2x2_c +void aom_v_predictor_32x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_v_predictor_32x16 aom_v_predictor_32x16_c + void aom_v_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_v_predictor_32x32 aom_v_predictor_32x32_c void aom_v_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_v_predictor_4x4 aom_v_predictor_4x4_c +void aom_v_predictor_4x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_v_predictor_4x8 aom_v_predictor_4x8_c + +void aom_v_predictor_8x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_v_predictor_8x16 aom_v_predictor_8x16_c + +void aom_v_predictor_8x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); +#define aom_v_predictor_8x4 aom_v_predictor_8x4_c + void aom_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left); #define aom_v_predictor_8x8 aom_v_predictor_8x8_c diff --git a/media/libaom/config/generic/av1_rtcd.h b/media/libaom/config/generic/av1_rtcd.h index c9a1e8458..85c65c4d8 100644 --- a/media/libaom/config/generic/av1_rtcd.h +++ b/media/libaom/config/generic/av1_rtcd.h @@ -12,6 +12,7 @@ */ #include "aom/aom_integer.h" +#include "aom_dsp/txfm_common.h" #include "av1/common/common.h" #include "av1/common/enums.h" #include "av1/common/quant_common.h" @@ -24,6 +25,7 @@ struct macroblockd; /* Encoder forward decls */ struct macroblock; +struct txfm_param; struct aom_variance_vtable; struct search_site_config; struct mv; @@ -62,46 +64,46 @@ int av1_diamond_search_sad_c(struct macroblock *x, const struct search_site_conf 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, int tx_type); +void av1_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht16x16 av1_fht16x16_c -void av1_fht16x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht16x32_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht16x32 av1_fht16x32_c -void av1_fht16x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht16x4_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht16x4 av1_fht16x4_c -void av1_fht16x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht16x8_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht16x8 av1_fht16x8_c -void av1_fht32x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht32x16_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht32x16 av1_fht32x16_c -void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht32x32_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht32x32 av1_fht32x32_c -void av1_fht32x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht32x8_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht32x8 av1_fht32x8_c -void av1_fht4x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht4x16_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht4x16 av1_fht4x16_c -void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht4x4 av1_fht4x4_c -void av1_fht4x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht4x8_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht4x8 av1_fht4x8_c -void av1_fht8x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht8x16_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht8x16 av1_fht8x16_c -void av1_fht8x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht8x32_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht8x32 av1_fht8x32_c -void av1_fht8x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht8x4_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht8x4 av1_fht8x4_c -void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); +void av1_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, struct txfm_param *param); #define av1_fht8x8 av1_fht8x8_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); @@ -116,15 +118,33 @@ void av1_fwd_idtx_c(const int16_t *src_diff, tran_low_t *coeff, int stride, int void av1_fwd_txfm2d_16x16_c(const int16_t *input, int32_t *output, int stride, int 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); +#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); +#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); +#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); #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); #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); +#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); +#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); +#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); #define av1_fwd_txfm2d_8x8 av1_fwd_txfm2d_8x8_c @@ -167,88 +187,46 @@ void av1_highbd_convolve_init_c(void); 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 -void av1_highbd_fht16x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht16x16 av1_highbd_fht16x16_c - -void av1_highbd_fht16x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht16x32 av1_highbd_fht16x32_c - -void av1_highbd_fht16x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht16x4 av1_highbd_fht16x4_c - -void av1_highbd_fht16x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht16x8 av1_highbd_fht16x8_c - -void av1_highbd_fht32x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht32x16 av1_highbd_fht32x16_c - -void av1_highbd_fht32x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht32x32 av1_highbd_fht32x32_c - -void av1_highbd_fht32x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht32x8 av1_highbd_fht32x8_c - -void av1_highbd_fht4x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht4x16 av1_highbd_fht4x16_c - -void av1_highbd_fht4x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht4x4 av1_highbd_fht4x4_c - -void av1_highbd_fht4x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht4x8 av1_highbd_fht4x8_c - -void av1_highbd_fht8x16_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht8x16 av1_highbd_fht8x16_c - -void av1_highbd_fht8x32_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht8x32 av1_highbd_fht8x32_c - -void av1_highbd_fht8x4_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht8x4 av1_highbd_fht8x4_c - -void av1_highbd_fht8x8_c(const int16_t *input, tran_low_t *output, int stride, int tx_type); -#define av1_highbd_fht8x8 av1_highbd_fht8x8_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_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type, int bd); +void av1_highbd_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param); #define av1_highbd_iht16x16_256_add av1_highbd_iht16x16_256_add_c -void av1_highbd_iht16x32_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht16x32_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht16x32_512_add av1_highbd_iht16x32_512_add_c -void av1_highbd_iht16x4_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht16x4_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht16x4_64_add av1_highbd_iht16x4_64_add_c -void av1_highbd_iht16x8_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht16x8_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht16x8_128_add av1_highbd_iht16x8_128_add_c -void av1_highbd_iht32x16_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht32x16_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht32x16_512_add av1_highbd_iht32x16_512_add_c -void av1_highbd_iht32x8_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht32x8_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht32x8_256_add av1_highbd_iht32x8_256_add_c -void av1_highbd_iht4x16_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht4x16_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht4x16_64_add av1_highbd_iht4x16_64_add_c -void av1_highbd_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht4x4_16_add av1_highbd_iht4x4_16_add_c -void av1_highbd_iht4x8_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht4x8_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht4x8_32_add av1_highbd_iht4x8_32_add_c -void av1_highbd_iht8x16_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht8x16_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht8x16_128_add av1_highbd_iht8x16_128_add_c -void av1_highbd_iht8x32_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht8x32_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht8x32_256_add av1_highbd_iht8x32_256_add_c -void av1_highbd_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +void av1_highbd_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_highbd_iht8x4_32_add av1_highbd_iht8x4_32_add_c -void av1_highbd_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type, int bd); +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); @@ -260,63 +238,81 @@ void av1_highbd_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, in void av1_highbd_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_highbd_temporal_filter_apply av1_highbd_temporal_filter_apply_c -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, int comp_avg, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta); +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_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); +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 -void av1_iht16x32_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht16x32_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht16x32_512_add av1_iht16x32_512_add_c -void av1_iht16x4_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht16x4_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht16x4_64_add av1_iht16x4_64_add_c -void av1_iht16x8_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht16x8_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht16x8_128_add av1_iht16x8_128_add_c -void av1_iht32x16_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht32x16_512_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht32x16_512_add av1_iht32x16_512_add_c -void av1_iht32x32_1024_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type); +void av1_iht32x32_1024_add_c(const tran_low_t *input, uint8_t *output, int pitch, const struct txfm_param *param); #define av1_iht32x32_1024_add av1_iht32x32_1024_add_c -void av1_iht32x8_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht32x8_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht32x8_256_add av1_iht32x8_256_add_c -void av1_iht4x16_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht4x16_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht4x16_64_add av1_iht4x16_64_add_c -void av1_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht4x4_16_add av1_iht4x4_16_add_c -void av1_iht4x8_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht4x8_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht4x8_32_add av1_iht4x8_32_add_c -void av1_iht8x16_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht8x16_128_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht8x16_128_add av1_iht8x16_128_add_c -void av1_iht8x32_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht8x32_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht8x32_256_add av1_iht8x32_256_add_c -void av1_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +void av1_iht8x4_32_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, const struct txfm_param *param); #define av1_iht8x4_32_add av1_iht8x4_32_add_c -void av1_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type); +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); #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); +#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); +#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); +#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); #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); #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); +#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); +#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); +#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); #define av1_inv_txfm2d_add_8x8 av1_inv_txfm2d_add_8x8_c @@ -335,7 +331,7 @@ void av1_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int 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_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, int comp_avg, int16_t alpha, int16_t beta, int16_t gamma, int16_t delta); +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 void av1_wedge_compute_delta_squares_c(int16_t *d, const int16_t *a, const int16_t *b, int N); |