Commit 8fe5c5d6 authored by Jean-Marc Valin's avatar Jean-Marc Valin

Rename dering_in to od_dering_in to sync with Daala

No change to code behaviour.

Change-Id: Ia2d7d57fc2018689948d6ba9471a8e848e79aa15
parent 4eb1380d
...@@ -50,7 +50,7 @@ void vp10_dering_frame(YV12_BUFFER_CONFIG *frame, VP10_COMMON *cm, ...@@ -50,7 +50,7 @@ void vp10_dering_frame(YV12_BUFFER_CONFIG *frame, VP10_COMMON *cm,
int r, c; int r, c;
int sbr, sbc; int sbr, sbc;
int nhsb, nvsb; int nhsb, nvsb;
dering_in *src[3]; od_dering_in *src[3];
unsigned char *bskip; unsigned char *bskip;
int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS] = {{0}}; int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS] = {{0}};
int stride; int stride;
......
...@@ -58,7 +58,7 @@ const double OD_DERING_GAIN_TABLE[OD_DERING_LEVELS] = { ...@@ -58,7 +58,7 @@ const double OD_DERING_GAIN_TABLE[OD_DERING_LEVELS] = {
in a particular direction. Since each direction have the same sum(x^2) term, in a particular direction. Since each direction have the same sum(x^2) term,
that term is never computed. See Section 2, step 2, of: that term is never computed. See Section 2, step 2, of:
http://jmvalin.ca/notes/intra_paint.pdf */ http://jmvalin.ca/notes/intra_paint.pdf */
static int od_dir_find8(const dering_in *img, int stride, int32_t *var, static int od_dir_find8(const od_dering_in *img, int stride, int32_t *var,
int coeff_shift) { int coeff_shift) {
int i; int i;
int cost[8] = {0}; int cost[8] = {0};
...@@ -160,7 +160,7 @@ void od_filter_dering_direction_8x8_c(int16_t *y, int ystride, ...@@ -160,7 +160,7 @@ void od_filter_dering_direction_8x8_c(int16_t *y, int ystride,
/* Smooth in the direction orthogonal to what was detected. */ /* Smooth in the direction orthogonal to what was detected. */
void od_filter_dering_orthogonal_c(int16_t *y, int ystride, const int16_t *in, void od_filter_dering_orthogonal_c(int16_t *y, int ystride, const int16_t *in,
const dering_in *x, int xstride, int ln, int threshold, int dir) { const od_dering_in *x, int xstride, int ln, int threshold, int dir) {
int i; int i;
int j; int j;
int offset; int offset;
...@@ -198,12 +198,14 @@ void od_filter_dering_orthogonal_c(int16_t *y, int ystride, const int16_t *in, ...@@ -198,12 +198,14 @@ void od_filter_dering_orthogonal_c(int16_t *y, int ystride, const int16_t *in,
} }
void od_filter_dering_orthogonal_4x4_c(int16_t *y, int ystride, void od_filter_dering_orthogonal_4x4_c(int16_t *y, int ystride,
const int16_t *in, const dering_in *x, int xstride, int threshold, int dir) { const int16_t *in, const od_dering_in *x, int xstride, int threshold,
int dir) {
od_filter_dering_orthogonal_c(y, ystride, in, x, xstride, 2, threshold, dir); od_filter_dering_orthogonal_c(y, ystride, in, x, xstride, 2, threshold, dir);
} }
void od_filter_dering_orthogonal_8x8_c(int16_t *y, int ystride, void od_filter_dering_orthogonal_8x8_c(int16_t *y, int ystride,
const int16_t *in, const dering_in *x, int xstride, int threshold, int dir) { const int16_t *in, const od_dering_in *x, int xstride, int threshold,
int dir) {
od_filter_dering_orthogonal_c(y, ystride, in, x, xstride, 3, threshold, dir); od_filter_dering_orthogonal_c(y, ystride, in, x, xstride, 3, threshold, dir);
} }
...@@ -238,9 +240,9 @@ static void od_compute_thresh(int thresh[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS], ...@@ -238,9 +240,9 @@ static void od_compute_thresh(int thresh[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS],
} }
void od_dering(const od_dering_opt_vtbl *vtbl, int16_t *y, int ystride, void od_dering(const od_dering_opt_vtbl *vtbl, int16_t *y, int ystride,
const dering_in *x, int xstride, int nhb, int nvb, int sbx, int sby, int nhsb, const od_dering_in *x, int xstride, int nhb, int nvb, int sbx, int sby,
int nvsb, int xdec, int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS], int pli, int nhsb, int nvsb, int xdec, int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS],
unsigned char *bskip, int skip_stride, int threshold, int overlap, int pli, unsigned char *bskip, int skip_stride, int threshold, int overlap,
int coeff_shift) { int coeff_shift) {
int i; int i;
int j; int j;
......
...@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/ ...@@ -29,7 +29,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.*/
# if defined(DAALA_ODINTRIN) # if defined(DAALA_ODINTRIN)
# include "filter.h" # include "filter.h"
typedef int16_t dering_in; typedef int16_t od_dering_in;
# endif # endif
#define OD_DERINGSIZES (2) #define OD_DERINGSIZES (2)
...@@ -50,7 +50,8 @@ extern const int OD_DIRECTION_OFFSETS_TABLE[8][3]; ...@@ -50,7 +50,8 @@ extern const int OD_DIRECTION_OFFSETS_TABLE[8][3];
typedef void (*od_filter_dering_direction_func)(int16_t *y, int ystride, typedef void (*od_filter_dering_direction_func)(int16_t *y, int ystride,
const int16_t *in, int threshold, int dir); const int16_t *in, int threshold, int dir);
typedef void (*od_filter_dering_orthogonal_func)(int16_t *y, int ystride, typedef void (*od_filter_dering_orthogonal_func)(int16_t *y, int ystride,
const int16_t *in, const dering_in *x, int xstride, int threshold, int dir); const int16_t *in, const od_dering_in *x, int xstride, int threshold,
int dir);
struct od_dering_opt_vtbl { struct od_dering_opt_vtbl {
od_filter_dering_direction_func filter_dering_direction[OD_DERINGSIZES]; od_filter_dering_direction_func filter_dering_direction[OD_DERINGSIZES];
...@@ -60,14 +61,14 @@ typedef struct od_dering_opt_vtbl od_dering_opt_vtbl; ...@@ -60,14 +61,14 @@ typedef struct od_dering_opt_vtbl od_dering_opt_vtbl;
void od_dering(const od_dering_opt_vtbl *vtbl, int16_t *y, int ystride, void od_dering(const od_dering_opt_vtbl *vtbl, int16_t *y, int ystride,
const dering_in *x, int xstride, int nvb, int nhb, int sbx, int sby, int nhsb, const od_dering_in *x, int xstride, int nvb, int nhb, int sbx, int sby,
int nvsb, int xdec, int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS], int pli, int nhsb, int nvsb, int xdec, int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS],
unsigned char *bskip, int skip_stride, int threshold, int overlap, int pli, unsigned char *bskip, int skip_stride, int threshold, int overlap,
int coeff_shift); int coeff_shift);
void od_filter_dering_direction_c(int16_t *y, int ystride, const int16_t *in, void od_filter_dering_direction_c(int16_t *y, int ystride, const int16_t *in,
int ln, int threshold, int dir); int ln, int threshold, int dir);
void od_filter_dering_orthogonal_c(int16_t *y, int ystride, const int16_t *in, void od_filter_dering_orthogonal_c(int16_t *y, int ystride, const int16_t *in,
const dering_in *x, int xstride, int ln, int threshold, int dir); const od_dering_in *x, int xstride, int ln, int threshold, int dir);
extern const od_dering_opt_vtbl OD_DERING_VTBL_C; extern const od_dering_opt_vtbl OD_DERING_VTBL_C;
...@@ -76,8 +77,10 @@ void od_filter_dering_direction_4x4_c(int16_t *y, int ystride, ...@@ -76,8 +77,10 @@ void od_filter_dering_direction_4x4_c(int16_t *y, int ystride,
void od_filter_dering_direction_8x8_c(int16_t *y, int ystride, void od_filter_dering_direction_8x8_c(int16_t *y, int ystride,
const int16_t *in, int threshold, int dir); const int16_t *in, int threshold, int dir);
void od_filter_dering_orthogonal_4x4_c(int16_t *y, int ystride, void od_filter_dering_orthogonal_4x4_c(int16_t *y, int ystride,
const int16_t *in, const dering_in *x, int xstride, int threshold, int dir); const int16_t *in, const od_dering_in *x, int xstride, int threshold,
int dir);
void od_filter_dering_orthogonal_8x8_c(int16_t *y, int ystride, void od_filter_dering_orthogonal_8x8_c(int16_t *y, int ystride,
const int16_t *in, const dering_in *x, int xstride, int threshold, int dir); const int16_t *in, const od_dering_in *x, int xstride, int threshold,
int dir);
#endif #endif
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
typedef int od_coeff; typedef int od_coeff;
typedef int16_t dering_in; typedef int16_t od_dering_in;
#define OD_DIVU_SMALL(_x, _d) ((_x) / (_d)) #define OD_DIVU_SMALL(_x, _d) ((_x) / (_d))
......
...@@ -38,7 +38,7 @@ int vp10_dering_search(YV12_BUFFER_CONFIG *frame, const YV12_BUFFER_CONFIG *ref, ...@@ -38,7 +38,7 @@ int vp10_dering_search(YV12_BUFFER_CONFIG *frame, const YV12_BUFFER_CONFIG *ref,
int r, c; int r, c;
int sbr, sbc; int sbr, sbc;
int nhsb, nvsb; int nhsb, nvsb;
dering_in *src; od_dering_in *src;
int16_t *ref_coeff; int16_t *ref_coeff;
unsigned char *bskip; unsigned char *bskip;
int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS] = {{0}}; int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS] = {{0}};
......
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