Index: source/row_neon64.cc |
diff --git a/source/row_neon64.cc b/source/row_neon64.cc |
index 668baef7763ad9f60e824a9abaecf59939595fac..ae7b32cbf81524ebed96b5173ddad539ad12c8d3 100644 |
--- a/source/row_neon64.cc |
+++ b/source/row_neon64.cc |
@@ -91,7 +91,8 @@ extern "C" { |
"uzp2 v3.8b, v2.8b, v2.8b \n" \ |
"ins v1.s[1], v3.s[0] \n" |
-#define YUV422TORGB_SETUP_REG \ |
+// TODO(fbarchard): replace movi with constants from struct. |
+#define YUVTORGB_SETUP \ |
"ld1r {v24.8h}, [%[kUVBiasBGR]], #2 \n" \ |
"ld1r {v25.8h}, [%[kUVBiasBGR]], #2 \n" \ |
"ld1r {v26.8h}, [%[kUVBiasBGR]] \n" \ |
@@ -101,7 +102,7 @@ extern "C" { |
"movi v29.8h, #25 \n" \ |
"movi v30.8h, #52 \n" |
-#define YUV422TORGB(vR, vG, vB) \ |
+#define YUVTORGB(vR, vG, vB) \ |
"uxtl v0.8h, v0.8b \n" /* Extract Y */ \ |
"shll v2.8h, v1.8b, #8 \n" /* Replicate UV */ \ |
"ushll2 v3.4s, v0.8h, #0 \n" /* Y */ \ |
@@ -143,12 +144,13 @@ void I444ToARGBRow_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_argb, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV444 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w4, %w4, #8 \n" |
"movi v23.8b, #255 \n" /* A */ |
MEMACCESS(3) |
@@ -159,8 +161,8 @@ void I444ToARGBRow_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_argb), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&yuvconstants->kUVBiasBGR), |
+ [kYToRgb]"r"(&yuvconstants->kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -173,12 +175,13 @@ void I422ToARGBRow_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_argb, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV422 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w4, %w4, #8 \n" |
"movi v23.8b, #255 \n" /* A */ |
MEMACCESS(3) |
@@ -189,8 +192,8 @@ void I422ToARGBRow_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_argb), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -202,12 +205,13 @@ void I411ToARGBRow_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_argb, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV411 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w4, %w4, #8 \n" |
"movi v23.8b, #255 \n" /* A */ |
MEMACCESS(3) |
@@ -218,8 +222,8 @@ void I411ToARGBRow_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_argb), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -231,12 +235,13 @@ void I422ToBGRARow_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_bgra, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV422 |
- YUV422TORGB(v21, v22, v23) |
+ YUVTORGB(v21, v22, v23) |
"subs %w4, %w4, #8 \n" |
"movi v20.8b, #255 \n" /* A */ |
MEMACCESS(3) |
@@ -247,8 +252,8 @@ void I422ToBGRARow_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_bgra), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -261,12 +266,13 @@ void I422ToABGRRow_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_abgr, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV422 |
- YUV422TORGB(v20, v21, v22) |
+ YUVTORGB(v20, v21, v22) |
"subs %w4, %w4, #8 \n" |
"movi v23.8b, #255 \n" /* A */ |
MEMACCESS(3) |
@@ -277,8 +283,8 @@ void I422ToABGRRow_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_abgr), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -290,12 +296,13 @@ void I422ToRGBARow_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_rgba, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV422 |
- YUV422TORGB(v23, v22, v21) |
+ YUVTORGB(v23, v22, v21) |
"subs %w4, %w4, #8 \n" |
"movi v20.8b, #255 \n" /* A */ |
MEMACCESS(3) |
@@ -306,8 +313,8 @@ void I422ToRGBARow_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_rgba), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -319,12 +326,13 @@ void I422ToRGB24Row_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_rgb24, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV422 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w4, %w4, #8 \n" |
MEMACCESS(3) |
"st3 {v20.8b,v21.8b,v22.8b}, [%3], #24 \n" |
@@ -334,8 +342,8 @@ void I422ToRGB24Row_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_rgb24), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -347,12 +355,13 @@ void I422ToRAWRow_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_raw, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV422 |
- YUV422TORGB(v20, v21, v22) |
+ YUVTORGB(v20, v21, v22) |
"subs %w4, %w4, #8 \n" |
MEMACCESS(3) |
"st3 {v20.8b,v21.8b,v22.8b}, [%3], #24 \n" |
@@ -362,8 +371,8 @@ void I422ToRAWRow_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_raw), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -382,12 +391,13 @@ void I422ToRGB565Row_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_rgb565, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV422 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w4, %w4, #8 \n" |
ARGBTORGB565 |
MEMACCESS(3) |
@@ -398,8 +408,8 @@ void I422ToRGB565Row_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_rgb565), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -420,12 +430,13 @@ void I422ToARGB1555Row_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_argb1555, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV422 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w4, %w4, #8 \n" |
"movi v23.8b, #255 \n" |
ARGBTOARGB1555 |
@@ -437,8 +448,8 @@ void I422ToARGB1555Row_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_argb1555), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -460,13 +471,14 @@ void I422ToARGB4444Row_NEON(const uint8* src_y, |
const uint8* src_u, |
const uint8* src_v, |
uint8* dst_argb4444, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"movi v4.16b, #0x0f \n" // bits to clear with vbic. |
"1: \n" |
READYUV422 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w4, %w4, #8 \n" |
"movi v23.8b, #255 \n" |
ARGBTOARGB4444 |
@@ -478,8 +490,8 @@ void I422ToARGB4444Row_NEON(const uint8* src_y, |
"+r"(src_v), // %2 |
"+r"(dst_argb4444), // %3 |
"+r"(width) // %4 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -492,10 +504,10 @@ void I400ToARGBRow_NEON(const uint8* src_y, |
int width) { |
int64 width64 = (int64)(width); |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUV400 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w2, %w2, #8 \n" |
"movi v23.8b, #255 \n" |
MEMACCESS(1) |
@@ -504,8 +516,8 @@ void I400ToARGBRow_NEON(const uint8* src_y, |
: "+r"(src_y), // %0 |
"+r"(dst_argb), // %1 |
"+r"(width64) // %2 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -540,12 +552,13 @@ void J400ToARGBRow_NEON(const uint8* src_y, |
void NV12ToARGBRow_NEON(const uint8* src_y, |
const uint8* src_uv, |
uint8* dst_argb, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READNV12 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w3, %w3, #8 \n" |
"movi v23.8b, #255 \n" |
MEMACCESS(2) |
@@ -555,51 +568,25 @@ void NV12ToARGBRow_NEON(const uint8* src_y, |
"+r"(src_uv), // %1 |
"+r"(dst_argb), // %2 |
"+r"(width) // %3 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
} |
#endif // HAS_NV12TOARGBROW_NEON |
-#ifdef HAS_NV21TOARGBROW_NEON |
-void NV21ToARGBRow_NEON(const uint8* src_y, |
- const uint8* src_uv, |
- uint8* dst_argb, |
- int width) { |
- asm volatile ( |
- YUV422TORGB_SETUP_REG |
- "1: \n" |
- READNV21 |
- YUV422TORGB(v22, v21, v20) |
- "subs %w3, %w3, #8 \n" |
- "movi v23.8b, #255 \n" |
- MEMACCESS(2) |
- "st4 {v20.8b,v21.8b,v22.8b,v23.8b}, [%2], #32 \n" |
- "b.gt 1b \n" |
- : "+r"(src_y), // %0 |
- "+r"(src_uv), // %1 |
- "+r"(dst_argb), // %2 |
- "+r"(width) // %3 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
- : "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
- "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
- ); |
-} |
-#endif // HAS_NV21TOARGBROW_NEON |
- |
#ifdef HAS_NV12TORGB565ROW_NEON |
void NV12ToRGB565Row_NEON(const uint8* src_y, |
const uint8* src_uv, |
uint8* dst_rgb565, |
+ struct YuvConstants* yuvconstants, |
int width) { |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READNV12 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w3, %w3, #8 \n" |
ARGBTORGB565 |
MEMACCESS(2) |
@@ -609,51 +596,25 @@ void NV12ToRGB565Row_NEON(const uint8* src_y, |
"+r"(src_uv), // %1 |
"+r"(dst_rgb565), // %2 |
"+r"(width) // %3 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
} |
#endif // HAS_NV12TORGB565ROW_NEON |
-#ifdef HAS_NV21TORGB565ROW_NEON |
-void NV21ToRGB565Row_NEON(const uint8* src_y, |
- const uint8* src_uv, |
- uint8* dst_rgb565, |
- int width) { |
- asm volatile ( |
- YUV422TORGB_SETUP_REG |
- "1: \n" |
- READNV21 |
- YUV422TORGB(v22, v21, v20) |
- "subs %w3, %w3, #8 \n" |
- ARGBTORGB565 |
- MEMACCESS(2) |
- "st1 {v0.8h}, [%2], 16 \n" // store 8 pixels RGB565. |
- "b.gt 1b \n" |
- : "+r"(src_y), // %0 |
- "+r"(src_uv), // %1 |
- "+r"(dst_rgb565), // %2 |
- "+r"(width) // %3 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
- : "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
- "v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
- ); |
-} |
-#endif // HAS_NV21TORGB565ROW_NEON |
- |
#ifdef HAS_YUY2TOARGBROW_NEON |
void YUY2ToARGBRow_NEON(const uint8* src_yuy2, |
uint8* dst_argb, |
+ struct YuvConstants* yuvconstants, |
int width) { |
int64 width64 = (int64)(width); |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READYUY2 |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w2, %w2, #8 \n" |
"movi v23.8b, #255 \n" |
MEMACCESS(1) |
@@ -662,8 +623,8 @@ void YUY2ToARGBRow_NEON(const uint8* src_yuy2, |
: "+r"(src_yuy2), // %0 |
"+r"(dst_argb), // %1 |
"+r"(width64) // %2 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |
@@ -673,13 +634,14 @@ void YUY2ToARGBRow_NEON(const uint8* src_yuy2, |
#ifdef HAS_UYVYTOARGBROW_NEON |
void UYVYToARGBRow_NEON(const uint8* src_uyvy, |
uint8* dst_argb, |
+ struct YuvConstants* yuvconstants, |
int width) { |
int64 width64 = (int64)(width); |
asm volatile ( |
- YUV422TORGB_SETUP_REG |
+ YUVTORGB_SETUP |
"1: \n" |
READUYVY |
- YUV422TORGB(v22, v21, v20) |
+ YUVTORGB(v22, v21, v20) |
"subs %w2, %w2, #8 \n" |
"movi v23.8b, #255 \n" |
MEMACCESS(1) |
@@ -688,8 +650,8 @@ void UYVYToARGBRow_NEON(const uint8* src_uyvy, |
: "+r"(src_uyvy), // %0 |
"+r"(dst_argb), // %1 |
"+r"(width64) // %2 |
- : [kUVBiasBGR]"r"(&kYuvConstantsNEON.kUVBiasBGR), |
- [kYToRgb]"r"(&kYuvConstantsNEON.kYToRgb) |
+ : [kUVBiasBGR]"r"(&kYuvConstants.kUVBiasBGR), |
+ [kYToRgb]"r"(&kYuvConstants.kYToRgb) |
: "cc", "memory", "v0", "v1", "v2", "v3", "v4", "v5", "v6", "v7", "v20", |
"v21", "v22", "v23", "v24", "v25", "v26", "v27", "v28", "v29", "v30" |
); |