Fix transform tables in C implementations.

These tables were out of sync with the indexing enum since the
refactoring in commit 4f16f119 (change 303389), due to the removal
of the ext_tx_to_txtype lookup table. This patch just puts them
back in order.

Change-Id: Ieb7d57654f61b99b511d54c9ba09abbd5e8d0d14

diff --git a/vp10/common/idct.c b/vp10/common/idct.c
index 94e75643b82a89a7fa79b244e4132d7f02b6315e..e91a2deaf428d99e0b6e24eb6b187dda6bd77c21 100644 (file)
--- a/vp10/common/idct.c
+++ b/vp10/common/idct.c
@@ -458,24 +458,24 @@ static void highbd_inv_idtx_add_c(const tran_low_t *input, uint8_t *dest8,
 
 void vp10_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                           int tx_type) {
-  const transform_2d IHT_4[] = {
-    { idct4_c, idct4_c  },   // DCT_DCT  = 0
-    { iadst4_c, idct4_c  },  // ADST_DCT = 1
-    { idct4_c, iadst4_c },   // DCT_ADST = 2
-    { iadst4_c, iadst4_c },  // ADST_ADST = 3
+  static const transform_2d IHT_4[] = {
+    { idct4_c,  idct4_c  },  // DCT_DCT           = 0,
+    { iadst4_c, idct4_c  },  // ADST_DCT          = 1,
+    { idct4_c,  iadst4_c },  // DCT_ADST          = 2,
+    { iadst4_c, iadst4_c },  // ADST_ADST         = 3,
 #if CONFIG_EXT_TX
-    { iadst4_c, idct4_c },   // FLIPADST_DCT = 4
-    { idct4_c,  iadst4_c },  // DCT_FLIPADST = 5
-    { iadst4_c, iadst4_c },  // FLIPADST_FLIPADST = 6
-    { iadst4_c, iadst4_c },  // ADST_FLIPADST = 7
-    { iadst4_c, iadst4_c },  // FLIPADST_ADST = 8
-    { idst4_c,  idst4_c },   // DST_DST = 9
-    { idst4_c,  idct4_c  },  // DST_DCT = 10
-    { idct4_c,  idst4_c  },  // DCT_DST = 11
-    { idst4_c,  iadst4_c },  // DST_ADST = 12
-    { iadst4_c, idst4_c  },  // ADST_DST = 13
-    { idst4_c,  iadst4_c },  // DST_FLIPADST = 14
-    { iadst4_c, idst4_c  },  // FLIPADST_DST = 15
+    { iadst4_c, idct4_c  },  // FLIPADST_DCT      = 4,
+    { idct4_c,  iadst4_c },  // DCT_FLIPADST      = 5,
+    { iadst4_c, iadst4_c },  // FLIPADST_FLIPADST = 6,
+    { iadst4_c, iadst4_c },  // ADST_FLIPADST     = 7,
+    { iadst4_c, iadst4_c },  // FLIPADST_ADST     = 8,
+    { idst4_c,  idct4_c  },  // DST_DCT           = 9,
+    { idct4_c,  idst4_c  },  // DCT_DST           = 10,
+    { idst4_c,  iadst4_c },  // DST_ADST          = 11,
+    { iadst4_c, idst4_c  },  // ADST_DST          = 12,
+    { idst4_c,  iadst4_c },  // DST_FLIPADST      = 13,
+    { iadst4_c, idst4_c  },  // FLIPADST_DST      = 14,
+    { idst4_c,  idst4_c  },  // DST_DST           = 15
 #endif  // CONFIG_EXT_TX
   };
 
@@ -506,23 +506,23 @@ void vp10_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void vp10_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                          int tx_type) {
   static const transform_2d IHT_8[] = {
-    { idct8_c,  idct8_c  },  // DCT_DCT  = 0
-    { iadst8_c, idct8_c  },  // ADST_DCT = 1
-    { idct8_c,  iadst8_c },  // DCT_ADST = 2
-    { iadst8_c, iadst8_c },  // ADST_ADST = 3
+    { idct8_c,  idct8_c  },  // DCT_DCT           = 0,
+    { iadst8_c, idct8_c  },  // ADST_DCT          = 1,
+    { idct8_c,  iadst8_c },  // DCT_ADST          = 2,
+    { iadst8_c, iadst8_c },  // ADST_ADST         = 3,
 #if CONFIG_EXT_TX
-    { iadst8_c, idct8_c },   // FLIPADST_DCT = 4
-    { idct8_c,  iadst8_c },  // DCT_FLIPADST = 5
-    { iadst8_c, iadst8_c },  // FLIPADST_FLIPADST = 6
-    { iadst8_c, iadst8_c },  // ADST_FLIPADST = 7
-    { iadst8_c, iadst8_c },  // FLIPADST_ADST = 8
-    { idst8_c,  idst8_c },   // DST_DST = 9
-    { idst8_c,  idct8_c  },  // DST_DCT = 10
-    { idct8_c,  idst8_c  },  // DCT_DST = 11
-    { idst8_c,  iadst8_c },  // DST_ADST = 12
-    { iadst8_c, idst8_c  },  // ADST_DST = 13
-    { idst8_c,  iadst8_c },  // DST_FLIPADST = 14
-    { iadst8_c, idst8_c  },  // FLIPADST_DST = 15
+    { iadst8_c, idct8_c  },  // FLIPADST_DCT      = 4,
+    { idct8_c,  iadst8_c },  // DCT_FLIPADST      = 5,
+    { iadst8_c, iadst8_c },  // FLIPADST_FLIPADST = 6,
+    { iadst8_c, iadst8_c },  // ADST_FLIPADST     = 7,
+    { iadst8_c, iadst8_c },  // FLIPADST_ADST     = 8,
+    { idst8_c,  idct8_c  },  // DST_DCT           = 9,
+    { idct8_c,  idst8_c  },  // DCT_DST           = 10,
+    { idst8_c,  iadst8_c },  // DST_ADST          = 11,
+    { iadst8_c, idst8_c  },  // ADST_DST          = 12,
+    { idst8_c,  iadst8_c },  // DST_FLIPADST      = 13,
+    { iadst8_c, idst8_c  },  // FLIPADST_DST      = 14,
+    { idst8_c,  idst8_c  },  // DST_DST           = 15
 #endif  // CONFIG_EXT_TX
   };
 
@@ -554,26 +554,25 @@ void vp10_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride,
 void vp10_iht16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride,
                             int tx_type) {
   static const transform_2d IHT_16[] = {
-    { idct16_c,  idct16_c  },  // DCT_DCT  = 0
-    { iadst16_c, idct16_c  },  // ADST_DCT = 1
-    { idct16_c,  iadst16_c },  // DCT_ADST = 2
-    { iadst16_c, iadst16_c },  // ADST_ADST = 3
+    { idct16_c,  idct16_c  },  // DCT_DCT           = 0,
+    { iadst16_c, idct16_c  },  // ADST_DCT          = 1,
+    { idct16_c,  iadst16_c },  // DCT_ADST          = 2,
+    { iadst16_c, iadst16_c },  // ADST_ADST         = 3,
 #if CONFIG_EXT_TX
-    { iadst16_c, idct16_c  },  // FLIPADST_DCT = 4
-    { idct16_c,  iadst16_c },  // DCT_FLIPADST = 5
-    { iadst16_c, iadst16_c },  // FLIPADST_FLIPADST = 6
-    { iadst16_c, iadst16_c },  // ADST_FLIPADST = 7
-    { iadst16_c, iadst16_c },  // FLIPADST_ADST = 8
-    { idst16_c,  idst16_c  },  // DST_DST = 9
-    { idst16_c,  idct16_c  },  // DST_DCT = 10
-    { idct16_c,  idst16_c  },  // DCT_DST = 11
-    { idst16_c,  iadst16_c },  // DST_ADST = 12
-    { iadst16_c, idst16_c  },  // ADST_DST = 13
-    { idst16_c,  iadst16_c },  // DST_FLIPADST = 14
-    { iadst16_c, idst16_c  },  // FLIPADST_DST = 15
+    { iadst16_c, idct16_c  },  // FLIPADST_DCT      = 4,
+    { idct16_c,  iadst16_c },  // DCT_FLIPADST      = 5,
+    { iadst16_c, iadst16_c },  // FLIPADST_FLIPADST = 6,
+    { iadst16_c, iadst16_c },  // ADST_FLIPADST     = 7,
+    { iadst16_c, iadst16_c },  // FLIPADST_ADST     = 8,
+    { idst16_c,  idct16_c  },  // DST_DCT           = 9,
+    { idct16_c,  idst16_c  },  // DCT_DST           = 10,
+    { idst16_c,  iadst16_c },  // DST_ADST          = 11,
+    { iadst16_c, idst16_c  },  // ADST_DST          = 12,
+    { idst16_c,  iadst16_c },  // DST_FLIPADST      = 13,
+    { iadst16_c, idst16_c  },  // FLIPADST_DST      = 14,
+    { idst16_c,  idst16_c  },  // DST_DST           = 15
 #endif  // CONFIG_EXT_TX
   };
-
   int i, j;
   tran_low_t out[16 * 16];
   tran_low_t *outptr = out;
@@ -884,26 +883,27 @@ void vp10_inv_txfm_add_32x32(const tran_low_t *input, uint8_t *dest,
 #if CONFIG_VP9_HIGHBITDEPTH
 void vp10_highbd_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest8,
                                 int stride, int tx_type, int bd) {
-  const highbd_transform_2d IHT_4[] = {
-    { vpx_highbd_idct4_c,  vpx_highbd_idct4_c  },  // DCT_DCT  = 0
-    { vpx_highbd_iadst4_c, vpx_highbd_idct4_c  },  // ADST_DCT = 1
-    { vpx_highbd_idct4_c,  vpx_highbd_iadst4_c },  // DCT_ADST = 2
-    { vpx_highbd_iadst4_c, vpx_highbd_iadst4_c },  // ADST_ADST = 3
+  static const highbd_transform_2d HIGH_IHT_4[] = {
+    { vpx_highbd_idct4_c,  vpx_highbd_idct4_c  },  // DCT_DCT           = 0,
+    { vpx_highbd_iadst4_c, vpx_highbd_idct4_c  },  // ADST_DCT          = 1,
+    { vpx_highbd_idct4_c,  vpx_highbd_iadst4_c },  // DCT_ADST          = 2,
+    { vpx_highbd_iadst4_c, vpx_highbd_iadst4_c },  // ADST_ADST         = 3,
 #if CONFIG_EXT_TX
-    { vpx_highbd_iadst4_c, vpx_highbd_idct4_c  },  // FLIPADST_DCT = 4
-    { vpx_highbd_idct4_c,  vpx_highbd_iadst4_c },  // DCT_FLIPADST = 5
-    { vpx_highbd_iadst4_c, vpx_highbd_iadst4_c },  // FLIPADST_FLIPADST = 6
-    { vpx_highbd_iadst4_c, vpx_highbd_iadst4_c },  // ADST_FLIPADST = 7
-    { vpx_highbd_iadst4_c, vpx_highbd_iadst4_c },  // FLIPADST_ADST = 8
-    { highbd_idst4_c,      highbd_idst4_c      },  // DST_DST = 9
-    { highbd_idst4_c,      vpx_highbd_idct4_c  },  // DST_DCT = 10
-    { vpx_highbd_idct4_c,  highbd_idst4_c      },  // DCT_DST = 11
-    { highbd_idst4_c,      vpx_highbd_iadst4_c },  // DST_ADST = 12
-    { vpx_highbd_iadst4_c, highbd_idst4_c      },  // ADST_DST = 13
-    { highbd_idst4_c,      vpx_highbd_iadst4_c },  // DST_FLIPADST = 14
-    { vpx_highbd_iadst4_c, highbd_idst4_c      },  // FLIPADST_DST = 15
+    { vpx_highbd_iadst4_c, vpx_highbd_idct4_c  },  // FLIPADST_DCT      = 4,
+    { vpx_highbd_idct4_c,  vpx_highbd_iadst4_c },  // DCT_FLIPADST      = 5,
+    { vpx_highbd_iadst4_c, vpx_highbd_iadst4_c },  // FLIPADST_FLIPADST = 6,
+    { vpx_highbd_iadst4_c, vpx_highbd_iadst4_c },  // ADST_FLIPADST     = 7,
+    { vpx_highbd_iadst4_c, vpx_highbd_iadst4_c },  // FLIPADST_ADST     = 8,
+    {     highbd_idst4_c,  vpx_highbd_idct4_c  },  // DST_DCT           = 9,
+    { vpx_highbd_idct4_c,      highbd_idst4_c  },  // DCT_DST           = 10,
+    {     highbd_idst4_c,  vpx_highbd_iadst4_c },  // DST_ADST          = 11,
+    { vpx_highbd_iadst4_c,     highbd_idst4_c  },  // ADST_DST          = 12,
+    {     highbd_idst4_c,  vpx_highbd_iadst4_c },  // DST_FLIPADST      = 13,
+    { vpx_highbd_iadst4_c,     highbd_idst4_c  },  // FLIPADST_DST      = 14,
+    {     highbd_idst4_c,      highbd_idst4_c  },  // DST_DST           = 15
 #endif  // CONFIG_EXT_TX
   };
+
   uint16_t *dest = CONVERT_TO_SHORTPTR(dest8);
 
   int i, j;
@@ -913,7 +913,7 @@ void vp10_highbd_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest8,
 
   // Inverse transform row vectors.
   for (i = 0; i < 4; ++i) {
-    IHT_4[tx_type].rows(input, outptr, bd);
+    HIGH_IHT_4[tx_type].rows(input, outptr, bd);
     input  += 4;
     outptr += 4;
   }
@@ -922,7 +922,7 @@ void vp10_highbd_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest8,
   for (i = 0; i < 4; ++i) {
     for (j = 0; j < 4; ++j)
       temp_in[j] = out[j * 4 + i];
-    IHT_4[tx_type].cols(temp_in, temp_out, bd);
+    HIGH_IHT_4[tx_type].cols(temp_in, temp_out, bd);
     for (j = 0; j < 4; ++j) {
       dest[j * stride + i] = highbd_clip_pixel_add(
           dest[j * stride + i], ROUND_POWER_OF_TWO(temp_out[j], 4), bd);
@@ -933,23 +933,23 @@ void vp10_highbd_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest8,
 void vp10_highbd_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest8,
                                 int stride, int tx_type, int bd) {
   static const highbd_transform_2d HIGH_IHT_8[] = {
-    { vpx_highbd_idct8_c,  vpx_highbd_idct8_c  },  // DCT_DCT  = 0
-    { vpx_highbd_iadst8_c, vpx_highbd_idct8_c  },  // ADST_DCT = 1
-    { vpx_highbd_idct8_c,  vpx_highbd_iadst8_c },  // DCT_ADST = 2
-    { vpx_highbd_iadst8_c, vpx_highbd_iadst8_c },  // ADST_ADST = 3
+    { vpx_highbd_idct8_c,  vpx_highbd_idct8_c  },  // DCT_DCT           = 0,
+    { vpx_highbd_iadst8_c, vpx_highbd_idct8_c  },  // ADST_DCT          = 1,
+    { vpx_highbd_idct8_c,  vpx_highbd_iadst8_c },  // DCT_ADST          = 2,
+    { vpx_highbd_iadst8_c, vpx_highbd_iadst8_c },  // ADST_ADST         = 3,
 #if CONFIG_EXT_TX
-    { vpx_highbd_iadst8_c, vpx_highbd_idct8_c  },  // FLIPADST_DCT = 4
-    { vpx_highbd_idct8_c,  vpx_highbd_iadst8_c },  // DCT_FLIPADST = 5
-    { vpx_highbd_iadst8_c, vpx_highbd_iadst8_c },  // FLIPADST_FLIPADST = 6
-    { vpx_highbd_iadst8_c, vpx_highbd_iadst8_c },  // ADST_FLIPADST = 7
-    { vpx_highbd_iadst8_c, vpx_highbd_iadst8_c },  // FLIPADST_ADST = 8
-    { highbd_idst8_c,      highbd_idst8_c      },  // DST_DST = 9
-    { highbd_idst8_c,      vpx_highbd_idct8_c  },  // DST_DCT = 10
-    { vpx_highbd_idct8_c,  highbd_idst8_c      },  // DCT_DST = 11
-    { highbd_idst8_c,      vpx_highbd_iadst8_c },  // DST_ADST = 12
-    { vpx_highbd_iadst8_c, highbd_idst8_c      },  // ADST_DST = 13
-    { highbd_idst8_c,      vpx_highbd_iadst8_c },  // DST_FLIPADST = 14
-    { vpx_highbd_iadst8_c, highbd_idst8_c      },  // FLIPADST_DST = 15
+    { vpx_highbd_iadst8_c, vpx_highbd_idct8_c  },  // FLIPADST_DCT      = 4,
+    { vpx_highbd_idct8_c,  vpx_highbd_iadst8_c },  // DCT_FLIPADST      = 5,
+    { vpx_highbd_iadst8_c, vpx_highbd_iadst8_c },  // FLIPADST_FLIPADST = 6,
+    { vpx_highbd_iadst8_c, vpx_highbd_iadst8_c },  // ADST_FLIPADST     = 7,
+    { vpx_highbd_iadst8_c, vpx_highbd_iadst8_c },  // FLIPADST_ADST     = 8,
+    {     highbd_idst8_c,  vpx_highbd_idct8_c  },  // DST_DCT           = 9,
+    { vpx_highbd_idct8_c,      highbd_idst8_c  },  // DCT_DST           = 10,
+    {     highbd_idst8_c,  vpx_highbd_iadst8_c },  // DST_ADST          = 11,
+    { vpx_highbd_iadst8_c,     highbd_idst8_c  },  // ADST_DST          = 12,
+    {     highbd_idst8_c,  vpx_highbd_iadst8_c },  // DST_FLIPADST      = 13,
+    { vpx_highbd_iadst8_c,     highbd_idst8_c  },  // FLIPADST_DST      = 14,
+    {     highbd_idst8_c,      highbd_idst8_c  },  // DST_DST           = 15
 #endif  // CONFIG_EXT_TX
   };
 
@@ -982,23 +982,23 @@ void vp10_highbd_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest8,
 void vp10_highbd_iht16x16_256_add_c(const tran_low_t *input, uint8_t *dest8,
                                    int stride, int tx_type, int bd) {
   static const highbd_transform_2d HIGH_IHT_16[] = {
-    { vpx_highbd_idct16_c,  vpx_highbd_idct16_c  },  // DCT_DCT  = 0
-    { vpx_highbd_iadst16_c, vpx_highbd_idct16_c  },  // ADST_DCT = 1
-    { vpx_highbd_idct16_c,  vpx_highbd_iadst16_c },  // DCT_ADST = 2
-    { vpx_highbd_iadst16_c, vpx_highbd_iadst16_c },  // ADST_ADST = 3
+    { vpx_highbd_idct16_c,  vpx_highbd_idct16_c  },  // DCT_DCT           = 0,
+    { vpx_highbd_iadst16_c, vpx_highbd_idct16_c  },  // ADST_DCT          = 1,
+    { vpx_highbd_idct16_c,  vpx_highbd_iadst16_c },  // DCT_ADST          = 2,
+    { vpx_highbd_iadst16_c, vpx_highbd_iadst16_c },  // ADST_ADST         = 3,
 #if CONFIG_EXT_TX
-    { vpx_highbd_iadst16_c, vpx_highbd_idct16_c  },  // FLIPADST_DCT = 4
-    { vpx_highbd_idct16_c,  vpx_highbd_iadst16_c },  // DCT_FLIPADST = 5
-    { vpx_highbd_iadst16_c, vpx_highbd_iadst16_c },  // FLIPADST_FLIPADST = 6
-    { vpx_highbd_iadst16_c, vpx_highbd_iadst16_c },  // ADST_FLIPADST = 7
-    { vpx_highbd_iadst16_c, vpx_highbd_iadst16_c },  // FLIPADST_ADST = 8
-    { highbd_idst16_c,      highbd_idst16_c      },  // DST_DST = 9
-    { highbd_idst16_c,      vpx_highbd_idct16_c  },  // DST_DCT = 10
-    { vpx_highbd_idct16_c,  highbd_idst16_c      },  // DCT_DST = 11
-    { highbd_idst16_c,      vpx_highbd_iadst16_c },  // DST_ADST = 12
-    { vpx_highbd_iadst16_c, highbd_idst16_c      },  // ADST_DST = 13
-    { highbd_idst16_c,      vpx_highbd_iadst16_c },  // DST_FLIPADST = 14
-    { vpx_highbd_iadst16_c, highbd_idst16_c      },  // FLIPADST_DST = 15
+    { vpx_highbd_iadst16_c, vpx_highbd_idct16_c  },  // FLIPADST_DCT      = 4,
+    { vpx_highbd_idct16_c,  vpx_highbd_iadst16_c },  // DCT_FLIPADST      = 5,
+    { vpx_highbd_iadst16_c, vpx_highbd_iadst16_c },  // FLIPADST_FLIPADST = 6,
+    { vpx_highbd_iadst16_c, vpx_highbd_iadst16_c },  // ADST_FLIPADST     = 7,
+    { vpx_highbd_iadst16_c, vpx_highbd_iadst16_c },  // FLIPADST_ADST     = 8,
+    {     highbd_idst16_c,  vpx_highbd_idct16_c  },  // DST_DCT           = 9,
+    { vpx_highbd_idct16_c,      highbd_idst16_c  },  // DCT_DST           = 10,
+    {     highbd_idst16_c,  vpx_highbd_iadst16_c },  // DST_ADST          = 11,
+    { vpx_highbd_iadst16_c,     highbd_idst16_c  },  // ADST_DST          = 12,
+    {     highbd_idst16_c,  vpx_highbd_iadst16_c },  // DST_FLIPADST      = 13,
+    { vpx_highbd_iadst16_c,     highbd_idst16_c  },  // FLIPADST_DST      = 14,
+    {     highbd_idst16_c,      highbd_idst16_c  },  // DST_DST           = 15
 #endif  // CONFIG_EXT_TX
   };
 

diff --git a/vp10/encoder/dct.c b/vp10/encoder/dct.c
index 219fd17fc74d753a08629b27ca4d20704c1e8296..b388981e4387ab0c4b299ae45bb1be8451e92b67 100644 (file)
--- a/vp10/encoder/dct.c
+++ b/vp10/encoder/dct.c
@@ -1162,65 +1162,65 @@ static void fadst16(const tran_low_t *input, tran_low_t *output) {
 }
 
 static const transform_2d FHT_4[] = {
-  { fdct4,  fdct4  },  // DCT_DCT  = 0
-  { fadst4, fdct4  },  // ADST_DCT = 1
-  { fdct4,  fadst4 },  // DCT_ADST = 2
-  { fadst4, fadst4 },  // ADST_ADST = 3
+  { fdct4,  fdct4  },  // DCT_DCT           = 0,
+  { fadst4, fdct4  },  // ADST_DCT          = 1,
+  { fdct4,  fadst4 },  // DCT_ADST          = 2,
+  { fadst4, fadst4 },  // ADST_ADST         = 3,
 #if CONFIG_EXT_TX
-  { fadst4, fdct4  },  // FLIPADST_DCT = 4
-  { fdct4,  fadst4 },  // DCT_FLIPADST = 5
-  { fadst4, fadst4 },  // FLIPADST_FLIPADST = 6
-  { fadst4, fadst4 },  // ADST_FLIPADST = 7
-  { fadst4, fadst4 },  // FLIPADST_ADST = 8
-  { fdst4,  fdst4  },  // DST_DST = 9
-  { fdst4,  fdct4  },  // DST_DCT = 10
-  { fdct4,  fdst4  },  // DCT_DST = 11
-  { fdst4,  fadst4 },  // DST_ADST = 12
-  { fadst4, fdst4  },  // ADST_DST = 13
-  { fdst4,  fadst4 },  // DST_FLIPADST = 14
-  { fadst4, fdst4  },  // FLIPADST_DST = 15
+  { fadst4, fdct4  },  // FLIPADST_DCT      = 4,
+  { fdct4,  fadst4 },  // DCT_FLIPADST      = 5,
+  { fadst4, fadst4 },  // FLIPADST_FLIPADST = 6,
+  { fadst4, fadst4 },  // ADST_FLIPADST     = 7,
+  { fadst4, fadst4 },  // FLIPADST_ADST     = 8,
+  { fdst4,  fdct4  },  // DST_DCT           = 9,
+  { fdct4,  fdst4  },  // DCT_DST           = 10,
+  { fdst4,  fadst4 },  // DST_ADST          = 11,
+  { fadst4, fdst4  },  // ADST_DST          = 12,
+  { fdst4,  fadst4 },  // DST_FLIPADST      = 13,
+  { fadst4, fdst4  },  // FLIPADST_DST      = 14,
+  { fdst4,  fdst4  },  // DST_DST           = 15
 #endif  // CONFIG_EXT_TX
 };
 
 static const transform_2d FHT_8[] = {
-  { fdct8,  fdct8  },  // DCT_DCT  = 0
-  { fadst8, fdct8  },  // ADST_DCT = 1
-  { fdct8,  fadst8 },  // DCT_ADST = 2
-  { fadst8, fadst8 },  // ADST_ADST = 3
+  { fdct8,  fdct8  },  // DCT_DCT           = 0,
+  { fadst8, fdct8  },  // ADST_DCT          = 1,
+  { fdct8,  fadst8 },  // DCT_ADST          = 2,
+  { fadst8, fadst8 },  // ADST_ADST         = 3,
 #if CONFIG_EXT_TX
-  { fadst8, fdct8  },  // FLIPADST_DCT = 4
-  { fdct8,  fadst8 },  // DCT_FLIPADST = 5
-  { fadst8, fadst8 },  // FLIPADST_FLIPADST = 6
-  { fadst8, fadst8 },  // ADST_FLIPADST = 7
-  { fadst8, fadst8 },  // FLIPADST_ADST = 8
-  { fdst8,  fdst8  },  // DST_DST = 9
-  { fdst8,  fdct8  },  // DST_DCT = 10
-  { fdct8,  fdst8  },  // DCT_DST = 11
-  { fdst8,  fadst8 },  // DST_ADST = 12
-  { fadst8, fdst8  },  // ADST_DST = 13
-  { fdst8,  fadst8 },  // DST_FLIPADST = 14
-  { fadst8, fdst8  },  // FLIPADST_DST = 15
+  { fadst8, fdct8  },  // FLIPADST_DCT      = 4,
+  { fdct8,  fadst8 },  // DCT_FLIPADST      = 5,
+  { fadst8, fadst8 },  // FLIPADST_FLIPADST = 6,
+  { fadst8, fadst8 },  // ADST_FLIPADST     = 7,
+  { fadst8, fadst8 },  // FLIPADST_ADST     = 8,
+  { fdst8,  fdct8  },  // DST_DCT           = 9,
+  { fdct8,  fdst8  },  // DCT_DST           = 10,
+  { fdst8,  fadst8 },  // DST_ADST          = 11,
+  { fadst8, fdst8  },  // ADST_DST          = 12,
+  { fdst8,  fadst8 },  // DST_FLIPADST      = 13,
+  { fadst8, fdst8  },  // FLIPADST_DST      = 14,
+  { fdst8,  fdst8  },  // DST_DST           = 15
 #endif  // CONFIG_EXT_TX
 };
 
 static const transform_2d FHT_16[] = {
-  { fdct16,  fdct16  },  // DCT_DCT  = 0
-  { fadst16, fdct16  },  // ADST_DCT = 1
-  { fdct16,  fadst16 },  // DCT_ADST = 2
-  { fadst16, fadst16 },  // ADST_ADST = 3
+  { fdct16,  fdct16  },  // DCT_DCT           = 0,
+  { fadst16, fdct16  },  // ADST_DCT          = 1,
+  { fdct16,  fadst16 },  // DCT_ADST          = 2,
+  { fadst16, fadst16 },  // ADST_ADST         = 3,
 #if CONFIG_EXT_TX
-  { fadst16, fdct16  },  // FLIPADST_DCT = 4
-  { fdct16,  fadst16 },  // DCT_FLIPADST = 5
-  { fadst16, fadst16 },  // FLIPADST_FLIPADST = 6
-  { fadst16, fadst16 },  // ADST_FLIPADST = 7
-  { fadst16, fadst16 },  // FLIPADST_ADST = 8
-  { fdst16,  fdst16  },  // DST_DST = 9
-  { fdst16,  fdct16  },  // DST_DCT = 10
-  { fdct16,  fdst16  },  // DCT_DST = 11
-  { fdst16,  fadst16 },  // DST_ADST = 12
-  { fadst16, fdst16  },  // ADST_DST = 13
-  { fdst16,  fadst16 },  // DST_FLIPADST = 14
-  { fadst16, fdst16  },  // FLIPADST_DST = 15
+  { fadst16, fdct16  },  // FLIPADST_DCT      = 4,
+  { fdct16,  fadst16 },  // DCT_FLIPADST      = 5,
+  { fadst16, fadst16 },  // FLIPADST_FLIPADST = 6,
+  { fadst16, fadst16 },  // ADST_FLIPADST     = 7,
+  { fadst16, fadst16 },  // FLIPADST_ADST     = 8,
+  { fdst16,  fdct16  },  // DST_DCT           = 9,
+  { fdct16,  fdst16  },  // DCT_DST           = 10,
+  { fdst16,  fadst16 },  // DST_ADST          = 11,
+  { fadst16, fdst16  },  // ADST_DST          = 12,
+  { fdst16,  fadst16 },  // DST_FLIPADST      = 13,
+  { fadst16, fdst16  },  // FLIPADST_DST      = 14,
+  { fdst16,  fdst16  },  // DST_DST           = 15
 #endif  // CONFIG_EXT_TX
 };