From b0e09e346fd7b0befec5cd77b7ca3ae518447f1b Mon Sep 17 00:00:00 2001

From: Cheng Yi <cyi@google.com>

Date: Fri, 6 Dec 2019 01:08:21 +0000

Subject: [PATCH] dec_neon: Fix build failure under some toolchains

some toolchains may implement vcreate_u64 as an assignment to a vector

causing a type mismatch:

invalid conversion between vector type 'uint64x1_t' (vector of 1

'uint64_t' value) and integer type 'unsigned int' of different size

const uint64x1_t LKJI____ = vcreate_u64(L | (K << 8) | (J << 16) | (I << 24));

^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

Change-Id: I5c7b0076ad66d4b3fcdcb7ee9f59bbaa6f19b783

---

src/dsp/dec_neon.c | 3 ++-

1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/dsp/dec_neon.c b/src/dsp/dec_neon.c

index ffa697f..7d132af 100644

--- a/src/dsp/dec_neon.c

+++ b/src/dsp/dec_neon.c

@@ -1361,7 +1361,8 @@ static void RD4_NEON(uint8_t* dst) { // Down-right

const uint32_t J = dst[-1 + 1 * BPS];

const uint32_t K = dst[-1 + 2 * BPS];

const uint32_t L = dst[-1 + 3 * BPS];

- const uint64x1_t LKJI____ = vcreate_u64(L | (K << 8) | (J << 16) | (I << 24));

+ const uint64x1_t LKJI____ =

+ vcreate_u64((uint64_t)L | (K << 8) | (J << 16) | (I << 24));

const uint64x1_t LKJIXABC = vorr_u64(LKJI____, ____XABC);

const uint8x8_t KJIXABC_ = vreinterpret_u8_u64(vshr_n_u64(LKJIXABC, 8));

const uint8x8_t JIXABC__ = vreinterpret_u8_u64(vshr_n_u64(LKJIXABC, 16));

--

1.7.1