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
This commit is contained in:
parent
3fe83cdf81
commit
db8e731b8d
@ -16,6 +16,7 @@
|
|||||||
#include <assert.h>
|
#include <assert.h>
|
||||||
|
|
||||||
#include "./vpx_config.h"
|
#include "./vpx_config.h"
|
||||||
|
#include "vpx_dsp/vpx_dsp_common.h"
|
||||||
#include "vpx_mem/vpx_mem.h"
|
#include "vpx_mem/vpx_mem.h"
|
||||||
#include "vpx/vpx_integer.h"
|
#include "vpx/vpx_integer.h"
|
||||||
#include "vp9/common/vp9_systemdependent.h"
|
#include "vp9/common/vp9_systemdependent.h"
|
||||||
@ -24,9 +25,6 @@
|
|||||||
extern "C" {
|
extern "C" {
|
||||||
#endif
|
#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.
|
// Only need this for fixed-size arrays, for structs just assign.
|
||||||
#define vp9_copy(dest, src) { \
|
#define vp9_copy(dest, src) { \
|
||||||
assert(sizeof(dest) == sizeof(src)); \
|
assert(sizeof(dest) == sizeof(src)); \
|
||||||
@ -42,18 +40,6 @@ extern "C" {
|
|||||||
#define vp9_zero(dest) memset(&(dest), 0, sizeof(dest))
|
#define vp9_zero(dest) memset(&(dest), 0, sizeof(dest))
|
||||||
#define vp9_zero_array(dest, n) memset(dest, 0, n * 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) {
|
static INLINE int get_unsigned_bits(unsigned int num_values) {
|
||||||
return num_values > 0 ? get_msb(num_values) + 1 : 0;
|
return num_values > 0 ? get_msb(num_values) + 1 : 0;
|
||||||
}
|
}
|
||||||
|
@ -9,8 +9,8 @@
|
|||||||
*/
|
*/
|
||||||
|
|
||||||
#include "./vpx_config.h"
|
#include "./vpx_config.h"
|
||||||
|
#include "vpx_dsp/vpx_dsp_common.h"
|
||||||
#include "vpx_ports/mem.h"
|
#include "vpx_ports/mem.h"
|
||||||
#include "vp9/common/vp9_common.h"
|
|
||||||
|
|
||||||
static INLINE int8_t signed_char_clamp(int t) {
|
static INLINE int8_t signed_char_clamp(int t) {
|
||||||
return (int8_t)clamp(t, -128, 127);
|
return (int8_t)clamp(t, -128, 127);
|
||||||
|
@ -9,6 +9,7 @@
|
|||||||
##
|
##
|
||||||
|
|
||||||
DSP_SRCS-yes += vpx_dsp.mk
|
DSP_SRCS-yes += vpx_dsp.mk
|
||||||
|
DSP_SRCS-yes += vpx_dsp_common.h
|
||||||
|
|
||||||
DSP_SRCS-$(HAVE_MSA) += mips/macros_msa.h
|
DSP_SRCS-$(HAVE_MSA) += mips/macros_msa.h
|
||||||
|
|
||||||
|
43
vpx_dsp/vpx_dsp_common.h
Normal file
43
vpx_dsp/vpx_dsp_common.h
Normal file
@ -0,0 +1,43 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (c) 2015 The WebM project authors. All Rights Reserved.
|
||||||
|
*
|
||||||
|
* Use of this source code is governed by a BSD-style license
|
||||||
|
* that can be found in the LICENSE file in the root of the source
|
||||||
|
* tree. An additional intellectual property rights grant can be found
|
||||||
|
* in the file PATENTS. All contributing project authors may
|
||||||
|
* be found in the AUTHORS file in the root of the source tree.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef VPX_DSP_COMMON_H_
|
||||||
|
#define VPX_DSP_COMMON_H_
|
||||||
|
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
#include "./vpx_config.h"
|
||||||
|
#include "vpx/vpx_integer.h"
|
||||||
|
#include "vpx_ports/mem.h"
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define MIN(x, y) (((x) < (y)) ? (x) : (y))
|
||||||
|
#define MAX(x, y) (((x) > (y)) ? (x) : (y))
|
||||||
|
|
||||||
|
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);
|
||||||
|
}
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
} // extern "C"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#endif // VPX_DSP_COMMON_H_
|
Loading…
Reference in New Issue
Block a user