Getting rid of the od_dering_in type
We no longer need the deringing code to be generic wrt the input depth.
No change in output.
Change-Id: I2db2beb82f1816e611cd2c0438dff217d363de33
diff --git a/av1/common/dering.c b/av1/common/dering.c
index cadb73b..e743616 100644
--- a/av1/common/dering.c
+++ b/av1/common/dering.c
@@ -143,7 +143,7 @@
int r, c;
int sbr, sbc;
int nhsb, nvsb;
- od_dering_in src[OD_DERING_INBUF_SIZE];
+ int16_t src[OD_DERING_INBUF_SIZE];
int16_t *linebuf[3];
int16_t colbuf[3][OD_BSIZE_MAX + 2*OD_FILT_VBORDER][OD_FILT_HBORDER];
dering_list dlist[MAX_MIB_SIZE*MAX_MIB_SIZE];
diff --git a/av1/common/od_dering.c b/av1/common/od_dering.c
index 02c385c..8b9dd7e 100644
--- a/av1/common/od_dering.c
+++ b/av1/common/od_dering.c
@@ -40,7 +40,7 @@
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:
http://jmvalin.ca/notes/intra_paint.pdf */
-int od_dir_find8_c(const od_dering_in *img, int stride, int32_t *var,
+int od_dir_find8_c(const int16_t *img, int stride, int32_t *var,
int coeff_shift) {
int i;
int32_t cost[8] = { 0 };
diff --git a/av1/common/od_dering.h b/av1/common/od_dering.h
index 8d9919e..60cb041 100644
--- a/av1/common/od_dering.h
+++ b/av1/common/od_dering.h
@@ -16,11 +16,6 @@
#include "odintrin.h"
-#if defined(DAALA_ODINTRIN)
-#include "filter.h"
-typedef int16_t od_dering_in;
-#endif
-
#define OD_DERINGSIZES (2)
#define OD_DERING_NBLOCKS (OD_BSIZE_MAX / 8)
diff --git a/av1/common/odintrin.h b/av1/common/odintrin.h
index a5e36cf..f9049c7 100644
--- a/av1/common/odintrin.h
+++ b/av1/common/odintrin.h
@@ -31,8 +31,6 @@
typedef int od_coeff;
-typedef int16_t od_dering_in;
-
#define OD_DIVU_DMAX (1024)
extern uint32_t OD_DIVU_SMALL_CONSTS[OD_DIVU_DMAX][2];
diff --git a/av1/encoder/pickdering.c b/av1/encoder/pickdering.c
index 7399086..558baee 100644
--- a/av1/encoder/pickdering.c
+++ b/av1/encoder/pickdering.c
@@ -41,7 +41,7 @@
int r, c;
int sbr, sbc;
int nhsb, nvsb;
- od_dering_in *src;
+ int16_t *src;
int16_t *ref_coeff;
dering_list dlist[MAX_MIB_SIZE*MAX_MIB_SIZE];
int dir[OD_DERING_NBLOCKS][OD_DERING_NBLOCKS] = { { 0 } };
