diff options
Diffstat (limited to 'third_party/aom/av1/common/cdef_block.h')
| -rw-r--r-- | third_party/aom/av1/common/cdef_block.h | 49 |
1 files changed, 9 insertions, 40 deletions
diff --git a/third_party/aom/av1/common/cdef_block.h b/third_party/aom/av1/common/cdef_block.h index bf277faad4..81c6da0773 100644 --- a/third_party/aom/av1/common/cdef_block.h +++ b/third_party/aom/av1/common/cdef_block.h @@ -12,43 +12,28 @@ #if !defined(_CDEF_BLOCK_H) #define _CDEF_BLOCK_H (1) -#include "./odintrin.h" +#include "av1/common/odintrin.h" #define CDEF_BLOCKSIZE 64 #define CDEF_BLOCKSIZE_LOG2 6 -#define CDEF_NBLOCKS (CDEF_BLOCKSIZE / 8) -#if CONFIG_CDEF_SINGLEPASS +#define CDEF_NBLOCKS ((1 << MAX_SB_SIZE_LOG2) / 8) #define CDEF_SB_SHIFT (MAX_SB_SIZE_LOG2 - CDEF_BLOCKSIZE_LOG2) -#endif /* We need to buffer three vertical lines. */ #define CDEF_VBORDER (3) /* We only need to buffer three horizontal pixels too, but let's align to 16 bytes (8 x 16 bits) to make vectorization easier. */ #define CDEF_HBORDER (8) -#define CDEF_BSTRIDE ALIGN_POWER_OF_TWO(CDEF_BLOCKSIZE + 2 * CDEF_HBORDER, 3) +#define CDEF_BSTRIDE \ + ALIGN_POWER_OF_TWO((1 << MAX_SB_SIZE_LOG2) + 2 * CDEF_HBORDER, 3) #define CDEF_VERY_LARGE (30000) -#define CDEF_INBUF_SIZE (CDEF_BSTRIDE * (CDEF_BLOCKSIZE + 2 * CDEF_VBORDER)) - -#if CONFIG_CDEF_SINGLEPASS -// Filter configuration -#define CDEF_CAP 1 // 1 = Cap change to largest diff -#define CDEF_FULL 0 // 1 = 7x7 filter, 0 = 5x5 filter +#define CDEF_INBUF_SIZE \ + (CDEF_BSTRIDE * ((1 << MAX_SB_SIZE_LOG2) + 2 * CDEF_VBORDER)) -#if CDEF_FULL -extern const int cdef_pri_taps[2][3]; -extern const int cdef_sec_taps[2][2]; -extern const int cdef_directions[8][3]; -#else extern const int cdef_pri_taps[2][2]; extern const int cdef_sec_taps[2][2]; -extern const int cdef_directions[8][2]; -#endif - -#else // CONFIG_CDEF_SINGLEPASS -extern const int cdef_directions[8][3]; -#endif +DECLARE_ALIGNED(16, extern const int, cdef_directions[8][2]); typedef struct { uint8_t by; @@ -56,35 +41,19 @@ typedef struct { uint8_t skip; } cdef_list; -#if CONFIG_CDEF_SINGLEPASS typedef void (*cdef_filter_block_func)(uint8_t *dst8, uint16_t *dst16, int dstride, const uint16_t *in, int pri_strength, int sec_strength, int dir, int pri_damping, - int sec_damping, int bsize, int max); + int sec_damping, int bsize, int max, + int coeff_shift); void copy_cdef_16bit_to_16bit(uint16_t *dst, int dstride, uint16_t *src, cdef_list *dlist, int cdef_count, int bsize); -#else -typedef void (*cdef_direction_func)(uint16_t *y, int ystride, - const uint16_t *in, int threshold, int dir, - int damping); -int get_filter_skip(int level); -#endif - -#if CONFIG_CDEF_SINGLEPASS void cdef_filter_fb(uint8_t *dst8, uint16_t *dst16, int dstride, uint16_t *in, int xdec, int ydec, int dir[CDEF_NBLOCKS][CDEF_NBLOCKS], int *dirinit, int var[CDEF_NBLOCKS][CDEF_NBLOCKS], int pli, cdef_list *dlist, int cdef_count, int level, int sec_strength, int pri_damping, int sec_damping, int coeff_shift); -#else -void cdef_filter_fb(uint8_t *dst, int dstride, uint16_t *y, uint16_t *in, - int xdec, int ydec, int dir[CDEF_NBLOCKS][CDEF_NBLOCKS], - int *dirinit, int var[CDEF_NBLOCKS][CDEF_NBLOCKS], int pli, - cdef_list *dlist, int cdef_count, int level, - int sec_strength, int sec_damping, int pri_damping, - int coeff_shift, int skip_dering, int hbd); -#endif #endif |