Commit 649be94c authored by Paul Wilkins's avatar Paul Wilkins
Browse files

Removal of Hybrid DWT/DCT experiment.

Removal of experiment to simplify code base for other
changes.

Change-Id: If0a33952504558511926ad212bc311fc2bffb19a
parent 097f2052
......@@ -244,7 +244,6 @@ EXPERIMENT_LIST="
newbintramodes
comp_interintra_pred
tx64x64
dwtdcthybrid
cnvcontext
newcoefcontext
enable_6tap
......
......@@ -36,7 +36,6 @@ static int round(double x) {
}
#endif
#if !CONFIG_DWTDCTHYBRID
static const double kPi = 3.141592653589793238462643383279502884;
static void reference2_32x32_idct_2d(double *input, double *output) {
double x;
......@@ -127,9 +126,7 @@ TEST(VP9Idct32x32Test, AccuracyCheck) {
}
}
}
#else // CONFIG_DWTDCTHYBRID
// TODO(rbultje/debargha): add DWT-specific tests
#endif // CONFIG_DWTDCTHYBRID
TEST(VP9Fdct32x32Test, AccuracyCheck) {
ACMRandom rnd(ACMRandom::DeterministicSeed());
unsigned int max_error = 0;
......
......@@ -47,18 +47,6 @@ void vpx_log(const char *format, ...);
#define MAX_MV_REFS 9
#define MAX_MV_REF_CANDIDATES 4
#if CONFIG_DWTDCTHYBRID
#define DWT_MAX_LENGTH 64
#define DWT_TYPE 26 // 26/53/97
#define DWT_PRECISION_BITS 2
#define DWT_PRECISION_RND ((1 << DWT_PRECISION_BITS) / 2)
#define DWTDCT16X16 0
#define DWTDCT16X16_LEAN 1
#define DWTDCT8X8 2
#define DWTDCT_TYPE DWTDCT16X16_LEAN
#endif
typedef struct {
int r, c;
} POS;
......
......@@ -143,624 +143,6 @@ DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_16x16[256]) = {
237, 252, 253, 238, 223, 239, 254, 255,
};
#if CONFIG_DWTDCTHYBRID
#if DWTDCT_TYPE == DWTDCT16X16_LEAN
DECLARE_ALIGNED(16, const int, vp9_coef_bands_32x32[1024]) = {
0, 1, 2, 3, 5, 4, 4, 5, 5, 3, 6, 3, 5, 4, 6, 6,
6, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
};
DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_32x32[1024]) = {
0, 1, 32, 64, 33, 2, 3, 34,
65, 96, 128, 97, 66, 35, 4, 5,
36, 67, 98, 129, 160, 192, 161, 130,
99, 68, 37, 6, 7, 38, 69, 100,
131, 162, 193, 224, 256, 225, 194, 163,
132, 101, 70, 39, 8, 9, 40, 71,
102, 133, 164, 195, 226, 257, 288, 320,
289, 258, 227, 196, 165, 134, 103, 72,
41, 10, 11, 42, 73, 104, 135, 166,
197, 228, 259, 290, 321, 352, 384, 353,
322, 291, 260, 229, 198, 167, 136, 105,
74, 43, 12, 13, 44, 75, 106, 137,
168, 199, 230, 261, 292, 323, 354, 385,
416, 448, 417, 386, 355, 324, 293, 262,
231, 200, 169, 138, 107, 76, 45, 14,
15, 46, 77, 108, 139, 170, 201, 232,
263, 294, 325, 356, 387, 418, 449, 480,
481, 450, 419, 388, 357, 326, 295, 264,
233, 202, 171, 140, 109, 78, 47, 79,
110, 141, 172, 203, 234, 265, 296, 327,
358, 389, 420, 451, 482, 483, 452, 421,
390, 359, 328, 297, 266, 235, 204, 173,
142, 111, 143, 174, 205, 236, 267, 298,
329, 360, 391, 422, 453, 484, 485, 454,
423, 392, 361, 330, 299, 268, 237, 206,
175, 207, 238, 269, 300, 331, 362, 393,
424, 455, 486, 487, 456, 425, 394, 363,
332, 301, 270, 239, 271, 302, 333, 364,
395, 426, 457, 488, 489, 458, 427, 396,
365, 334, 303, 335, 366, 397, 428, 459,
490, 491, 460, 429, 398, 367, 399, 430,
461, 492, 493, 462, 431, 463, 494, 495,
16, 512, 528, 17, 513, 529, 48, 544,
560, 80, 576, 592, 49, 545, 561, 18,
514, 530, 19, 515, 531, 50, 546, 562,
81, 577, 593, 112, 608, 624, 144, 640,
656, 113, 609, 625, 82, 578, 594, 51,
547, 563, 20, 516, 532, 21, 517, 533,
52, 548, 564, 83, 579, 595, 114, 610,
626, 145, 641, 657, 176, 672, 688, 208,
704, 720, 177, 673, 689, 146, 642, 658,
115, 611, 627, 84, 580, 596, 53, 549,
565, 22, 518, 534, 23, 519, 535, 54,
550, 566, 85, 581, 597, 116, 612, 628,
147, 643, 659, 178, 674, 690, 209, 705,
721, 240, 736, 752, 272, 768, 784, 241,
737, 753, 210, 706, 722, 179, 675, 691,
148, 644, 660, 117, 613, 629, 86, 582,
598, 55, 551, 567, 24, 520, 536, 25,
521, 537, 56, 552, 568, 87, 583, 599,
118, 614, 630, 149, 645, 661, 180, 676,
692, 211, 707, 723, 242, 738, 754, 273,
769, 785, 304, 800, 816, 336, 832, 848,
305, 801, 817, 274, 770, 786, 243, 739,
755, 212, 708, 724, 181, 677, 693, 150,
646, 662, 119, 615, 631, 88, 584, 600,
57, 553, 569, 26, 522, 538, 27, 523,
539, 58, 554, 570, 89, 585, 601, 120,
616, 632, 151, 647, 663, 182, 678, 694,
213, 709, 725, 244, 740, 756, 275, 771,
787, 306, 802, 818, 337, 833, 849, 368,
864, 880, 400, 896, 912, 369, 865, 881,
338, 834, 850, 307, 803, 819, 276, 772,
788, 245, 741, 757, 214, 710, 726, 183,
679, 695, 152, 648, 664, 121, 617, 633,
90, 586, 602, 59, 555, 571, 28, 524,
540, 29, 525, 541, 60, 556, 572, 91,
587, 603, 122, 618, 634, 153, 649, 665,
184, 680, 696, 215, 711, 727, 246, 742,
758, 277, 773, 789, 308, 804, 820, 339,
835, 851, 370, 866, 882, 401, 897, 913,
432, 928, 944, 464, 960, 976, 433, 929,
945, 402, 898, 914, 371, 867, 883, 340,
836, 852, 309, 805, 821, 278, 774, 790,
247, 743, 759, 216, 712, 728, 185, 681,
697, 154, 650, 666, 123, 619, 635, 92,
588, 604, 61, 557, 573, 30, 526, 542,
31, 527, 543, 62, 558, 574, 93, 589,
605, 124, 620, 636, 155, 651, 667, 186,
682, 698, 217, 713, 729, 248, 744, 760,
279, 775, 791, 310, 806, 822, 341, 837,
853, 372, 868, 884, 403, 899, 915, 434,
930, 946, 465, 961, 977, 496, 992, 1008,
497, 993, 1009, 466, 962, 978, 435, 931,
947, 404, 900, 916, 373, 869, 885, 342,
838, 854, 311, 807, 823, 280, 776, 792,
249, 745, 761, 218, 714, 730, 187, 683,
699, 156, 652, 668, 125, 621, 637, 94,
590, 606, 63, 559, 575, 95, 591, 607,
126, 622, 638, 157, 653, 669, 188, 684,
700, 219, 715, 731, 250, 746, 762, 281,
777, 793, 312, 808, 824, 343, 839, 855,
374, 870, 886, 405, 901, 917, 436, 932,
948, 467, 963, 979, 498, 994, 1010, 499,
995, 1011, 468, 964, 980, 437, 933, 949,
406, 902, 918, 375, 871, 887, 344, 840,
856, 313, 809, 825, 282, 778, 794, 251,
747, 763, 220, 716, 732, 189, 685, 701,
158, 654, 670, 127, 623, 639, 159, 655,
671, 190, 686, 702, 221, 717, 733, 252,
748, 764, 283, 779, 795, 314, 810, 826,
345, 841, 857, 376, 872, 888, 407, 903,
919, 438, 934, 950, 469, 965, 981, 500,
996, 1012, 501, 997, 1013, 470, 966, 982,
439, 935, 951, 408, 904, 920, 377, 873,
889, 346, 842, 858, 315, 811, 827, 284,
780, 796, 253, 749, 765, 222, 718, 734,
191, 687, 703, 223, 719, 735, 254, 750,
766, 285, 781, 797, 316, 812, 828, 347,
843, 859, 378, 874, 890, 409, 905, 921,
440, 936, 952, 471, 967, 983, 502, 998,
1014, 503, 999, 1015, 472, 968, 984, 441,
937, 953, 410, 906, 922, 379, 875, 891,
348, 844, 860, 317, 813, 829, 286, 782,
798, 255, 751, 767, 287, 783, 799, 318,
814, 830, 349, 845, 861, 380, 876, 892,
411, 907, 923, 442, 938, 954, 473, 969,
985, 504, 1000, 1016, 505, 1001, 1017, 474,
970, 986, 443, 939, 955, 412, 908, 924,
381, 877, 893, 350, 846, 862, 319, 815,
831, 351, 847, 863, 382, 878, 894, 413,
909, 925, 444, 940, 956, 475, 971, 987,
506, 1002, 1018, 507, 1003, 1019, 476, 972,
988, 445, 941, 957, 414, 910, 926, 383,
879, 895, 415, 911, 927, 446, 942, 958,
477, 973, 989, 508, 1004, 1020, 509, 1005,
1021, 478, 974, 990, 447, 943, 959, 479,
975, 991, 510, 1006, 1022, 511, 1007, 1023,
};
#elif DWTDCT_TYPE == DWTDCT16X16
DECLARE_ALIGNED(16, const int, vp9_coef_bands_32x32[1024]) = {
0, 1, 2, 3, 5, 4, 4, 5, 5, 3, 6, 3, 5, 4, 6,
6, 6, 6,
6,
6, 5, 5, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
};
DECLARE_ALIGNED(16, const int, vp9_default_zig_zag1d_32x32[1024]) = {
0, 1, 32, 64, 33, 2, 3, 34,
65, 96, 128, 97, 66, 35, 4,
16, 512, 528,
5,
36, 67, 98, 129, 160, 192, 161, 130,
99, 68, 37, 6, 7, 38, 69, 100,
131, 162, 193, 224, 256, 225, 194, 163,
132, 101, 70, 39, 8, 9, 40, 71,
102, 133, 164, 195, 226, 257, 288, 320,
289, 258, 227, 196, 165, 134, 103, 72,
41, 10, 11, 42, 73, 104, 135, 166,
197, 228, 259, 290, 321, 352, 384, 353,
322, 291, 260, 229, 198, 167, 136, 105,
74, 43, 12, 13, 44, 75, 106, 137,
168, 199, 230, 261, 292, 323, 354, 385,
416, 448, 417, 386, 355, 324, 293, 262,
231, 200, 169, 138, 107, 76, 45, 14,
15, 46, 77, 108, 139, 170, 201, 232,
263, 294, 325, 356, 387, 418, 449, 480,
481, 450, 419, 388, 357, 326, 295, 264,
233, 202, 171, 140, 109, 78, 47, 79,
110, 141, 172, 203, 234, 265, 296, 327,
358, 389, 420, 451, 482, 483, 452, 421,
390, 359, 328, 297, 266, 235, 204, 173,
142, 111, 143, 174, 205, 236, 267, 298,
329, 360, 391, 422, 453, 484, 485, 454,
423, 392, 361, 330, 299, 268, 237, 206,
175, 207, 238, 269, 300, 331, 362, 393,
424, 455, 486, 487, 456, 425, 394, 363,
332, 301, 270, 239, 271, 302, 333, 364,
395, 426, 457, 488, 489, 458, 427, 396,
365, 334, 303, 335, 366, 397, 428, 459,
490, 491, 460, 429, 398, 367, 399, 430,
461, 492, 493, 462, 431, 463, 494, 495,
17, 513, 529, 48, 544,
560, 80, 576, 592, 49, 545, 561, 18,
514, 530, 19, 515, 531, 50, 546, 562,
81, 577, 593, 112, 608, 624, 144, 640,
656, 113, 609, 625, 82, 578, 594, 51,
547, 563, 20, 516, 532, 21, 517, 533,
52, 548, 564, 83, 579, 595, 114, 610,
626, 145, 641, 657, 176, 672, 688, 208,
704, 720, 177, 673, 689, 146, 642, 658,
115, 611, 627, 84, 580, 596, 53, 549,
565, 22, 518, 534, 23, 519, 535, 54,
550, 566, 85, 581, 597, 116, 612, 628,
147, 643, 659, 178, 674, 690, 209, 705,
721, 240, 736, 752, 272, 768, 784, 241,
737, 753, 210, 706, 722, 179, 675, 691,
148, 644, 660, 117, 613, 629, 86, 582,
598, 55, 551, 567, 24, 520, 536, 25,
521, 537, 56, 552, 568, 87, 583, 599,
118, 614, 630, 149, 645, 661, 180, 676,
692, 211, 707, 723, 242, 738, 754, 273,
769, 785, 304, 800, 816, 336, 832, 848,
305, 801, 817, 274, 770, 786, 243, 739,
755, 212, 708, 724, 181, 677, 693, 150,
646, 662, 119, 615, 631, 88, 584, 600,
57, 553, 569, 26, 522, 538, 27, 523,
539, 58, 554, 570, 89, 585, 601, 120,
616, 632, 151, 647, 663, 182, 678, 694,
213, 709, 725, 244, 740, 756, 275, 771,
787, 306, 802, 818, 337, 833, 849, 368,
864, 880, 400, 896, 912, 369, 865, 881,
338, 834, 850, 307, 803, 819, 276, 772,
788, 245, 741, 757, 214, 710, 726, 183,
679, 695, 152, 648, 664, 121, 617, 633,
90, 586, 602, 59, 555, 571, 28, 524,
540, 29, 525, 541, 60, 556, 572, 91,
587, 603, 122, 618, 634, 153, 649, 665,
184, 680, 696, 215, 711, 727, 246, 742,
758, 277, 773, 789, 308, 804, 820, 339,
835, 851, 370, 866, 882, 401, 897, 913,
432, 928, 944, 464, 960, 976, 433, 929,
945, 402, 898, 914, 371, 867, 883, 340,
836, 852, 309, 805, 821, 278, 774, 790,
247, 743, 759, 216, 712, 728, 185, 681,
697, 154, 650, 666, 123, 619, 635, 92,
588, 604, 61, 557, 573, 30, 526, 542,
31, 527, 543, 62, 558, 574, 93, 589,
605, 124, 620, 636, 155, 651, 667, 186,
682, 698, 217, 713, 729, 248, 744, 760,
279, 775, 791, 310, 806, 822, 341, 837,
853, 372, 868, 884, 403, 899, 915, 434,
930, 946, 465, 961, 977, 496, 992, 1008,
497, 993, 1009, 466, 962, 978, 435, 931,
947, 404, 900, 916, 373, 869, 885, 342,
838, 854, 311, 807, 823, 280, 776, 792,
249, 745, 761, 218, 714, 730, 187, 683,
699, 156, 652, 668, 125, 621, 637, 94,
590, 606, 63, 559, 575, 95, 591, 607,
126, 622, 638, 157, 653, 669, 188, 684,
700, 219, 715, 731, 250, 746, 762, 281,
777, 793, 312, 808, 824, 343, 839, 855,
374, 870, 886, 405, 901, 917, 436, 932,
948, 467, 963, 979, 498, 994, 1010, 499,
995, 1011, 468, 964, 980, 437, 933, 949,
406, 902, 918, 375, 871, 887, 344, 840,
856, 313, 809, 825, 282, 778, 794, 251,
747, 763, 220, 716, 732, 189, 685, 701,
158, 654, 670, 127, 623, 639, 159, 655,
671, 190, 686, 702, 221, 717, 733, 252,
748, 764, 283, 779, 795, 314, 810, 826,
345, 841, 857, 376, 872, 888, 407, 903,
919, 438, 934, 950, 469, 965, 981, 500,
996, 1012, 501, 997, 1013, 470, 966, 982,
439, 935, 951, 408, 904, 920, 377, 873,
889, 346, 842, 858, 315, 811, 827, 284,
780, 796, 253, 749, 765, 222, 718, 734,
191, 687, 703, 223, 719, 735, 254, 750,
766, 285, 781, 797, 316, 812, 828, 347,
843, 859, 378, 874, 890, 409, 905, 921,
440, 936, 952, 471, 967, 983, 502, 998,
1014, 503, 999, 1015, 472, 968, 984, 441,
937, 953, 410, 906, 922, 379, 875, 891,
348, 844, 860, 317, 813, 829, 286, 782,
798, 255, 751, 767, 287, 783, 799, 318,
814, 830, 349, 845, 861, 380, 876, 892,
411, 907, 923, 442, 938, 954, 473, 969,
985, 504, 1000, 1016, 505, 1001, 1017, 474,
970, 986, 443, 939, 955, 412, 908, 924,
381, 877, 893, 350, 846, 862, 319, 815,
831, 351, 847, 863, 382, 878, 894, 413,
909, 925, 444, 940, 956, 475, 971, 987,
506, 1002, 1018, 507, 1003, 1019, 476, 972,
988, 445, 941, 957, 414, 910, 926, 383,
879, 895, 415, 911, 927, 446, 942, 958,
477, 973, 989, 508, 1004, 1020, 509, 1005,
1021, 478, 974, 990, 447, 943, 959, 479,
975, 991, 510, 1006, 1022, 511, 1007, 1023,
};
#elif DWTDCT_TYPE == DWTDCT8X8
DECLARE_ALIGNED(16, const int, vp9_coef_bands_32x32[1024]) = {
0, 1, 2, 3, 5, 4, 4, 5,
5, 3, 6, 3, 5, 4, 6, 6,
6, 5, 5, 6, 6, 6, 6, 6,
6, 6, 6, 6, 6, 6, 6, 6,
6, 6, 6, 6, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7,
6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
6, 6, 6, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,
7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7, 7,