From: James Zern <jzern@google.com>
Date: Sat, 19 Nov 2016 04:25:17 +0000 (-0800)
Subject: idct_neon: rename load_tran_low_to_s16 -> ...s16q
X-Git-Tag: v1.6.1~63^2~1
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=568d4b1d63b83e5b4137c7ae182d05e9cfe9c771;p=libvpx

idct_neon: rename load_tran_low_to_s16 -> ...s16q

BUG=webm:1294

Change-Id: I164cfcbe9bc4511d1d04af9206cf351a0ec2957b
---

diff --git a/vpx_dsp/arm/idct32x32_34_add_neon.c b/vpx_dsp/arm/idct32x32_34_add_neon.c
index a584b1d9e..7b3560a13 100644
--- a/vpx_dsp/arm/idct32x32_34_add_neon.c
+++ b/vpx_dsp/arm/idct32x32_34_add_neon.c
@@ -46,21 +46,21 @@ static void idct32_6_neon(const tran_low_t *input, int16_t *output) {
       s2_31;
   int16x8_t s3_24, s3_25, s3_26, s3_27;
 
-  in0 = load_tran_low_to_s16(input);
+  in0 = load_tran_low_to_s16q(input);
   input += 32;
-  in1 = load_tran_low_to_s16(input);
+  in1 = load_tran_low_to_s16q(input);
   input += 32;
-  in2 = load_tran_low_to_s16(input);
+  in2 = load_tran_low_to_s16q(input);
   input += 32;
-  in3 = load_tran_low_to_s16(input);
+  in3 = load_tran_low_to_s16q(input);
   input += 32;
-  in4 = load_tran_low_to_s16(input);
+  in4 = load_tran_low_to_s16q(input);
   input += 32;
-  in5 = load_tran_low_to_s16(input);
+  in5 = load_tran_low_to_s16q(input);
   input += 32;
-  in6 = load_tran_low_to_s16(input);
+  in6 = load_tran_low_to_s16q(input);
   input += 32;
-  in7 = load_tran_low_to_s16(input);
+  in7 = load_tran_low_to_s16q(input);
   transpose_s16_8x8(&in0, &in1, &in2, &in3, &in4, &in5, &in6, &in7);
 
   // stage 1
diff --git a/vpx_dsp/arm/idct4x4_add_neon.c b/vpx_dsp/arm/idct4x4_add_neon.c
index dd75dc08e..6ac516140 100644
--- a/vpx_dsp/arm/idct4x4_add_neon.c
+++ b/vpx_dsp/arm/idct4x4_add_neon.c
@@ -62,8 +62,8 @@ void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest,
   assert(!(dest_stride % sizeof(uint32_t)));
 
   // Rows
-  a0 = load_tran_low_to_s16(input);
-  a1 = load_tran_low_to_s16(input + 8);
+  a0 = load_tran_low_to_s16q(input);
+  a1 = load_tran_low_to_s16q(input + 8);
   idct4x4_16_kernel(cospis, &a0, &a1);
 
   // Columns
diff --git a/vpx_dsp/arm/idct8x8_add_neon.c b/vpx_dsp/arm/idct8x8_add_neon.c
index 159a6ec98..5505cc84e 100644
--- a/vpx_dsp/arm/idct8x8_add_neon.c
+++ b/vpx_dsp/arm/idct8x8_add_neon.c
@@ -174,14 +174,14 @@ void vpx_idct8x8_64_add_neon(const tran_low_t *input, uint8_t *dest,
   int16x8_t q8s16, q9s16, q10s16, q11s16, q12s16, q13s16, q14s16, q15s16;
   uint16x8_t q8u16, q9u16, q10u16, q11u16;
 
-  q8s16 = load_tran_low_to_s16(input);
-  q9s16 = load_tran_low_to_s16(input + 8);
-  q10s16 = load_tran_low_to_s16(input + 16);
-  q11s16 = load_tran_low_to_s16(input + 24);
-  q12s16 = load_tran_low_to_s16(input + 32);
-  q13s16 = load_tran_low_to_s16(input + 40);
-  q14s16 = load_tran_low_to_s16(input + 48);
-  q15s16 = load_tran_low_to_s16(input + 56);
+  q8s16 = load_tran_low_to_s16q(input);
+  q9s16 = load_tran_low_to_s16q(input + 8);
+  q10s16 = load_tran_low_to_s16q(input + 16);
+  q11s16 = load_tran_low_to_s16q(input + 24);
+  q12s16 = load_tran_low_to_s16q(input + 32);
+  q13s16 = load_tran_low_to_s16q(input + 40);
+  q14s16 = load_tran_low_to_s16q(input + 48);
+  q15s16 = load_tran_low_to_s16q(input + 56);
 
   transpose_s16_8x8(&q8s16, &q9s16, &q10s16, &q11s16, &q12s16, &q13s16, &q14s16,
                     &q15s16);
@@ -280,14 +280,14 @@ void vpx_idct8x8_12_add_neon(const tran_low_t *input, uint8_t *dest,
   uint16x8_t q8u16, q9u16, q10u16, q11u16;
   int32x4_t q9s32, q10s32, q11s32, q12s32;
 
-  q8s16 = load_tran_low_to_s16(input);
-  q9s16 = load_tran_low_to_s16(input + 8);
-  q10s16 = load_tran_low_to_s16(input + 16);
-  q11s16 = load_tran_low_to_s16(input + 24);
-  q12s16 = load_tran_low_to_s16(input + 32);
-  q13s16 = load_tran_low_to_s16(input + 40);
-  q14s16 = load_tran_low_to_s16(input + 48);
-  q15s16 = load_tran_low_to_s16(input + 56);
+  q8s16 = load_tran_low_to_s16q(input);
+  q9s16 = load_tran_low_to_s16q(input + 8);
+  q10s16 = load_tran_low_to_s16q(input + 16);
+  q11s16 = load_tran_low_to_s16q(input + 24);
+  q12s16 = load_tran_low_to_s16q(input + 32);
+  q13s16 = load_tran_low_to_s16q(input + 40);
+  q14s16 = load_tran_low_to_s16q(input + 48);
+  q15s16 = load_tran_low_to_s16q(input + 56);
 
   transpose_s16_8x8(&q8s16, &q9s16, &q10s16, &q11s16, &q12s16, &q13s16, &q14s16,
                     &q15s16);
diff --git a/vpx_dsp/arm/idct_neon.h b/vpx_dsp/arm/idct_neon.h
index 5c2a53c03..a1f766e6d 100644
--- a/vpx_dsp/arm/idct_neon.h
+++ b/vpx_dsp/arm/idct_neon.h
@@ -20,7 +20,7 @@
 //------------------------------------------------------------------------------
 
 // Helper function used to load tran_low_t into int16, narrowing if necessary.
-static INLINE int16x8_t load_tran_low_to_s16(const tran_low_t *buf) {
+static INLINE int16x8_t load_tran_low_to_s16q(const tran_low_t *buf) {
 #if CONFIG_VP9_HIGHBITDEPTH
   const int32x4_t v0 = vld1q_s32(buf);
   const int32x4_t v1 = vld1q_s32(buf + 4);