diff options
Diffstat (limited to 'third_party/aom/av1/common/cdef.h')
| -rw-r--r-- | third_party/aom/av1/common/cdef.h | 31 |
1 files changed, 14 insertions, 17 deletions
diff --git a/third_party/aom/av1/common/cdef.h b/third_party/aom/av1/common/cdef.h index a0dd0a698..9de24bf92 100644 --- a/third_party/aom/av1/common/cdef.h +++ b/third_party/aom/av1/common/cdef.h @@ -8,31 +8,28 @@ * Media Patent License 1.0 was not distributed with this source code in the * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef AV1_COMMON_DERING_H_ -#define AV1_COMMON_DERING_H_ +#ifndef AV1_COMMON_CDEF_H_ +#define AV1_COMMON_CDEF_H_ #define CDEF_STRENGTH_BITS 7 -#define DERING_STRENGTHS 32 -#define CLPF_STRENGTHS 4 +#define CDEF_PRI_STRENGTHS 32 +#define CDEF_SEC_STRENGTHS 4 #include "./aom_config.h" #include "aom/aom_integer.h" #include "aom_ports/mem.h" -#include "av1/common/od_dering.h" +#include "av1/common/cdef_block.h" #include "av1/common/onyxc_int.h" -#include "./od_dering.h" static INLINE int sign(int i) { return i < 0 ? -1 : 1; } -static INLINE int constrain(int diff, int threshold, unsigned int damping) { - return threshold - ? sign(diff) * - AOMMIN( - abs(diff), - AOMMAX(0, threshold - (abs(diff) >> - (damping - get_msb(threshold))))) - : 0; +static INLINE int constrain(int diff, int threshold, int damping) { + if (!threshold) return 0; + + const int shift = AOMMAX(0, damping - get_msb(threshold)); + return sign(diff) * + AOMMIN(abs(diff), AOMMAX(0, threshold - (abs(diff) >> shift))); } #ifdef __cplusplus @@ -40,8 +37,8 @@ extern "C" { #endif int sb_all_skip(const AV1_COMMON *const cm, int mi_row, int mi_col); -int sb_compute_dering_list(const AV1_COMMON *const cm, int mi_row, int mi_col, - dering_list *dlist, int filter_skip); +int sb_compute_cdef_list(const AV1_COMMON *const cm, int mi_row, int mi_col, + cdef_list *dlist, int filter_skip); void av1_cdef_frame(YV12_BUFFER_CONFIG *frame, AV1_COMMON *cm, MACROBLOCKD *xd); void av1_cdef_search(YV12_BUFFER_CONFIG *frame, const YV12_BUFFER_CONFIG *ref, @@ -50,4 +47,4 @@ void av1_cdef_search(YV12_BUFFER_CONFIG *frame, const YV12_BUFFER_CONFIG *ref, #ifdef __cplusplus } // extern "C" #endif -#endif // AV1_COMMON_DERING_H_ +#endif // AV1_COMMON_CDEF_H_ |