Index: include/libyuv/row.h |
diff --git a/include/libyuv/row.h b/include/libyuv/row.h |
index f7b09b108245851fc9833a4b42690df9cd0be6b0..44164defbcd66c40f528fa89456792654aa32cd3 100644 |
--- a/include/libyuv/row.h |
+++ b/include/libyuv/row.h |
@@ -460,15 +460,27 @@ struct YuvConstants { |
#define KYTORGB 192 |
#endif |
+#if defined(__aarch64__) || defined(__arm__) |
// Conversion matrix for YUV to RGB |
-extern const struct YuvConstants kYuvI601Constants; // BT.601 |
-extern const struct YuvConstants kYuvJPEGConstants; // JPeg color space |
-extern const struct YuvConstants kYuvH709Constants; // BT.709 |
+extern const struct YuvConstants SIMD_ALIGNED(kYuvI601Constants); // BT.601 |
skal
2016/08/30 05:03:14
why is there two difference macros (SIMD_ALIGNED /
fbarchard1
2016/08/30 17:52:59
Done.
|
+extern const struct YuvConstants SIMD_ALIGNED(kYuvJPEGConstants); // JPeg |
+extern const struct YuvConstants SIMD_ALIGNED(kYuvH709Constants); // BT.709 |
// Conversion matrix for YVU to BGR |
-extern const struct YuvConstants kYvuI601Constants; // BT.601 |
-extern const struct YuvConstants kYvuJPEGConstants; // JPeg color space |
-extern const struct YuvConstants kYvuH709Constants; // BT.709 |
+extern const struct YuvConstants SIMD_ALIGNED(kYvuI601Constants); // BT.601 |
+extern const struct YuvConstants SIMD_ALIGNED(kYvuJPEGConstants); // JPeg |
+extern const struct YuvConstants SIMD_ALIGNED(kYvuH709Constants); // BT.709 |
+#else // intel etc. |
+// Conversion matrix for YUV to RGB |
+extern const struct YuvConstants SIMD_ALIGNED32(kYuvI601Constants); // BT.601 |
+extern const struct YuvConstants SIMD_ALIGNED32(kYuvJPEGConstants); // JPeg |
+extern const struct YuvConstants SIMD_ALIGNED32(kYuvH709Constants); // BT.709 |
+ |
+// Conversion matrix for YVU to BGR |
+extern const struct YuvConstants SIMD_ALIGNED32(kYvuI601Constants); // BT.601 |
+extern const struct YuvConstants SIMD_ALIGNED32(kYvuJPEGConstants); // JPeg |
+extern const struct YuvConstants SIMD_ALIGNED32(kYvuH709Constants); // BT.709 |
+#endif |
#if defined(__APPLE__) || defined(__x86_64__) || defined(__llvm__) |
#define OMITFP |