Pass yuvconstants to YUV conversions for neon 64 bit

source/row_common.cc

 /*
  *  Copyright 2011 The LibYuv Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS. All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 996 matching lines @@
 #define UB -128 /* max(-128, round(-2.018 * 64)) */
 #define UG 25 /* round(0.391 * 64) */
 #define VG 52 /* round(0.813 * 64) */
 #define VR -102 /* round(-1.596 * 64) */
 
 // Bias values to subtract 16 from Y and 128 from U and V.
 #define BB (UB * 128            + YGB)
 #define BG (UG * 128 + VG * 128 + YGB)
 #define BR            (VR * 128 + YGB)
 
-#if defined(__arm__) || defined(__aarch64__)
+#if defined(__aarch64__)
+YuvConstants SIMD_ALIGNED(kYuvConstants) = {
+  { -UB, 0, -UB, 0, -UB, 0, -UB, 0, -VR, 0, -VR, 0, -VR, 0, -VR, 0 },
+  { UG, 0, UG, 0, UG, 0, UG, 0, VG, 0, VG, 0, VG, 0, VG, 0 },
+  { BB, BG, BR, 0, 0, 0, 0, 0 },
+  { 0x0101 * YG, 0, 0, 0 }
+ };
+
+#elif defined(__arm__)
 YuvConstants SIMD_ALIGNED(kYuvConstants) = {
   { -UB, -UB, -UB, -UB, -VR, -VR, -VR, -VR, 0, 0, 0, 0, 0, 0, 0, 0 },
   { UG, UG, UG, UG, VG, VG, VG, VG, 0, 0, 0, 0, 0, 0, 0, 0 },
   { BB, BG, BR, 0, 0, 0, 0, 0 },
   { 0x0101 * YG, 0, 0, 0 }
 };
-
-YuvConstants SIMD_ALIGNED(kYvuConstants) = {
-  { -VR, -VR, -VR, -VR, -UB, -UB, -UB, -UB, 0, 0, 0, 0, 0, 0, 0, 0 },
-  { VG, VG, VG, VG, UG, UG, UG, UG, 0, 0, 0, 0, 0, 0, 0, 0 },
-  { BB, BG, BR, 0, 0, 0, 0, 0 },
-  { 0x0101 * YG, 0, 0, 0 }
-};
-
 #else
 // BT601 constants for YUV to RGB.
 YuvConstants SIMD_ALIGNED(kYuvConstants) = {
   { UB, 0, UB, 0, UB, 0, UB, 0, UB, 0, UB, 0, UB, 0, UB, 0,
     UB, 0, UB, 0, UB, 0, UB, 0, UB, 0, UB, 0, UB, 0, UB, 0 },
   { UG, VG, UG, VG, UG, VG, UG, VG, UG, VG, UG, VG, UG, VG, UG, VG,
     UG, VG, UG, VG, UG, VG, UG, VG, UG, VG, UG, VG, UG, VG, UG, VG },
   { 0, VR, 0, VR, 0, VR, 0, VR, 0, VR, 0, VR, 0, VR, 0, VR,
     0, VR, 0, VR, 0, VR, 0, VR, 0, VR, 0, VR, 0, VR, 0, VR },
   { BB, BB, BB, BB, BB, BB, BB, BB, BB, BB, BB, BB, BB, BB, BB, BB },
@@ skipping 32 matching lines @@
 #undef UB
 #undef UG
 #undef VG
 #undef VR
 #undef YG
 
 // C reference code that mimics the YUV assembly.
 static __inline void YuvPixel(uint8 y, uint8 u, uint8 v,
                               uint8* b, uint8* g, uint8* r,
                               struct YuvConstants* yuvconstants) {
-#if defined(__arm__) || defined(__aarch64__)
-
+#if defined(__aarch64__)
   int UB = -yuvconstants->kUVToRB[0];
-  int VB = 0;
+  int UG = yuvconstants->kUVToG[0];
+  int VG = yuvconstants->kUVToG[8];
+  int VR = -yuvconstants->kUVToRB[8];
+  int BB = yuvconstants->kUVBiasBGR[0];
+  int BG = yuvconstants->kUVBiasBGR[1];
+  int BR = yuvconstants->kUVBiasBGR[2];
+  int YG = yuvconstants->kYToRgb[0];
+#elif defined(__arm__)
+  int UB = -yuvconstants->kUVToRB[0];
   int UG = yuvconstants->kUVToG[0];
   int VG = yuvconstants->kUVToG[4];
-  int UR = 0;
   int VR = -yuvconstants->kUVToRB[4];
   int BB = yuvconstants->kUVBiasBGR[0];
   int BG = yuvconstants->kUVBiasBGR[1];
   int BR = yuvconstants->kUVBiasBGR[2];
   int YG = yuvconstants->kYToRgb[0];
 #else
   int UB = yuvconstants->kUVToB[0];
-  int VB = yuvconstants->kUVToB[1];  // usually 0
   int UG = yuvconstants->kUVToG[0];
   int VG = yuvconstants->kUVToG[1];
-  int UR = yuvconstants->kUVToR[0];  // usually 0
   int VR = yuvconstants->kUVToR[1];
   int BB = yuvconstants->kUVBiasB[0];
   int BG = yuvconstants->kUVBiasG[0];
   int BR = yuvconstants->kUVBiasR[0];
   int YG = yuvconstants->kYToRgb[0];
 #endif
   uint32 y1 = (uint32)(y * 0x0101 * YG) >> 16;
-  *b = Clamp((int32)(-(u * UB + v * VB) + y1 + BB) >> 6);
+  *b = Clamp((int32)(-(u * UB         ) + y1 + BB) >> 6);
   *g = Clamp((int32)(-(u * UG + v * VG) + y1 + BG) >> 6);
-  *r = Clamp((int32)(-(u * UR + v * VR) + y1 + BR) >> 6);
+  *r = Clamp((int32)(-(         v * VR) + y1 + BR) >> 6);
 }
 
 // JPEG YUV to RGB reference
 // *  R = Y                - V * -1.40200
 // *  G = Y - U *  0.34414 - V *  0.71414
 // *  B = Y - U * -1.77200
 
 // Y contribution to R,G,B.  Scale and bias.
 #define YGJ 16320 /* round(1.000 * 64 * 256 * 256 / 257) */
 #define YGBJ 32  /* 64 / 2 */
@@ skipping 1562 matching lines @@
     dst_rgb565 += twidth * 2;
     width -= twidth;
   }
 }
 #endif
 
 #ifdef __cplusplus
 }  // extern "C"
 }  // namespace libyuv
 #endif