shithub: dav1d

Download patch

ref: 09de524cb0be6afb9ce838a6dd6b6afaecc7a794
parent: bc803f00fd8c4cf4c5f882583c542d7d4c5e112d
author: Henrik Gramner <gramner@twoorioles.com>
date: Tue Oct 23 18:58:53 EDT 2018

Align wedge mask buffers

--- a/src/wedge.c
+++ b/src/wedge.c
@@ -83,35 +83,35 @@
     { WEDGE_OBLIQUE117, 2, 4 }, { WEDGE_OBLIQUE117, 6, 4 },
 };
 
-static uint8_t wedge_masks_444_32x32[2 * 16 * 32 * 32];
-static uint8_t wedge_masks_444_32x16[2 * 16 * 32 * 16];
-static uint8_t wedge_masks_444_32x8[ 2 * 16 * 32 *  8];
-static uint8_t wedge_masks_444_16x32[2 * 16 * 16 * 32];
-static uint8_t wedge_masks_444_16x16[2 * 16 * 16 * 16];
-static uint8_t wedge_masks_444_16x8[ 2 * 16 * 16 *  8];
-static uint8_t wedge_masks_444_8x32[ 2 * 16 *  8 * 32];
-static uint8_t wedge_masks_444_8x16[ 2 * 16 *  8 * 16];
-static uint8_t wedge_masks_444_8x8[  2 * 16 *  8 *  8];
+static uint8_t ALIGN(wedge_masks_444_32x32[2 * 16 * 32 * 32], 32);
+static uint8_t ALIGN(wedge_masks_444_32x16[2 * 16 * 32 * 16], 32);
+static uint8_t ALIGN(wedge_masks_444_32x8 [2 * 16 * 32 *  8], 32);
+static uint8_t ALIGN(wedge_masks_444_16x32[2 * 16 * 16 * 32], 32);
+static uint8_t ALIGN(wedge_masks_444_16x16[2 * 16 * 16 * 16], 32);
+static uint8_t ALIGN(wedge_masks_444_16x8 [2 * 16 * 16 *  8], 32);
+static uint8_t ALIGN(wedge_masks_444_8x32 [2 * 16 *  8 * 32], 32);
+static uint8_t ALIGN(wedge_masks_444_8x16 [2 * 16 *  8 * 16], 32);
+static uint8_t ALIGN(wedge_masks_444_8x8  [2 * 16 *  8 *  8], 32);
 
-static uint8_t wedge_masks_422_16x32[2 * 16 * 16 * 32];
-static uint8_t wedge_masks_422_16x16[2 * 16 * 16 * 16];
-static uint8_t wedge_masks_422_16x8[ 2 * 16 * 16 *  8];
-static uint8_t wedge_masks_422_8x32[ 2 * 16 *  8 * 32];
-static uint8_t wedge_masks_422_8x16[ 2 * 16 *  8 * 16];
-static uint8_t wedge_masks_422_8x8[  2 * 16 *  8 *  8];
-static uint8_t wedge_masks_422_4x32[ 2 * 16 *  4 * 32];
-static uint8_t wedge_masks_422_4x16[ 2 * 16 *  4 * 16];
-static uint8_t wedge_masks_422_4x8[  2 * 16 *  4 *  8];
+static uint8_t ALIGN(wedge_masks_422_16x32[2 * 16 * 16 * 32], 32);
+static uint8_t ALIGN(wedge_masks_422_16x16[2 * 16 * 16 * 16], 32);
+static uint8_t ALIGN(wedge_masks_422_16x8 [2 * 16 * 16 *  8], 32);
+static uint8_t ALIGN(wedge_masks_422_8x32 [2 * 16 *  8 * 32], 32);
+static uint8_t ALIGN(wedge_masks_422_8x16 [2 * 16 *  8 * 16], 32);
+static uint8_t ALIGN(wedge_masks_422_8x8  [2 * 16 *  8 *  8], 32);
+static uint8_t ALIGN(wedge_masks_422_4x32 [2 * 16 *  4 * 32], 32);
+static uint8_t ALIGN(wedge_masks_422_4x16 [2 * 16 *  4 * 16], 32);
+static uint8_t ALIGN(wedge_masks_422_4x8  [2 * 16 *  4 *  8], 32);
 
-static uint8_t wedge_masks_420_16x16[2 * 16 * 16 * 16];
-static uint8_t wedge_masks_420_16x8[ 2 * 16 * 16 *  8];
-static uint8_t wedge_masks_420_16x4[ 2 * 16 * 16 *  4];
-static uint8_t wedge_masks_420_8x16[ 2 * 16 *  8 * 16];
-static uint8_t wedge_masks_420_8x8[  2 * 16 *  8 *  8];
-static uint8_t wedge_masks_420_8x4[  2 * 16 *  8 *  4];
-static uint8_t wedge_masks_420_4x16[ 2 * 16 *  4 * 16];
-static uint8_t wedge_masks_420_4x8[  2 * 16 *  4 *  8];
-static uint8_t wedge_masks_420_4x4[  2 * 16 *  4 *  4];
+static uint8_t ALIGN(wedge_masks_420_16x16[2 * 16 * 16 * 16], 32);
+static uint8_t ALIGN(wedge_masks_420_16x8 [2 * 16 * 16 *  8], 32);
+static uint8_t ALIGN(wedge_masks_420_16x4 [2 * 16 * 16 *  4], 32);
+static uint8_t ALIGN(wedge_masks_420_8x16 [2 * 16 *  8 * 16], 32);
+static uint8_t ALIGN(wedge_masks_420_8x8  [2 * 16 *  8 *  8], 32);
+static uint8_t ALIGN(wedge_masks_420_8x4  [2 * 16 *  8 *  4], 32);
+static uint8_t ALIGN(wedge_masks_420_4x16 [2 * 16 *  4 * 16], 32);
+static uint8_t ALIGN(wedge_masks_420_4x8  [2 * 16 *  4 *  8], 32);
+static uint8_t ALIGN(wedge_masks_420_4x4  [2 * 16 *  4 *  4], 32);
 
 const uint8_t *dav1d_wedge_masks[N_BS_SIZES][3][2][16];