rename yuv matrix constants to be more clear about what they are

source/convert_argb.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 107 matching lines @@
 LIBYUV_API
 int I420ToARGB(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
   return I420ToARGBMatrix(src_y, src_stride_y,
                           src_u, src_stride_u,
                           src_v, src_stride_v,
                           dst_argb, dst_stride_argb,
-                          &kYuvIConstants,
+                          &kYuvI601Constants,
                           width, height);
 }
 
 // Convert I420 to ABGR.
 LIBYUV_API
 int I420ToABGR(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_abgr, int dst_stride_abgr,
                int width, int height) {
   return I420ToARGBMatrix(src_y, src_stride_y,
                           src_v, src_stride_v,  // Swap U and V
                           src_u, src_stride_u,
                           dst_abgr, dst_stride_abgr,
-                          &kYvuIConstants,  // Use Yvu matrix
+                          &kYvuI601Constants,  // Use Yvu matrix
                           width, height);
 }
 
 // Convert J420 to ARGB.
 LIBYUV_API
 int J420ToARGB(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
   return I420ToARGBMatrix(src_y, src_stride_y,
                           src_u, src_stride_u,
                           src_v, src_stride_v,
                           dst_argb, dst_stride_argb,
-                          &kYuvJConstants,
+                          &kYuvJPEGConstants,
                           width, height);
 }
 
 // Convert J420 to ABGR.
 LIBYUV_API
 int J420ToABGR(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_abgr, int dst_stride_abgr,
                int width, int height) {
   return I420ToARGBMatrix(src_y, src_stride_y,
                           src_v, src_stride_v,  // Swap U and V
                           src_u, src_stride_u,
                           dst_abgr, dst_stride_abgr,
-                          &kYvuJConstants,  // Use Yvu matrix
+                          &kYvuJPEGConstants,  // Use Yvu matrix
                           width, height);
 }
 
 // Convert H420 to ARGB.
 LIBYUV_API
 int H420ToARGB(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
   return I420ToARGBMatrix(src_y, src_stride_y,
                           src_u, src_stride_u,
                           src_v, src_stride_v,
                           dst_argb, dst_stride_argb,
-                          &kYuvHConstants,
+                          &kYuvH709Constants,
                           width, height);
 }
 
 // Convert H420 to ABGR.
 LIBYUV_API
 int H420ToABGR(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_abgr, int dst_stride_abgr,
                int width, int height) {
   return I420ToARGBMatrix(src_y, src_stride_y,
                           src_v, src_stride_v,  // Swap U and V
                           src_u, src_stride_u,
                           dst_abgr, dst_stride_abgr,
-                          &kYvuHConstants,  // Use Yvu matrix
+                          &kYvuH709Constants,  // Use Yvu matrix
                           width, height);
 }
 
 // Convert I422 to ARGB with matrix
 static int I422ToARGBMatrix(const uint8* src_y, int src_stride_y,
                             const uint8* src_u, int src_stride_u,
                             const uint8* src_v, int src_stride_v,
                             uint8* dst_argb, int dst_stride_argb,
                             const struct YuvConstants* yuvconstants,
                             int width, int height) {
@@ skipping 72 matching lines @@
 LIBYUV_API
 int I422ToARGB(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
   return I422ToARGBMatrix(src_y, src_stride_y,
                           src_u, src_stride_u,
                           src_v, src_stride_v,
                           dst_argb, dst_stride_argb,
-                          &kYuvIConstants,
+                          &kYuvI601Constants,
                           width, height);
 }
 
 // Convert I422 to ABGR.
 LIBYUV_API
 int I422ToABGR(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_abgr, int dst_stride_abgr,
                int width, int height) {
   return I422ToARGBMatrix(src_y, src_stride_y,
                           src_v, src_stride_v,  // Swap U and V
                           src_u, src_stride_u,
                           dst_abgr, dst_stride_abgr,
-                          &kYvuIConstants,  // Use Yvu matrix
+                          &kYvuI601Constants,  // Use Yvu matrix
                           width, height);
 }
 
 // Convert J422 to ARGB.
 LIBYUV_API
 int J422ToARGB(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
   return I422ToARGBMatrix(src_y, src_stride_y,
                           src_u, src_stride_u,
                           src_v, src_stride_v,
                           dst_argb, dst_stride_argb,
-                          &kYuvJConstants,
+                          &kYuvJPEGConstants,
                           width, height);
 }
 
 // Convert J422 to ABGR.
 LIBYUV_API
 int J422ToABGR(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_abgr, int dst_stride_abgr,
                int width, int height) {
   return I422ToARGBMatrix(src_y, src_stride_y,
                           src_v, src_stride_v,  // Swap U and V
                           src_u, src_stride_u,
                           dst_abgr, dst_stride_abgr,
-                          &kYvuJConstants,  // Use Yvu matrix
+                          &kYvuJPEGConstants,  // Use Yvu matrix
                           width, height);
 }
 
 // Convert H422 to ARGB.
 LIBYUV_API
 int H422ToARGB(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
   return I422ToARGBMatrix(src_y, src_stride_y,
                           src_u, src_stride_u,
                           src_v, src_stride_v,
                           dst_argb, dst_stride_argb,
-                          &kYuvHConstants,
+                          &kYuvH709Constants,
                           width, height);
 }
 
 // Convert H422 to ABGR.
 LIBYUV_API
 int H422ToABGR(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_abgr, int dst_stride_abgr,
                int width, int height) {
   return I422ToARGBMatrix(src_y, src_stride_y,
                           src_v, src_stride_v,  // Swap U and V
                           src_u, src_stride_u,
                           dst_abgr, dst_stride_abgr,
-                          &kYvuHConstants,  // Use Yvu matrix
+                          &kYvuH709Constants,  // Use Yvu matrix
                           width, height);
 }
 
 // Convert I444 to ARGB with matrix
 static int I444ToARGBMatrix(const uint8* src_y, int src_stride_y,
                             const uint8* src_u, int src_stride_u,
                             const uint8* src_v, int src_stride_v,
                             uint8* dst_argb, int dst_stride_argb,
                             const struct YuvConstants* yuvconstants,
                             int width, int height) {
@@ skipping 63 matching lines @@
 LIBYUV_API
 int I444ToARGB(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
   return I444ToARGBMatrix(src_y, src_stride_y,
                           src_u, src_stride_u,
                           src_v, src_stride_v,
                           dst_argb, dst_stride_argb,
-                          &kYuvIConstants,
+                          &kYuvI601Constants,
                           width, height);
 }
 
 // Convert I444 to ABGR.
 LIBYUV_API
 int I444ToABGR(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_abgr, int dst_stride_abgr,
                int width, int height) {
   return I444ToARGBMatrix(src_y, src_stride_y,
                           src_v, src_stride_v,  // Swap U and V
                           src_u, src_stride_u,
                           dst_abgr, dst_stride_abgr,
-                          &kYvuIConstants,  // Use Yvu matrix
+                          &kYvuI601Constants,  // Use Yvu matrix
                           width, height);
 }
 
 // Convert J444 to ARGB.
 LIBYUV_API
 int J444ToARGB(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
   return I444ToARGBMatrix(src_y, src_stride_y,
                           src_u, src_stride_u,
                           src_v, src_stride_v,
                           dst_argb, dst_stride_argb,
-                          &kYuvJConstants,
+                          &kYuvJPEGConstants,
                           width, height);
 }
 
 // Convert I411 to ARGB.
 LIBYUV_API
 int I411ToARGB(const uint8* src_y, int src_stride_y,
                const uint8* src_u, int src_stride_u,
                const uint8* src_v, int src_stride_v,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
@@ skipping 43 matching lines @@
 #if defined(HAS_I411TOARGBROW_NEON)
   if (TestCpuFlag(kCpuHasNEON)) {
     I411ToARGBRow = I411ToARGBRow_Any_NEON;
     if (IS_ALIGNED(width, 8)) {
       I411ToARGBRow = I411ToARGBRow_NEON;
     }
   }
 #endif
 
   for (y = 0; y < height; ++y) {
-    I411ToARGBRow(src_y, src_u, src_v, dst_argb, &kYuvIConstants, width);
+    I411ToARGBRow(src_y, src_u, src_v, dst_argb, &kYuvI601Constants, width);
     dst_argb += dst_stride_argb;
     src_y += src_stride_y;
     src_u += src_stride_u;
     src_v += src_stride_v;
   }
   return 0;
 }
 
 // Convert I420 with Alpha to preattenuated ARGB.
 static int I420AlphaToARGBMatrix(const uint8* src_y, int src_stride_y,
@@ skipping 104 matching lines @@
                     const uint8* src_u, int src_stride_u,
                     const uint8* src_v, int src_stride_v,
                     const uint8* src_a, int src_stride_a,
                     uint8* dst_argb, int dst_stride_argb,
                     int width, int height, int attenuate) {
   return I420AlphaToARGBMatrix(src_y, src_stride_y,
                                src_u, src_stride_u,
                                src_v, src_stride_v,
                                src_a, src_stride_a,
                                dst_argb, dst_stride_argb,
-                               &kYuvIConstants,
+                               &kYuvI601Constants,
                                width, height, attenuate);
 }
 
 // Convert I420 with Alpha to ABGR.
 LIBYUV_API
 int I420AlphaToABGR(const uint8* src_y, int src_stride_y,
                     const uint8* src_u, int src_stride_u,
                     const uint8* src_v, int src_stride_v,
                     const uint8* src_a, int src_stride_a,
                     uint8* dst_abgr, int dst_stride_abgr,
                     int width, int height, int attenuate) {
   return I420AlphaToARGBMatrix(src_y, src_stride_y,
                                src_v, src_stride_v,  // Swap U and V
                                src_u, src_stride_u,
                                src_a, src_stride_a,
                                dst_abgr, dst_stride_abgr,
-                               &kYvuIConstants,  // Use Yvu matrix
+                               &kYvuI601Constants,  // Use Yvu matrix
                                width, height, attenuate);
 }
 
 // Convert I400 to ARGB.
 LIBYUV_API
 int I400ToARGB(const uint8* src_y, int src_stride_y,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
   int y;
   void (*I400ToARGBRow)(const uint8* y_buf,
@@ skipping 491 matching lines @@
 #if defined(HAS_NV12TOARGBROW_NEON)
   if (TestCpuFlag(kCpuHasNEON)) {
     NV12ToARGBRow = NV12ToARGBRow_Any_NEON;
     if (IS_ALIGNED(width, 8)) {
       NV12ToARGBRow = NV12ToARGBRow_NEON;
     }
   }
 #endif
 
   for (y = 0; y < height; ++y) {
-    NV12ToARGBRow(src_y, src_uv, dst_argb, &kYuvIConstants, width);
+    NV12ToARGBRow(src_y, src_uv, dst_argb, &kYuvI601Constants, width);
     dst_argb += dst_stride_argb;
     src_y += src_stride_y;
     if (y & 1) {
       src_uv += src_stride_uv;
     }
   }
   return 0;
 }
 
 // Convert NV21 to ARGB.
@@ skipping 37 matching lines @@
 #if defined(HAS_NV21TOARGBROW_NEON)
   if (TestCpuFlag(kCpuHasNEON)) {
     NV21ToARGBRow = NV21ToARGBRow_Any_NEON;
     if (IS_ALIGNED(width, 8)) {
       NV21ToARGBRow = NV21ToARGBRow_NEON;
     }
   }
 #endif
 
   for (y = 0; y < height; ++y) {
-    NV21ToARGBRow(src_y, src_uv, dst_argb, &kYuvIConstants, width);
+    NV21ToARGBRow(src_y, src_uv, dst_argb, &kYuvI601Constants, width);
     dst_argb += dst_stride_argb;
     src_y += src_stride_y;
     if (y & 1) {
       src_uv += src_stride_uv;
     }
   }
   return 0;
 }
 
 // Convert M420 to ARGB.
@@ skipping 37 matching lines @@
   if (TestCpuFlag(kCpuHasNEON)) {
     NV12ToARGBRow = NV12ToARGBRow_Any_NEON;
     if (IS_ALIGNED(width, 8)) {
       NV12ToARGBRow = NV12ToARGBRow_NEON;
     }
   }
 #endif
 
   for (y = 0; y < height - 1; y += 2) {
     NV12ToARGBRow(src_m420, src_m420 + src_stride_m420 * 2, dst_argb,
-                  &kYuvIConstants, width);
+                  &kYuvI601Constants, width);
     NV12ToARGBRow(src_m420 + src_stride_m420, src_m420 + src_stride_m420 * 2,
-                  dst_argb + dst_stride_argb, &kYuvIConstants, width);
+                  dst_argb + dst_stride_argb, &kYuvI601Constants, width);
     dst_argb += dst_stride_argb * 2;
     src_m420 += src_stride_m420 * 3;
   }
   if (height & 1) {
     NV12ToARGBRow(src_m420, src_m420 + src_stride_m420 * 2, dst_argb,
-                  &kYuvIConstants, width);
+                  &kYuvI601Constants, width);
   }
   return 0;
 }
 
 // Convert YUY2 to ARGB.
 LIBYUV_API
 int YUY2ToARGB(const uint8* src_yuy2, int src_stride_yuy2,
                uint8* dst_argb, int dst_stride_argb,
                int width, int height) {
   int y;
@@ skipping 37 matching lines @@
 #endif
 #if defined(HAS_YUY2TOARGBROW_NEON)
   if (TestCpuFlag(kCpuHasNEON)) {
     YUY2ToARGBRow = YUY2ToARGBRow_Any_NEON;
     if (IS_ALIGNED(width, 8)) {
       YUY2ToARGBRow = YUY2ToARGBRow_NEON;
     }
   }
 #endif
   for (y = 0; y < height; ++y) {
-    YUY2ToARGBRow(src_yuy2, dst_argb, &kYuvIConstants, width);
+    YUY2ToARGBRow(src_yuy2, dst_argb, &kYuvI601Constants, width);
     src_yuy2 += src_stride_yuy2;
     dst_argb += dst_stride_argb;
   }
   return 0;
 }
 
 // Convert UYVY to ARGB.
 LIBYUV_API
 int UYVYToARGB(const uint8* src_uyvy, int src_stride_uyvy,
                uint8* dst_argb, int dst_stride_argb,
@@ skipping 39 matching lines @@
 #endif
 #if defined(HAS_UYVYTOARGBROW_NEON)
   if (TestCpuFlag(kCpuHasNEON)) {
     UYVYToARGBRow = UYVYToARGBRow_Any_NEON;
     if (IS_ALIGNED(width, 8)) {
       UYVYToARGBRow = UYVYToARGBRow_NEON;
     }
   }
 #endif
   for (y = 0; y < height; ++y) {
-    UYVYToARGBRow(src_uyvy, dst_argb, &kYuvIConstants, width);
+    UYVYToARGBRow(src_uyvy, dst_argb, &kYuvI601Constants, width);
     src_uyvy += src_stride_uyvy;
     dst_argb += dst_stride_argb;
   }
   return 0;
 }
 
 #ifdef __cplusplus
 }  // extern "C"
 }  // namespace libyuv
 #endif