| Index: source/row_common.cc
|
| diff --git a/source/row_common.cc b/source/row_common.cc
|
| index c0cb3919d32f283643d8b923001ee82cb3a6a306..c2dda6568bda8eca84012d59916332cb62a3309a 100644
|
| --- a/source/row_common.cc
|
| +++ b/source/row_common.cc
|
| @@ -1033,7 +1033,7 @@ void J400ToARGBRow_C(const uint8* src_y, uint8* dst_argb, int width) {
|
| #define BR (VR * 128 + YGB)
|
|
|
| #if defined(__aarch64__)
|
| -const YuvConstants SIMD_ALIGNED(kYuvIConstants) = {
|
| +const YuvConstants SIMD_ALIGNED(kYuvI601Constants) = {
|
| { -UB, -VR, -UB, -VR, -UB, -VR, -UB, -VR },
|
| { -UB, -VR, -UB, -VR, -UB, -VR, -UB, -VR },
|
| { UG, VG, UG, VG, UG, VG, UG, VG },
|
| @@ -1050,7 +1050,7 @@ const YuvConstants SIMD_ALIGNED(kYvuIConstants) = {
|
| { 0x0101 * YG, 0, 0, 0 }
|
| };
|
| #elif defined(__arm__)
|
| -const YuvConstants SIMD_ALIGNED(kYuvIConstants) = {
|
| +const YuvConstants SIMD_ALIGNED(kYuvI601Constants) = {
|
| { -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 },
|
| @@ -1063,7 +1063,7 @@ const YuvConstants SIMD_ALIGNED(kYvuIConstants) = {
|
| { 0x0101 * YG, 0, 0, 0 }
|
| };
|
| #else
|
| -const YuvConstants SIMD_ALIGNED(kYuvIConstants) = {
|
| +const YuvConstants SIMD_ALIGNED(kYuvI601Constants) = {
|
| { 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,
|
| @@ -1120,7 +1120,7 @@ const YuvConstants SIMD_ALIGNED(kYvuIConstants) = {
|
| #define BR (VR * 128 + YGB)
|
|
|
| #if defined(__aarch64__)
|
| -const YuvConstants SIMD_ALIGNED(kYuvJConstants) = {
|
| +const YuvConstants SIMD_ALIGNED(kYuvJPEGConstants) = {
|
| { -UB, -VR, -UB, -VR, -UB, -VR, -UB, -VR },
|
| { -UB, -VR, -UB, -VR, -UB, -VR, -UB, -VR },
|
| { UG, VG, UG, VG, UG, VG, UG, VG },
|
| @@ -1137,7 +1137,7 @@ const YuvConstants SIMD_ALIGNED(kYvuJConstants) = {
|
| { 0x0101 * YG, 0, 0, 0 }
|
| };
|
| #elif defined(__arm__)
|
| -const YuvConstants SIMD_ALIGNED(kYuvJConstants) = {
|
| +const YuvConstants SIMD_ALIGNED(kYuvJPEGConstants) = {
|
| { -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 },
|
| @@ -1150,7 +1150,7 @@ const YuvConstants SIMD_ALIGNED(kYvuJConstants) = {
|
| { 0x0101 * YG, 0, 0, 0 }
|
| };
|
| #else
|
| -const YuvConstants SIMD_ALIGNED(kYuvJConstants) = {
|
| +const YuvConstants SIMD_ALIGNED(kYuvJPEGConstants) = {
|
| { 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,
|
| @@ -1208,7 +1208,7 @@ const YuvConstants SIMD_ALIGNED(kYvuJConstants) = {
|
| #define BR (VR * 128 + YGB)
|
|
|
| #if defined(__aarch64__)
|
| -const YuvConstants SIMD_ALIGNED(kYuvHConstants) = {
|
| +const YuvConstants SIMD_ALIGNED(kYuvH709Constants) = {
|
| { -UB, -VR, -UB, -VR, -UB, -VR, -UB, -VR },
|
| { -UB, -VR, -UB, -VR, -UB, -VR, -UB, -VR },
|
| { UG, VG, UG, VG, UG, VG, UG, VG },
|
| @@ -1225,7 +1225,7 @@ const YuvConstants SIMD_ALIGNED(kYvuHConstants) = {
|
| { 0x0101 * YG, 0, 0, 0 }
|
| };
|
| #elif defined(__arm__)
|
| -const YuvConstants SIMD_ALIGNED(kYuvHConstants) = {
|
| +const YuvConstants SIMD_ALIGNED(kYuvH709Constants) = {
|
| { -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 },
|
| @@ -1238,7 +1238,7 @@ const YuvConstants SIMD_ALIGNED(kYvuHConstants) = {
|
| { 0x0101 * YG, 0, 0, 0 }
|
| };
|
| #else
|
| -const YuvConstants SIMD_ALIGNED(kYuvHConstants) = {
|
| +const YuvConstants SIMD_ALIGNED(kYuvH709Constants) = {
|
| { 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,
|
|
|