Clean CLPF local function Rename local functions and make them static. Remove unnecessary header file and corresponding includes. Change-Id: I4b09e3949e7207754753997ff359992bd348d488
diff --git a/av1/av1.cmake b/av1/av1.cmake index f08c700..f224c9b 100644 --- a/av1/av1.cmake +++ b/av1/av1.cmake
@@ -236,7 +236,6 @@ set(AOM_AV1_COMMON_SOURCES ${AOM_AV1_COMMON_SOURCES} "${AOM_ROOT}/av1/common/clpf.c" - "${AOM_ROOT}/av1/common/clpf.h" "${AOM_ROOT}/av1/common/clpf_simd.h" "${AOM_ROOT}/av1/common/cdef_simd.h" "${AOM_ROOT}/av1/common/cdef.c"
diff --git a/av1/av1_common.mk b/av1/av1_common.mk index d727652..a8ba720 100644 --- a/av1/av1_common.mk +++ b/av1/av1_common.mk
@@ -91,7 +91,6 @@ endif ifeq ($(CONFIG_CDEF),yes) AV1_COMMON_SRCS-yes += common/clpf.c -AV1_COMMON_SRCS-yes += common/clpf.h AV1_COMMON_SRCS-yes += common/clpf_simd.h AV1_COMMON_SRCS-yes += common/cdef_simd.h AV1_COMMON_SRCS-$(HAVE_SSE2) += common/clpf_sse2.c
diff --git a/av1/common/clpf.c b/av1/common/clpf.c index 3637dee..d643236 100644 --- a/av1/common/clpf.c +++ b/av1/common/clpf.c
@@ -9,14 +9,13 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#include "./clpf.h" #include "./av1_rtcd.h" #include "./cdef.h" #include "aom/aom_image.h" #include "aom_dsp/aom_dsp_common.h" -int av1_clpf_sample(int X, int A, int B, int C, int D, int E, int F, int G, - int H, int s, unsigned int dmp) { +static int clpf_sample(int X, int A, int B, int C, int D, int E, int F, int G, + int H, int s, unsigned int dmp) { int delta = 1 * constrain(A - X, s, dmp) + 3 * constrain(B - X, s, dmp) + 1 * constrain(C - X, s, dmp) + 3 * constrain(D - X, s, dmp) + 3 * constrain(E - X, s, dmp) + 1 * constrain(F - X, s, dmp) + @@ -24,8 +23,8 @@ return (8 + delta - (delta < 0)) >> 4; } -int av1_clpf_hsample(int X, int A, int B, int C, int D, int s, - unsigned int dmp) { +static int clpf_hsample(int X, int A, int B, int C, int D, int s, + unsigned int dmp) { int delta = 1 * constrain(A - X, s, dmp) + 3 * constrain(B - X, s, dmp) + 3 * constrain(C - X, s, dmp) + 1 * constrain(D - X, s, dmp); return (4 + delta - (delta < 0)) >> 3; @@ -48,7 +47,7 @@ const int G = src[(y + 1) * sstride + x]; const int H = src[(y + 2) * sstride + x]; const int delta = - av1_clpf_sample(X, A, B, C, D, E, F, G, H, strength, damping); + clpf_sample(X, A, B, C, D, E, F, G, H, strength, damping); dst[y * dstride + x] = X + delta; } } @@ -72,7 +71,7 @@ const int G = src[(y + 1) * sstride + x]; const int H = src[(y + 2) * sstride + x]; const int delta = - av1_clpf_sample(X, A, B, C, D, E, F, G, H, strength, damping); + clpf_sample(X, A, B, C, D, E, F, G, H, strength, damping); dst[y * dstride + x] = X + delta; } } @@ -91,7 +90,7 @@ const int B = src[y * sstride + x - 1]; const int C = src[y * sstride + x + 1]; const int D = src[y * sstride + x + 2]; - const int delta = av1_clpf_hsample(X, A, B, C, D, strength, damping); + const int delta = clpf_hsample(X, A, B, C, D, strength, damping); dst[y * dstride + x] = X + delta; } } @@ -109,7 +108,7 @@ const int B = src[y * sstride + x - 1]; const int C = src[y * sstride + x + 1]; const int D = src[y * sstride + x + 2]; - const int delta = av1_clpf_hsample(X, A, B, C, D, strength, damping); + const int delta = clpf_hsample(X, A, B, C, D, strength, damping); dst[y * dstride + x] = X + delta; } }
diff --git a/av1/common/clpf.h b/av1/common/clpf.h deleted file mode 100644 index d6348de..0000000 --- a/av1/common/clpf.h +++ /dev/null
@@ -1,18 +0,0 @@ -/* - * Copyright (c) 2016, Alliance for Open Media. All rights reserved - * - * This source code is subject to the terms of the BSD 2 Clause License and - * the Alliance for Open Media Patent License 1.0. If the BSD 2 Clause License - * was not distributed with this source code in the LICENSE file, you can - * obtain it at www.aomedia.org/license/software. If the Alliance for Open - * 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_CLPF_H_ -#define AV1_COMMON_CLPF_H_ - -#include "av1/common/reconinter.h" - -int av1_clpf_sample(int X, int A, int B, int C, int D, int E, int F, int G, - int H, int b, unsigned int dmp); -#endif
diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c index 3e7a7c5..a0190d7 100644 --- a/av1/decoder/decodeframe.c +++ b/av1/decoder/decodeframe.c
@@ -35,7 +35,6 @@ #include "av1/common/alloccommon.h" #if CONFIG_CDEF #include "av1/common/cdef.h" -#include "av1/common/clpf.h" #endif #if CONFIG_INSPECTION #include "av1/decoder/inspection.h"
diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c index 9c9fb83..f5a1a2b 100644 --- a/av1/encoder/bitstream.c +++ b/av1/encoder/bitstream.c
@@ -26,7 +26,6 @@ #if CONFIG_CDEF #include "av1/common/cdef.h" -#include "av1/common/clpf.h" #endif // CONFIG_CDEF #include "av1/common/entropy.h" #include "av1/common/entropymode.h"
diff --git a/av1/encoder/encoder.c b/av1/encoder/encoder.c index 4fe992c..7658708 100644 --- a/av1/encoder/encoder.c +++ b/av1/encoder/encoder.c
@@ -18,7 +18,6 @@ #include "av1/common/alloccommon.h" #if CONFIG_CDEF #include "av1/common/cdef.h" -#include "av1/common/clpf.h" #endif // CONFIG_CDEF #include "av1/common/filter.h" #include "av1/common/idct.h"