Merge the AMBE deinterleave tables. Oh hey their contents make a lot …

…of sense now! What a surprise. (Goddamnit people, finish your derivations)
alwinhb · Apr 22, 2015 · 0b7dcfc · 0b7dcfc
1 parent 30db000
commit 0b7dcfc
Showing 1 changed file with 8 additions and 20 deletions.
diff --git a/mbe_const.h b/mbe_const.h
@@ -18,28 +18,16 @@
 /*
  * AMBE interleave schedule
  */
-const unsigned char rW[36] = {
-  0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1,
-  0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 2,
-  0, 2, 0, 2, 0, 2, 0, 2, 0, 2, 0, 2
+const unsigned char rX[72] = {                                                  
+  23,  5, 10,  3, 22,  4, 9,  2, 21,  3, 8, 1, 20,  2, 7, 0, 19,  1, 6, 13, 18,  0,  5, 12,
+  17, 22,  4, 11, 16, 21, 3, 10, 15, 20, 2, 9, 14, 19, 1, 8, 13, 18, 0,  7, 12, 17, 10, 6,
+  11, 16,  9,  5, 10, 15, 8,  4,  9, 14, 7, 3,  8, 13, 6, 2,  7, 12, 5,  1,  6, 11,  4, 0
 };
 
-const unsigned char rX[36] = {
-  23, 10, 22, 9, 21, 8, 20, 7, 19, 6, 18,  5,
-  17,  4, 16, 3, 15, 2, 14, 1, 13, 0, 12, 10,
-  11,  9, 10, 8,  9, 7,  8, 6,  7, 5,  6,  4
-};
-
-const unsigned char rY[36] = {
-  0, 2, 0, 2, 0, 2, 0, 2, 0, 3, 0, 3,
-  1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3,
-  1, 3, 1, 3, 1, 3, 1, 3, 1, 3, 1, 3
-};
-
-const unsigned char rZ[36] = {
-   5,  3,  4,  2,  3, 1,  2, 0,  1, 13,  0, 12,
-  22, 11, 21, 10, 20, 9, 19, 8, 18,  7, 17,  6,
-  16,  5, 15,  4, 14, 3, 13, 2, 12,  1, 11,  0
+const unsigned char rW[72] = {                                                  
+  0, 0, 1, 2, 0, 0, 1, 2, 0, 0, 1, 2, 0, 0, 1, 2, 0, 0, 1, 3, 0, 0, 1, 3,       
+  0, 1, 1, 3, 0, 1, 1, 3, 0, 1, 1, 3, 0, 1, 1, 3, 0, 1, 1, 3, 0, 1, 2, 3,       
+  0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3        
 };
 
 /*