Commit 77cd8db1 authored by Dmitry Kovalev's avatar Dmitry Kovalev
Browse files

Moving FILTER_BITS constant from vp9_convolve.h to vp9_filter.h.

Change-Id: Idd7bdb0c364d94c5a0d24c87bb8574292e4c840c
parent bee4abc3
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "vp9/common/vp9_common.h" #include "vp9/common/vp9_common.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vp9/common/vp9_convolve.h" #include "vp9/common/vp9_filter.h"
#include "vp9/common/mips/dspr2/vp9_common_dspr2.h" #include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2 #if HAVE_DSPR2
......
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
#include "vp9/common/vp9_common.h" #include "vp9/common/vp9_common.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vp9/common/vp9_convolve.h" #include "vp9/common/vp9_filter.h"
#include "vp9/common/mips/dspr2/vp9_common_dspr2.h" #include "vp9/common/mips/dspr2/vp9_common_dspr2.h"
#if HAVE_DSPR2 #if HAVE_DSPR2
......
...@@ -13,8 +13,6 @@ ...@@ -13,8 +13,6 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#define FILTER_BITS 7
typedef void (*convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride, typedef void (*convolve_fn_t)(const uint8_t *src, ptrdiff_t src_stride,
uint8_t *dst, ptrdiff_t dst_stride, uint8_t *dst, ptrdiff_t dst_stride,
const int16_t *filter_x, int x_step_q4, const int16_t *filter_x, int x_step_q4,
......
...@@ -14,6 +14,8 @@ ...@@ -14,6 +14,8 @@
#include "./vpx_config.h" #include "./vpx_config.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#define FILTER_BITS 7
#define SUBPEL_BITS 4 #define SUBPEL_BITS 4
#define SUBPEL_MASK ((1 << SUBPEL_BITS) - 1) #define SUBPEL_MASK ((1 << SUBPEL_BITS) - 1)
#define SUBPEL_SHIFTS (1 << SUBPEL_BITS) #define SUBPEL_SHIFTS (1 << SUBPEL_BITS)
......
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#include "vp9/common/vp9_common.h" #include "vp9/common/vp9_common.h"
#include "vp9/common/vp9_convolve.h"
#include "vp9/common/vp9_filter.h" #include "vp9/common/vp9_filter.h"
#include "vp9/encoder/vp9_variance.h" #include "vp9/encoder/vp9_variance.h"
static void variance(const uint8_t *src_ptr, static void variance(const uint8_t *src_ptr,
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment