summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJingning Han <jingning@google.com>2015-07-27 12:05:33 -0700
committerJingning Han <jingning@google.com>2015-07-27 12:12:31 -0700
commit5f214d6bca4e928a7bc7eac90b575491e34b980c (patch)
tree708f410933372235966d88c80a7881a277ad301e
parenta9a1d4e8e521d2a6d34fb58a233baef525334d1a (diff)
downloadlibvpx-5f214d6bca4e928a7bc7eac90b575491e34b980c.tar
libvpx-5f214d6bca4e928a7bc7eac90b575491e34b980c.tar.gz
libvpx-5f214d6bca4e928a7bc7eac90b575491e34b980c.tar.bz2
libvpx-5f214d6bca4e928a7bc7eac90b575491e34b980c.zip
Use common coefficient definition in neon idct implementations
Replace the duplicate coefficient definition in neon implementations of inverse transform with those from vpx_dsp/txfm_common.h Change-Id: I4cd9bd9569ab1793dfdbb6f16d80bcb581599f0d
-rw-r--r--vp9/common/arm/neon/vp9_idct16x16_add_neon.c17
-rw-r--r--vp9/common/arm/neon/vp9_idct32x32_add_neon.c33
-rw-r--r--vp9/common/arm/neon/vp9_idct8x8_add_neon.c9
3 files changed, 3 insertions, 56 deletions
diff --git a/vp9/common/arm/neon/vp9_idct16x16_add_neon.c b/vp9/common/arm/neon/vp9_idct16x16_add_neon.c
index 5fa3f5c01..545388ae6 100644
--- a/vp9/common/arm/neon/vp9_idct16x16_add_neon.c
+++ b/vp9/common/arm/neon/vp9_idct16x16_add_neon.c
@@ -11,22 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
-
-static int16_t cospi_2_64 = 16305;
-static int16_t cospi_4_64 = 16069;
-static int16_t cospi_6_64 = 15679;
-static int16_t cospi_8_64 = 15137;
-static int16_t cospi_10_64 = 14449;
-static int16_t cospi_12_64 = 13623;
-static int16_t cospi_14_64 = 12665;
-static int16_t cospi_16_64 = 11585;
-static int16_t cospi_18_64 = 10394;
-static int16_t cospi_20_64 = 9102;
-static int16_t cospi_22_64 = 7723;
-static int16_t cospi_24_64 = 6270;
-static int16_t cospi_26_64 = 4756;
-static int16_t cospi_28_64 = 3196;
-static int16_t cospi_30_64 = 1606;
+#include "vpx_dsp/txfm_common.h"
static INLINE void TRANSPOSE8X8(
int16x8_t *q8s16,
diff --git a/vp9/common/arm/neon/vp9_idct32x32_add_neon.c b/vp9/common/arm/neon/vp9_idct32x32_add_neon.c
index 309bdf8d7..3656a7696 100644
--- a/vp9/common/arm/neon/vp9_idct32x32_add_neon.c
+++ b/vp9/common/arm/neon/vp9_idct32x32_add_neon.c
@@ -11,38 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
-
-static int16_t cospi_1_64 = 16364;
-static int16_t cospi_2_64 = 16305;
-static int16_t cospi_3_64 = 16207;
-static int16_t cospi_4_64 = 16069;
-static int16_t cospi_5_64 = 15893;
-static int16_t cospi_6_64 = 15679;
-static int16_t cospi_7_64 = 15426;
-static int16_t cospi_8_64 = 15137;
-static int16_t cospi_9_64 = 14811;
-static int16_t cospi_10_64 = 14449;
-static int16_t cospi_11_64 = 14053;
-static int16_t cospi_12_64 = 13623;
-static int16_t cospi_13_64 = 13160;
-static int16_t cospi_14_64 = 12665;
-static int16_t cospi_15_64 = 12140;
-static int16_t cospi_16_64 = 11585;
-static int16_t cospi_17_64 = 11003;
-static int16_t cospi_18_64 = 10394;
-static int16_t cospi_19_64 = 9760;
-static int16_t cospi_20_64 = 9102;
-static int16_t cospi_21_64 = 8423;
-static int16_t cospi_22_64 = 7723;
-static int16_t cospi_23_64 = 7005;
-static int16_t cospi_24_64 = 6270;
-static int16_t cospi_25_64 = 5520;
-static int16_t cospi_26_64 = 4756;
-static int16_t cospi_27_64 = 3981;
-static int16_t cospi_28_64 = 3196;
-static int16_t cospi_29_64 = 2404;
-static int16_t cospi_30_64 = 1606;
-static int16_t cospi_31_64 = 804;
+#include "vpx_dsp/txfm_common.h"
#define LOAD_FROM_TRANSPOSED(prev, first, second) \
q14s16 = vld1q_s16(trans_buf + first * 8); \
diff --git a/vp9/common/arm/neon/vp9_idct8x8_add_neon.c b/vp9/common/arm/neon/vp9_idct8x8_add_neon.c
index 2b3c1ce60..ea3ce4943 100644
--- a/vp9/common/arm/neon/vp9_idct8x8_add_neon.c
+++ b/vp9/common/arm/neon/vp9_idct8x8_add_neon.c
@@ -11,14 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
-
-static int16_t cospi_4_64 = 16069;
-static int16_t cospi_8_64 = 15137;
-static int16_t cospi_12_64 = 13623;
-static int16_t cospi_16_64 = 11585;
-static int16_t cospi_20_64 = 9102;
-static int16_t cospi_24_64 = 6270;
-static int16_t cospi_28_64 = 3196;
+#include "vpx_dsp/txfm_common.h"
static INLINE void TRANSPOSE8X8(
int16x8_t *q8s16,