Let scan/iscan be 16-byte alignment

This is to facilitate SIMD quantizer implementation

Change-Id: I5e63ae5f347240ec58e88ecd8abef63ad7e5c984

aom_dsp/aom_dsp_rtcd_defs.pl

@@ -1022,25 +1022,17 @@ if (aom_config("CONFIG_AOM_QM") eq "yes") {
 } else {
   if (aom_config("CONFIG_AV1_ENCODER") eq "yes") {
     add_proto qw/void aom_quantize_b/, "const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan";
-    if (aom_config("CONFIG_ADAPT_SCAN") ne "yes") {
-      specialize qw/aom_quantize_b sse2/, "$ssse3_x86_64_x86inc", "$avx_x86_64_x86inc";
-    }
+    specialize qw/aom_quantize_b sse2/, "$ssse3_x86_64_x86inc", "$avx_x86_64_x86inc";
 
     add_proto qw/void aom_quantize_b_32x32/, "const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan";
-    if (aom_config("CONFIG_ADAPT_SCAN") ne "yes") {
-      specialize qw/aom_quantize_b_32x32/, "$ssse3_x86_64_x86inc", "$avx_x86_64_x86inc";
-    }
+    specialize qw/aom_quantize_b_32x32/, "$ssse3_x86_64_x86inc", "$avx_x86_64_x86inc";
 
     if (aom_config("CONFIG_AOM_HIGHBITDEPTH") eq "yes") {
       add_proto qw/void aom_highbd_quantize_b/, "const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan";
-      if (aom_config("CONFIG_ADAPT_SCAN") ne "yes") {
-        specialize qw/aom_highbd_quantize_b sse2/;
-      }
+      specialize qw/aom_highbd_quantize_b sse2/;
 
       add_proto qw/void aom_highbd_quantize_b_32x32/, "const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan";
-      if (aom_config("CONFIG_ADAPT_SCAN") ne "yes") {
-        specialize qw/aom_highbd_quantize_b_32x32 sse2/;
-      }
+      specialize qw/aom_highbd_quantize_b_32x32 sse2/;
     }  # CONFIG_AOM_HIGHBITDEPTH
   }  # CONFIG_AV1_ENCODER
 } # CONFIG_AOM_QM

av1/common/entropymode.h

@@ -81,15 +81,15 @@ typedef struct frame_contexts {
   uint32_t non_zero_prob_16X16[TX_TYPES][256];
   uint32_t non_zero_prob_32X32[TX_TYPES][1024];
 
-  int16_t scan_4X4[TX_TYPES][16];
-  int16_t scan_8X8[TX_TYPES][64];
-  int16_t scan_16X16[TX_TYPES][256];
-  int16_t scan_32X32[TX_TYPES][1024];
-
-  int16_t iscan_4X4[TX_TYPES][16];
-  int16_t iscan_8X8[TX_TYPES][64];
-  int16_t iscan_16X16[TX_TYPES][256];
-  int16_t iscan_32X32[TX_TYPES][1024];
+  DECLARE_ALIGNED(16, int16_t, scan_4X4[TX_TYPES][16]);
+  DECLARE_ALIGNED(16, int16_t, scan_8X8[TX_TYPES][64]);
+  DECLARE_ALIGNED(16, int16_t, scan_16X16[TX_TYPES][256]);
+  DECLARE_ALIGNED(16, int16_t, scan_32X32[TX_TYPES][1024]);
+
+  DECLARE_ALIGNED(16, int16_t, iscan_4X4[TX_TYPES][16]);
+  DECLARE_ALIGNED(16, int16_t, iscan_8X8[TX_TYPES][64]);
+  DECLARE_ALIGNED(16, int16_t, iscan_16X16[TX_TYPES][256]);
+  DECLARE_ALIGNED(16, int16_t, iscan_32X32[TX_TYPES][1024]);
 
   int16_t nb_4X4[TX_TYPES][(16 + 1) * 2];
   int16_t nb_8X8[TX_TYPES][(64 + 1) * 2];