static dav1d_{comp_inter_pred_modes,txtp_from_uvmode}: Initialize l…

…ike designated initializers (#444)

These are initialized with designated initializers in C, which are much
easier to read/understand for these tables, so I approximate that here.
Maybe we'll use an enum map crate later, but this is good enough for
now.

src/tables.rs

@@ -32,13 +32,16 @@ use crate::src::levels::BS_8x4;
 use crate::src::levels::BS_8x8;
 use crate::src::levels::BlockSize;
 use crate::src::levels::InterPredMode;
+use crate::src::levels::TxfmType;
 use crate::src::levels::ADST_ADST;
 use crate::src::levels::ADST_DCT;
 use crate::src::levels::ADST_FLIPADST;
 use crate::src::levels::DCT_ADST;
 use crate::src::levels::DCT_DCT;
 use crate::src::levels::DCT_FLIPADST;
 use crate::src::levels::DC_PRED;
+use crate::src::levels::DIAG_DOWN_LEFT_PRED;
+use crate::src::levels::DIAG_DOWN_RIGHT_PRED;
 use crate::src::levels::FILTER_2D_8TAP_REGULAR;
 use crate::src::levels::FILTER_2D_8TAP_REGULAR_SHARP;
 use crate::src::levels::FILTER_2D_8TAP_REGULAR_SMOOTH;
@@ -53,17 +56,27 @@ use crate::src::levels::FLIPADST_ADST;
 use crate::src::levels::FLIPADST_DCT;
 use crate::src::levels::FLIPADST_FLIPADST;
 use crate::src::levels::GLOBALMV;
+use crate::src::levels::GLOBALMV_GLOBALMV;
 use crate::src::levels::HOR_DOWN_PRED;
 use crate::src::levels::HOR_PRED;
+use crate::src::levels::HOR_UP_PRED;
 use crate::src::levels::H_ADST;
 use crate::src::levels::H_DCT;
 use crate::src::levels::H_FLIPADST;
 use crate::src::levels::IDTX;
 use crate::src::levels::NEARESTMV;
+use crate::src::levels::NEARESTMV_NEARESTMV;
+use crate::src::levels::NEARESTMV_NEWMV;
 use crate::src::levels::NEARMV;
+use crate::src::levels::NEARMV_NEARMV;
+use crate::src::levels::NEARMV_NEWMV;
 use crate::src::levels::NEWMV;
+use crate::src::levels::NEWMV_NEARESTMV;
+use crate::src::levels::NEWMV_NEARMV;
+use crate::src::levels::NEWMV_NEWMV;
 use crate::src::levels::N_PARTITIONS;
 use crate::src::levels::N_SUB8X8_PARTITIONS;
+use crate::src::levels::PAETH_PRED;
 use crate::src::levels::RTX_16X32;
 use crate::src::levels::RTX_16X4;
 use crate::src::levels::RTX_16X64;
@@ -78,6 +91,9 @@ use crate::src::levels::RTX_64X32;
 use crate::src::levels::RTX_8X16;
 use crate::src::levels::RTX_8X32;
 use crate::src::levels::RTX_8X4;
+use crate::src::levels::SMOOTH_H_PRED;
+use crate::src::levels::SMOOTH_PRED;
+use crate::src::levels::SMOOTH_V_PRED;
 use crate::src::levels::TX_16X16;
 use crate::src::levels::TX_32X32;
 use crate::src::levels::TX_4X4;
@@ -86,7 +102,9 @@ use crate::src::levels::TX_8X8;
 use crate::src::levels::TX_CLASS_2D;
 use crate::src::levels::TX_CLASS_H;
 use crate::src::levels::TX_CLASS_V;
+use crate::src::levels::VERT_LEFT_PRED;
 use crate::src::levels::VERT_PRED;
+use crate::src::levels::VERT_RIGHT_PRED;
 use crate::src::levels::V_ADST;
 use crate::src::levels::V_DCT;
 use crate::src::levels::V_FLIPADST;
@@ -466,33 +484,36 @@ pub static dav1d_max_txfm_size_for_bs: [[u8; 4]; 22] = [
     [TX_4X4 as u8, TX_4X4 as u8, TX_4X4 as u8, TX_4X4 as u8],
 ];
 
-pub static dav1d_txtp_from_uvmode: [u8; 14] = [
-    DCT_DCT as u8,
-    ADST_DCT as u8,
-    DCT_ADST as u8,
-    DCT_DCT as u8,
-    ADST_ADST as u8,
-    ADST_DCT as u8,
-    DCT_ADST as u8,
-    DCT_ADST as u8,
-    ADST_DCT as u8,
-    ADST_ADST as u8,
-    ADST_DCT as u8,
-    DCT_ADST as u8,
-    ADST_ADST as u8,
-    0,
-];
+pub static dav1d_txtp_from_uvmode: [TxfmType; 14] = {
+    let mut tbl = [0; 14];
+    tbl[DC_PRED as usize] = DCT_DCT;
+    tbl[VERT_PRED as usize] = ADST_DCT;
+    tbl[HOR_PRED as usize] = DCT_ADST;
+    tbl[DIAG_DOWN_LEFT_PRED as usize] = DCT_DCT;
+    tbl[DIAG_DOWN_RIGHT_PRED as usize] = ADST_ADST;
+    tbl[VERT_RIGHT_PRED as usize] = ADST_DCT;
+    tbl[HOR_DOWN_PRED as usize] = DCT_ADST;
+    tbl[HOR_UP_PRED as usize] = DCT_ADST;
+    tbl[VERT_LEFT_PRED as usize] = ADST_DCT;
+    tbl[SMOOTH_PRED as usize] = ADST_ADST;
+    tbl[SMOOTH_V_PRED as usize] = ADST_DCT;
+    tbl[SMOOTH_H_PRED as usize] = DCT_ADST;
+    tbl[PAETH_PRED as usize] = ADST_ADST;
+    tbl
+};
 
-pub static dav1d_comp_inter_pred_modes: [[InterPredMode; 2]; 8] = [
-    [NEARESTMV, NEARESTMV],
-    [NEARMV, NEARMV],
-    [NEARESTMV, NEWMV],
-    [NEWMV, NEARESTMV],
-    [NEARMV, NEWMV],
-    [NEWMV, NEARMV],
-    [GLOBALMV, GLOBALMV],
-    [NEWMV, NEWMV],
-];
+pub static dav1d_comp_inter_pred_modes: [[InterPredMode; 2]; 8] = {
+    let mut tbl = [[0; 2]; 8];
+    tbl[NEARESTMV_NEARESTMV as usize] = [NEARESTMV, NEARESTMV];
+    tbl[NEARMV_NEARMV as usize] = [NEARMV, NEARMV];
+    tbl[NEWMV_NEWMV as usize] = [NEWMV, NEWMV];
+    tbl[GLOBALMV_GLOBALMV as usize] = [GLOBALMV, GLOBALMV];
+    tbl[NEWMV_NEARESTMV as usize] = [NEWMV, NEARESTMV];
+    tbl[NEWMV_NEARMV as usize] = [NEWMV, NEARMV];
+    tbl[NEARESTMV_NEWMV as usize] = [NEARESTMV, NEWMV];
+    tbl[NEARMV_NEWMV as usize] = [NEARMV, NEWMV];
+    tbl
+};
 
 pub static dav1d_partition_type_count: [u8; 5] = [
     N_PARTITIONS as u8 - 3,