summaryrefslogtreecommitdiff
path: root/vpx_dsp/arm
diff options
context:
space:
mode:
authorJames Zern <jzern@google.com>2016-09-30 19:36:08 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2016-09-30 19:36:08 +0000
commitb6277a47c7b5edac25156206043d4c16ce81e941 (patch)
tree1ae348f08238444edb2f35b756f0a923fddc29fc /vpx_dsp/arm
parent8c744fd9783ae7bcfb2d0ef1dfa95fda4c19f38b (diff)
parent1396d1210337775127d284b208b8929fb04f13e7 (diff)
downloadlibvpx-b6277a47c7b5edac25156206043d4c16ce81e941.tar
libvpx-b6277a47c7b5edac25156206043d4c16ce81e941.tar.gz
libvpx-b6277a47c7b5edac25156206043d4c16ce81e941.tar.bz2
libvpx-b6277a47c7b5edac25156206043d4c16ce81e941.zip
Merge changes from topic '8bit-hbd-idct'
* changes: *idct*_neon.c: add missing rtcd include idct,msa/neon: exclude idct files from hbd build *rtcd_defs.pl: remove empty specialize calls
Diffstat (limited to 'vpx_dsp/arm')
-rw-r--r--vpx_dsp/arm/idct16x16_1_add_neon.c4
-rw-r--r--vpx_dsp/arm/idct16x16_neon.c1
-rw-r--r--vpx_dsp/arm/idct32x32_1_add_neon.c5
-rw-r--r--vpx_dsp/arm/idct32x32_add_neon.c8
-rw-r--r--vpx_dsp/arm/idct4x4_1_add_neon.c4
-rw-r--r--vpx_dsp/arm/idct4x4_add_neon.c5
-rw-r--r--vpx_dsp/arm/idct8x8_1_add_neon.c4
-rw-r--r--vpx_dsp/arm/idct8x8_add_neon.c7
8 files changed, 27 insertions, 11 deletions
diff --git a/vpx_dsp/arm/idct16x16_1_add_neon.c b/vpx_dsp/arm/idct16x16_1_add_neon.c
index 466b40889..a9e08f911 100644
--- a/vpx_dsp/arm/idct16x16_1_add_neon.c
+++ b/vpx_dsp/arm/idct16x16_1_add_neon.c
@@ -10,10 +10,12 @@
#include <arm_neon.h>
+#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h"
-void vpx_idct16x16_1_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
+void vpx_idct16x16_1_add_neon(const tran_low_t *input, uint8_t *dest,
+ int dest_stride) {
uint8x8_t d2u8, d3u8, d30u8, d31u8;
uint64x1_t d2u64, d3u64, d4u64, d5u64;
uint16x8_t q0u16, q9u16, q10u16, q11u16, q12u16;
diff --git a/vpx_dsp/arm/idct16x16_neon.c b/vpx_dsp/arm/idct16x16_neon.c
index ecc263df2..2b30cd789 100644
--- a/vpx_dsp/arm/idct16x16_neon.c
+++ b/vpx_dsp/arm/idct16x16_neon.c
@@ -8,6 +8,7 @@
* be found in the AUTHORS file in the root of the source tree.
*/
+#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/vpx_dsp_common.h"
void vpx_idct16x16_256_add_neon_pass1(const int16_t *input, int16_t *output,
diff --git a/vpx_dsp/arm/idct32x32_1_add_neon.c b/vpx_dsp/arm/idct32x32_1_add_neon.c
index dab7d098e..28ea5ffd6 100644
--- a/vpx_dsp/arm/idct32x32_1_add_neon.c
+++ b/vpx_dsp/arm/idct32x32_1_add_neon.c
@@ -11,7 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
-
+#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h"
@@ -93,7 +93,8 @@ static INLINE void ST_16x8(uint8_t *d, int d_stride, uint8x16_t *q8u8,
return;
}
-void vpx_idct32x32_1_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
+void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest,
+ int dest_stride) {
uint8x16_t q0u8, q8u8, q9u8, q10u8, q11u8, q12u8, q13u8, q14u8, q15u8;
int i, j, dest_stride8;
uint8_t *d;
diff --git a/vpx_dsp/arm/idct32x32_add_neon.c b/vpx_dsp/arm/idct32x32_add_neon.c
index c4d1e8473..c4580e016 100644
--- a/vpx_dsp/arm/idct32x32_add_neon.c
+++ b/vpx_dsp/arm/idct32x32_add_neon.c
@@ -11,6 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
+#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/arm/transpose_neon.h"
#include "vpx_dsp/txfm_common.h"
@@ -152,8 +153,8 @@ static INLINE void DO_BUTTERFLY(int16x8_t q14s16, int16x8_t q13s16,
return;
}
-static INLINE void idct32_transpose_pair(int16_t *input, int16_t *t_buf) {
- int16_t *in;
+static INLINE void idct32_transpose_pair(const int16_t *input, int16_t *t_buf) {
+ const int16_t *in;
int i;
const int stride = 32;
int16x8_t q8s16, q9s16, q10s16, q11s16, q12s16, q13s16, q14s16, q15s16;
@@ -382,7 +383,8 @@ static INLINE void idct32_bands_end_2nd_pass(
return;
}
-void vpx_idct32x32_1024_add_neon(int16_t *input, uint8_t *dest, int stride) {
+void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest,
+ int stride) {
int i, idct32_pass_loop;
int16_t trans_buf[32 * 8];
int16_t pass1[32 * 32];
diff --git a/vpx_dsp/arm/idct4x4_1_add_neon.c b/vpx_dsp/arm/idct4x4_1_add_neon.c
index 9f999e979..97c1dc258 100644
--- a/vpx_dsp/arm/idct4x4_1_add_neon.c
+++ b/vpx_dsp/arm/idct4x4_1_add_neon.c
@@ -10,10 +10,12 @@
#include <arm_neon.h>
+#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h"
-void vpx_idct4x4_1_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
+void vpx_idct4x4_1_add_neon(const tran_low_t *input, uint8_t *dest,
+ int dest_stride) {
uint8x8_t d6u8;
uint32x2_t d2u32 = vdup_n_u32(0);
uint16x8_t q8u16;
diff --git a/vpx_dsp/arm/idct4x4_add_neon.c b/vpx_dsp/arm/idct4x4_add_neon.c
index 382626928..5afd8ec61 100644
--- a/vpx_dsp/arm/idct4x4_add_neon.c
+++ b/vpx_dsp/arm/idct4x4_add_neon.c
@@ -10,7 +10,10 @@
#include <arm_neon.h>
-void vpx_idct4x4_16_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
+#include "./vpx_dsp_rtcd.h"
+
+void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest,
+ int dest_stride) {
uint8x8_t d26u8, d27u8;
uint32x2_t d26u32, d27u32;
uint16x8_t q8u16, q9u16;
diff --git a/vpx_dsp/arm/idct8x8_1_add_neon.c b/vpx_dsp/arm/idct8x8_1_add_neon.c
index e3db0b876..31f87b945 100644
--- a/vpx_dsp/arm/idct8x8_1_add_neon.c
+++ b/vpx_dsp/arm/idct8x8_1_add_neon.c
@@ -10,10 +10,12 @@
#include <arm_neon.h>
+#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/inv_txfm.h"
#include "vpx_ports/mem.h"
-void vpx_idct8x8_1_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
+void vpx_idct8x8_1_add_neon(const tran_low_t *input, uint8_t *dest,
+ int dest_stride) {
uint8x8_t d2u8, d3u8, d30u8, d31u8;
uint64x1_t d2u64, d3u64, d4u64, d5u64;
uint16x8_t q0u16, q9u16, q10u16, q11u16, q12u16;
diff --git a/vpx_dsp/arm/idct8x8_add_neon.c b/vpx_dsp/arm/idct8x8_add_neon.c
index 82b318256..c623ed4a5 100644
--- a/vpx_dsp/arm/idct8x8_add_neon.c
+++ b/vpx_dsp/arm/idct8x8_add_neon.c
@@ -11,6 +11,7 @@
#include <arm_neon.h>
#include "./vpx_config.h"
+#include "./vpx_dsp_rtcd.h"
#include "vpx_dsp/arm/transpose_neon.h"
#include "vpx_dsp/txfm_common.h"
@@ -165,7 +166,8 @@ static INLINE void IDCT8x8_1D(int16x8_t *q8s16, int16x8_t *q9s16,
return;
}
-void vpx_idct8x8_64_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
+void vpx_idct8x8_64_add_neon(const tran_low_t *input, uint8_t *dest,
+ int dest_stride) {
uint8_t *d1, *d2;
uint8x8_t d0u8, d1u8, d2u8, d3u8;
uint64x1_t d0u64, d1u64, d2u64, d3u64;
@@ -267,7 +269,8 @@ void vpx_idct8x8_64_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
return;
}
-void vpx_idct8x8_12_add_neon(int16_t *input, uint8_t *dest, int dest_stride) {
+void vpx_idct8x8_12_add_neon(const tran_low_t *input, uint8_t *dest,
+ int dest_stride) {
uint8_t *d1, *d2;
uint8x8_t d0u8, d1u8, d2u8, d3u8;
int16x4_t d10s16, d11s16, d12s16, d13s16, d16s16;