diff options
author | Jingning Han <jingning@google.com> | 2015-07-15 13:02:01 -0700 |
---|---|---|
committer | Jingning Han <jingning@google.com> | 2015-07-15 13:03:23 -0700 |
commit | db8e731b8d5a9e15e369e3921d4326e32b9efa10 (patch) | |
tree | 207d15462643380e43150cd2934eeb2000f805fd /vp9/common | |
parent | 3fe83cdf81cf039391dc9cc4c4e7d27ce5085e55 (diff) | |
download | libvpx-db8e731b8d5a9e15e369e3921d4326e32b9efa10.tar libvpx-db8e731b8d5a9e15e369e3921d4326e32b9efa10.tar.gz libvpx-db8e731b8d5a9e15e369e3921d4326e32b9efa10.tar.bz2 libvpx-db8e731b8d5a9e15e369e3921d4326e32b9efa10.zip |
Add vpx_dsp_common.h file
Move the clamp functions to vpx_dsp_common.h file. Clear out the
dependency of vp9_loopfilter_filters.c on vp9_common.h file.
Change-Id: I9c4b928bcd7f597106b5aa96354356d3775a3431
Diffstat (limited to 'vp9/common')
-rw-r--r-- | vp9/common/vp9_common.h | 16 | ||||
-rw-r--r-- | vp9/common/vp9_loopfilter_filters.c | 2 |
2 files changed, 2 insertions, 16 deletions
diff --git a/vp9/common/vp9_common.h b/vp9/common/vp9_common.h index 9c2d7791e..44dfb4d2f 100644 --- a/vp9/common/vp9_common.h +++ b/vp9/common/vp9_common.h @@ -16,6 +16,7 @@ #include <assert.h> #include "./vpx_config.h" +#include "vpx_dsp/vpx_dsp_common.h" #include "vpx_mem/vpx_mem.h" #include "vpx/vpx_integer.h" #include "vp9/common/vp9_systemdependent.h" @@ -24,9 +25,6 @@ extern "C" { #endif -#define MIN(x, y) (((x) < (y)) ? (x) : (y)) -#define MAX(x, y) (((x) > (y)) ? (x) : (y)) - // Only need this for fixed-size arrays, for structs just assign. #define vp9_copy(dest, src) { \ assert(sizeof(dest) == sizeof(src)); \ @@ -42,18 +40,6 @@ extern "C" { #define vp9_zero(dest) memset(&(dest), 0, sizeof(dest)) #define vp9_zero_array(dest, n) memset(dest, 0, n * sizeof(*dest)) -static INLINE uint8_t clip_pixel(int val) { - return (val > 255) ? 255 : (val < 0) ? 0 : val; -} - -static INLINE int clamp(int value, int low, int high) { - return value < low ? low : (value > high ? high : value); -} - -static INLINE double fclamp(double value, double low, double high) { - return value < low ? low : (value > high ? high : value); -} - static INLINE int get_unsigned_bits(unsigned int num_values) { return num_values > 0 ? get_msb(num_values) + 1 : 0; } diff --git a/vp9/common/vp9_loopfilter_filters.c b/vp9/common/vp9_loopfilter_filters.c index b0626625a..4876f9e3e 100644 --- a/vp9/common/vp9_loopfilter_filters.c +++ b/vp9/common/vp9_loopfilter_filters.c @@ -9,8 +9,8 @@ */ #include "./vpx_config.h" +#include "vpx_dsp/vpx_dsp_common.h" #include "vpx_ports/mem.h" -#include "vp9/common/vp9_common.h" static INLINE int8_t signed_char_clamp(int t) { return (int8_t)clamp(t, -128, 127); |