Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(283)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: source/libvpx/vp9/common/vp9_entropy.c

Issue 54923004: libvpx: Pull from upstream (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/deps/third_party/libvpx/
Patch Set: Created 7 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « source/libvpx/vp9/common/vp9_entropy.h ('k') | source/libvpx/vp9/common/vp9_entropymode.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved. 2 * Copyright (c) 2010 The WebM project authors. All Rights Reserved.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license 4 * Use of this source code is governed by a BSD-style license
5 * that can be found in the LICENSE file in the root of the source 5 * that can be found in the LICENSE file in the root of the source
6 * tree. An additional intellectual property rights grant can be found 6 * tree. An additional intellectual property rights grant can be found
7 * in the file PATENTS. All contributing project authors may 7 * in the file PATENTS. All contributing project authors may
8 * be found in the AUTHORS file in the root of the source tree. 8 * be found in the AUTHORS file in the root of the source tree.
9 */ 9 */
10 10
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 DECLARE_ALIGNED(16, const uint8_t, 45 DECLARE_ALIGNED(16, const uint8_t,
46 vp9_coefband_trans_4x4[MAXBAND_INDEX + 1]) = { 46 vp9_coefband_trans_4x4[MAXBAND_INDEX + 1]) = {
47 0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5, 47 0, 1, 1, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 5, 5, 5,
48 5, 5, 5, 5, 5, 5 48 5, 5, 5, 5, 5, 5
49 }; 49 };
50 50
51 DECLARE_ALIGNED(16, const uint8_t, vp9_pt_energy_class[MAX_ENTROPY_TOKENS]) = { 51 DECLARE_ALIGNED(16, const uint8_t, vp9_pt_energy_class[MAX_ENTROPY_TOKENS]) = {
52 0, 1, 2, 3, 3, 4, 4, 5, 5, 5, 5, 5 52 0, 1, 2, 3, 3, 4, 4, 5, 5, 5, 5, 5
53 }; 53 };
54 54
55 DECLARE_ALIGNED(16, const int16_t, vp9_default_scan_4x4[16]) = {
56 0, 4, 1, 5,
57 8, 2, 12, 9,
58 3, 6, 13, 10,
59 7, 14, 11, 15,
60 };
61 55
62 DECLARE_ALIGNED(16, const int16_t, vp9_col_scan_4x4[16]) = {
63 0, 4, 8, 1,
64 12, 5, 9, 2,
65 13, 6, 10, 3,
66 7, 14, 11, 15,
67 };
68
69 DECLARE_ALIGNED(16, const int16_t, vp9_row_scan_4x4[16]) = {
70 0, 1, 4, 2,
71 5, 3, 6, 8,
72 9, 7, 12, 10,
73 13, 11, 14, 15,
74 };
75
76 DECLARE_ALIGNED(16, const int16_t, vp9_default_scan_8x8[64]) = {
77 0, 8, 1, 16, 9, 2, 17, 24,
78 10, 3, 18, 25, 32, 11, 4, 26,
79 33, 19, 40, 12, 34, 27, 5, 41,
80 20, 48, 13, 35, 42, 28, 21, 6,
81 49, 56, 36, 43, 29, 7, 14, 50,
82 57, 44, 22, 37, 15, 51, 58, 30,
83 45, 23, 52, 59, 38, 31, 60, 53,
84 46, 39, 61, 54, 47, 62, 55, 63,
85 };
86
87 DECLARE_ALIGNED(16, const int16_t, vp9_col_scan_8x8[64]) = {
88 0, 8, 16, 1, 24, 9, 32, 17,
89 2, 40, 25, 10, 33, 18, 48, 3,
90 26, 41, 11, 56, 19, 34, 4, 49,
91 27, 42, 12, 35, 20, 57, 50, 28,
92 5, 43, 13, 36, 58, 51, 21, 44,
93 6, 29, 59, 37, 14, 52, 22, 7,
94 45, 60, 30, 15, 38, 53, 23, 46,
95 31, 61, 39, 54, 47, 62, 55, 63,
96 };
97
98 DECLARE_ALIGNED(16, const int16_t, vp9_row_scan_8x8[64]) = {
99 0, 1, 2, 8, 9, 3, 16, 10,
100 4, 17, 11, 24, 5, 18, 25, 12,
101 19, 26, 32, 6, 13, 20, 33, 27,
102 7, 34, 40, 21, 28, 41, 14, 35,
103 48, 42, 29, 36, 49, 22, 43, 15,
104 56, 37, 50, 44, 30, 57, 23, 51,
105 58, 45, 38, 52, 31, 59, 53, 46,
106 60, 39, 61, 47, 54, 55, 62, 63,
107 };
108
109 DECLARE_ALIGNED(16, const int16_t, vp9_default_scan_16x16[256]) = {
110 0, 16, 1, 32, 17, 2, 48, 33, 18, 3, 64, 34, 49, 19, 65, 80,
111 50, 4, 35, 66, 20, 81, 96, 51, 5, 36, 82, 97, 67, 112, 21, 52,
112 98, 37, 83, 113, 6, 68, 128, 53, 22, 99, 114, 84, 7, 129, 38, 69,
113 100, 115, 144, 130, 85, 54, 23, 8, 145, 39, 70, 116, 101, 131, 160, 146 ,
114 55, 86, 24, 71, 132, 117, 161, 40, 9, 102, 147, 176, 162, 87, 56, 25,
115 133, 118, 177, 148, 72, 103, 41, 163, 10, 192, 178, 88, 57, 134, 149, 119 ,
116 26, 164, 73, 104, 193, 42, 179, 208, 11, 135, 89, 165, 120, 150, 58, 194,
117 180, 27, 74, 209, 105, 151, 136, 43, 90, 224, 166, 195, 181, 121, 210, 59 ,
118 12, 152, 106, 167, 196, 75, 137, 225, 211, 240, 182, 122, 91, 28, 197, 13,
119 226, 168, 183, 153, 44, 212, 138, 107, 241, 60, 29, 123, 198, 184, 227, 169 ,
120 242, 76, 213, 154, 45, 92, 14, 199, 139, 61, 228, 214, 170, 185, 243, 108 ,
121 77, 155, 30, 15, 200, 229, 124, 215, 244, 93, 46, 186, 171, 201, 109, 140,
122 230, 62, 216, 245, 31, 125, 78, 156, 231, 47, 187, 202, 217, 94, 246, 141 ,
123 63, 232, 172, 110, 247, 157, 79, 218, 203, 126, 233, 188, 248, 95, 173, 142,
124 219, 111, 249, 234, 158, 127, 189, 204, 250, 235, 143, 174, 220, 205, 159, 251 ,
125 190, 221, 175, 236, 237, 191, 206, 252, 222, 253, 207, 238, 223, 254, 239, 255 ,
126 };
127
128 DECLARE_ALIGNED(16, const int16_t, vp9_col_scan_16x16[256]) = {
129 0, 16, 32, 48, 1, 64, 17, 80, 33, 96, 49, 2, 65, 112, 18, 81,
130 34, 128, 50, 97, 3, 66, 144, 19, 113, 35, 82, 160, 98, 51, 129, 4,
131 67, 176, 20, 114, 145, 83, 36, 99, 130, 52, 192, 5, 161, 68, 115, 21,
132 146, 84, 208, 177, 37, 131, 100, 53, 162, 224, 69, 6, 116, 193, 147, 85 ,
133 22, 240, 132, 38, 178, 101, 163, 54, 209, 117, 70, 7, 148, 194, 86, 179,
134 225, 23, 133, 39, 164, 8, 102, 210, 241, 55, 195, 118, 149, 71, 180, 24 ,
135 87, 226, 134, 165, 211, 40, 103, 56, 72, 150, 196, 242, 119, 9, 181, 227,
136 88, 166, 25, 135, 41, 104, 212, 57, 151, 197, 120, 73, 243, 182, 136, 167,
137 213, 89, 10, 228, 105, 152, 198, 26, 42, 121, 183, 244, 168, 58, 137, 229 ,
138 74, 214, 90, 153, 199, 184, 11, 106, 245, 27, 122, 230, 169, 43, 215, 59,
139 200, 138, 185, 246, 75, 12, 91, 154, 216, 231, 107, 28, 44, 201, 123, 170 ,
140 60, 247, 232, 76, 139, 13, 92, 217, 186, 248, 155, 108, 29, 124, 45, 202,
141 233, 171, 61, 14, 77, 140, 15, 249, 93, 30, 187, 156, 218, 46, 109, 125 ,
142 62, 172, 78, 203, 31, 141, 234, 94, 47, 188, 63, 157, 110, 250, 219, 79,
143 126, 204, 173, 142, 95, 189, 111, 235, 158, 220, 251, 127, 174, 143, 205, 236 ,
144 159, 190, 221, 252, 175, 206, 237, 191, 253, 222, 238, 207, 254, 223, 239, 255 ,
145 };
146
147 DECLARE_ALIGNED(16, const int16_t, vp9_row_scan_16x16[256]) = {
148 0, 1, 2, 16, 3, 17, 4, 18, 32, 5, 33, 19, 6, 34, 48, 20,
149 49, 7, 35, 21, 50, 64, 8, 36, 65, 22, 51, 37, 80, 9, 66, 52,
150 23, 38, 81, 67, 10, 53, 24, 82, 68, 96, 39, 11, 54, 83, 97, 69,
151 25, 98, 84, 40, 112, 55, 12, 70, 99, 113, 85, 26, 41, 56, 114, 100,
152 13, 71, 128, 86, 27, 115, 101, 129, 42, 57, 72, 116, 14, 87, 130, 102,
153 144, 73, 131, 117, 28, 58, 15, 88, 43, 145, 103, 132, 146, 118, 74, 160 ,
154 89, 133, 104, 29, 59, 147, 119, 44, 161, 148, 90, 105, 134, 162, 120, 176,
155 75, 135, 149, 30, 60, 163, 177, 45, 121, 91, 106, 164, 178, 150, 192, 136,
156 165, 179, 31, 151, 193, 76, 122, 61, 137, 194, 107, 152, 180, 208, 46, 166 ,
157 167, 195, 92, 181, 138, 209, 123, 153, 224, 196, 77, 168, 210, 182, 240, 108 ,
158 197, 62, 154, 225, 183, 169, 211, 47, 139, 93, 184, 226, 212, 241, 198, 170 ,
159 124, 155, 199, 78, 213, 185, 109, 227, 200, 63, 228, 242, 140, 214, 171, 186 ,
160 156, 229, 243, 125, 94, 201, 244, 215, 216, 230, 141, 187, 202, 79, 172, 110 ,
161 157, 245, 217, 231, 95, 246, 232, 126, 203, 247, 233, 173, 218, 142, 111, 158 ,
162 188, 248, 127, 234, 219, 249, 189, 204, 143, 174, 159, 250, 235, 205, 220, 175 ,
163 190, 251, 221, 191, 206, 236, 207, 237, 252, 222, 253, 223, 238, 239, 254, 255 ,
164 };
165
166 DECLARE_ALIGNED(16, const int16_t, vp9_default_scan_32x32[1024]) = {
167 0, 32, 1, 64, 33, 2, 96, 65, 34, 128, 3, 97, 66, 16 0, 129, 35, 98, 4, 67, 130, 161, 192, 36, 99, 224, 5, 162, 193, 68, 131, 37, 100,
168 225, 194, 256, 163, 69, 132, 6, 226, 257, 288, 195, 101, 164, 38, 258, 7, 227, 289, 133, 320, 70, 196, 165, 290, 259, 228, 3 9, 321, 102, 352, 8, 197,
169 71, 134, 322, 291, 260, 353, 384, 229, 166, 103, 40, 354, 323, 2 92, 135, 385, 198, 261, 72, 9, 416, 167, 386, 355, 230, 324, 104 , 293, 41, 417, 199, 136,
170 262, 387, 448, 325, 356, 10, 73, 418, 231, 168, 449, 294, 388, 105, 419, 263, 42, 200, 357, 450, 137, 480, 74, 326, 232, 11, 38 9, 169, 295, 420, 106, 451,
171 481, 358, 264, 327, 201, 43, 138, 512, 482, 390, 296, 233, 170, 421, 75, 452, 359, 12, 513, 265, 483, 328, 107, 202, 514, 544, 42 2, 391, 453, 139, 44, 234,
172 484, 297, 360, 171, 76, 515, 545, 266, 329, 454, 13, 423, 203, 108, 546, 485, 576, 298, 235, 140, 361, 330, 172, 547, 45, 455, 26 7, 577, 486, 77, 204, 362,
173 608, 14, 299, 578, 109, 236, 487, 609, 331, 141, 579, 46, 15, 173, 610, 363, 78, 205, 16, 110, 237, 611, 142, 47, 174, 79, 20 6, 17, 111, 238, 48, 143,
174 80, 175, 112, 207, 49, 18, 239, 81, 113, 19, 50, 82, 114, 51, 83, 115, 640, 516, 392, 268, 144, 20, 672, 641, 548, 517, 424 , 393, 300, 269, 176, 145,
175 52, 21, 704, 673, 642, 580, 549, 518, 456, 425, 394, 332, 301, 2 70, 208, 177, 146, 84, 53, 22, 736, 705, 674, 643, 612, 581, 550 , 519, 488, 457, 426, 395,
176 364, 333, 302, 271, 240, 209, 178, 147, 116, 85, 54, 23, 737, 706, 675, 613, 582, 551, 489, 458, 427, 365, 334, 303, 241, 210, 17 9, 117, 86, 55, 738, 707,
177 614, 583, 490, 459, 366, 335, 242, 211, 118, 87, 739, 615, 491, 367, 243, 119, 768, 644, 520, 396, 272, 148, 24, 800, 769, 676, 64 5, 552, 521, 428, 397, 304,
178 273, 180, 149, 56, 25, 832, 801, 770, 708, 677, 646, 584, 553, 522, 460, 429, 398, 336, 305, 274, 212, 181, 150, 88, 57, 26, 86 4, 833, 802, 771, 740, 709,
179 678, 647, 616, 585, 554, 523, 492, 461, 430, 399, 368, 337, 306, 275, 244, 213, 182, 151, 120, 89, 58, 27, 865, 834, 803, 741, 71 0, 679, 617, 586, 555, 493,
180 462, 431, 369, 338, 307, 245, 214, 183, 121, 90, 59, 866, 835, 742, 711, 618, 587, 494, 463, 370, 339, 246, 215, 122, 91, 867, 74 3, 619, 495, 371, 247, 123,
181 896, 772, 648, 524, 400, 276, 152, 28, 928, 897, 804, 773, 680, 649, 556, 525, 432, 401, 308, 277, 184, 153, 60, 29, 960, 929, 89 8, 836, 805, 774, 712, 681,
182 650, 588, 557, 526, 464, 433, 402, 340, 309, 278, 216, 185, 154, 92, 61, 30, 992, 961, 930, 899, 868, 837, 806, 775, 744, 713, 68 2, 651, 620, 589, 558, 527,
183 496, 465, 434, 403, 372, 341, 310, 279, 248, 217, 186, 155, 124, 93, 62, 31, 993, 962, 931, 869, 838, 807, 745, 714, 683, 621, 59 0, 559, 497, 466, 435, 373,
184 342, 311, 249, 218, 187, 125, 94, 63, 994, 963, 870, 839, 746, 715, 622, 591, 498, 467, 374, 343, 250, 219, 126, 95, 995, 871, 74 7, 623, 499, 375, 251, 127,
185 900, 776, 652, 528, 404, 280, 156, 932, 901, 808, 777, 684, 653, 560, 529, 436, 405, 312, 281, 188, 157, 964, 933, 902, 840, 809, 77 8, 716, 685, 654, 592, 561,
186 530, 468, 437, 406, 344, 313, 282, 220, 189, 158, 996, 965, 934, 903, 872, 841, 810, 779, 748, 717, 686, 655, 624, 593, 562, 531, 50 0, 469, 438, 407, 376, 345,
187 314, 283, 252, 221, 190, 159, 997, 966, 935, 873, 842, 811, 749, 718, 687, 625, 594, 563, 501, 470, 439, 377, 346, 315, 253, 222, 19 1, 998, 967, 874, 843, 750,
188 719, 626, 595, 502, 471, 378, 347, 254, 223, 999, 875, 751, 627, 503, 379, 255, 904, 780, 656, 532, 408, 284, 936, 905, 812, 781, 68 8, 657, 564, 533, 440, 409,
189 316, 285, 968, 937, 906, 844, 813, 782, 720, 689, 658, 596, 565, 534, 472, 441, 410, 348, 317, 286, 1000, 969, 938, 907, 876, 845, 81 4, 783, 752, 721, 690, 659,
190 628, 597, 566, 535, 504, 473, 442, 411, 380, 349, 318, 287, 1001, 970, 939, 877, 846, 815, 753, 722, 691, 629, 598, 567, 505, 474, 44 3, 381, 350, 319, 1002, 971,
191 878, 847, 754, 723, 630, 599, 506, 475, 382, 351, 1003, 879, 755, 631, 507, 383, 908, 784, 660, 536, 412, 940, 909, 816, 785, 692, 66 1, 568, 537, 444, 413, 972,
192 941, 910, 848, 817, 786, 724, 693, 662, 600, 569, 538, 476, 445, 414, 1004, 973, 942, 911, 880, 849, 818, 787, 756, 725, 694, 663, 63 2, 601, 570, 539, 508, 477,
193 446, 415, 1005, 974, 943, 881, 850, 819, 757, 726, 695, 633, 602, 571, 509, 478, 447, 1006, 975, 882, 851, 758, 727, 634, 603, 510, 47 9, 1007, 883, 759, 635, 511,
194 912, 788, 664, 540, 944, 913, 820, 789, 696, 665, 572, 541, 976, 945, 914, 852, 821, 790, 728, 697, 666, 604, 573, 542, 1008, 977, 94 6, 915, 884, 853, 822, 791,
195 760, 729, 698, 667, 636, 605, 574, 543, 1009, 978, 947, 885, 854, 823, 761, 730, 699, 637, 606, 575, 1010, 979, 886, 855, 762, 731, 63 8, 607, 1011, 887, 763, 639,
196 916, 792, 668, 948, 917, 824, 793, 700, 669, 980, 949, 918, 856, 825, 794, 732, 701, 670, 1012, 981, 950, 919, 888, 857, 826, 795, 76 4, 733, 702, 671, 1013, 982,
197 951, 889, 858, 827, 765, 734, 703, 1014, 983, 890, 859, 766, 735, 1 015, 891, 767, 920, 796, 952, 921, 828, 797, 984, 953, 922, 860, 82 9, 798, 1016, 985, 954, 923,
198 892, 861, 830, 799, 1017, 986, 955, 893, 862, 831, 1018, 987, 894, 863, 1019, 895, 924, 956, 925, 988, 957, 926, 1020, 989, 958, 927, 102 1, 990, 959, 1022, 991, 1023,
199 };
200 56
201 /* Array indices are identical to previously-existing CONTEXT_NODE indices */ 57 /* Array indices are identical to previously-existing CONTEXT_NODE indices */
202 58
203 const vp9_tree_index vp9_coef_tree[ 22] = /* corresponding _CONTEXT_NODEs */ 59 const vp9_tree_index vp9_coef_tree[TREE_SIZE(MAX_ENTROPY_TOKENS)] = {
204 {
205 -DCT_EOB_TOKEN, 2, /* 0 = EOB */ 60 -DCT_EOB_TOKEN, 2, /* 0 = EOB */
206 -ZERO_TOKEN, 4, /* 1 = ZERO */ 61 -ZERO_TOKEN, 4, /* 1 = ZERO */
207 -ONE_TOKEN, 6, /* 2 = ONE */ 62 -ONE_TOKEN, 6, /* 2 = ONE */
208 8, 12, /* 3 = LOW_VAL */ 63 8, 12, /* 3 = LOW_VAL */
209 -TWO_TOKEN, 10, /* 4 = TWO */ 64 -TWO_TOKEN, 10, /* 4 = TWO */
210 -THREE_TOKEN, -FOUR_TOKEN, /* 5 = THREE */ 65 -THREE_TOKEN, -FOUR_TOKEN, /* 5 = THREE */
211 14, 16, /* 6 = HIGH_LOW */ 66 14, 16, /* 6 = HIGH_LOW */
212 -DCT_VAL_CATEGORY1, -DCT_VAL_CATEGORY2, /* 7 = CAT_ONE */ 67 -DCT_VAL_CATEGORY1, -DCT_VAL_CATEGORY2, /* 7 = CAT_ONE */
213 18, 20, /* 8 = CAT_THREEFOUR */ 68 18, 20, /* 8 = CAT_THREEFOUR */
214 -DCT_VAL_CATEGORY3, -DCT_VAL_CATEGORY4, /* 9 = CAT_THREE */ 69 -DCT_VAL_CATEGORY3, -DCT_VAL_CATEGORY4, /* 9 = CAT_THREE */
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
412 267
413 static void init_bit_trees() { 268 static void init_bit_trees() {
414 init_bit_tree(cat1, 1); 269 init_bit_tree(cat1, 1);
415 init_bit_tree(cat2, 2); 270 init_bit_tree(cat2, 2);
416 init_bit_tree(cat3, 3); 271 init_bit_tree(cat3, 3);
417 init_bit_tree(cat4, 4); 272 init_bit_tree(cat4, 4);
418 init_bit_tree(cat5, 5); 273 init_bit_tree(cat5, 5);
419 init_bit_tree(cat6, 14); 274 init_bit_tree(cat6, 14);
420 } 275 }
421 276
422 const vp9_extra_bit vp9_extra_bits[12] = { 277 const vp9_extra_bit vp9_extra_bits[MAX_ENTROPY_TOKENS] = {
423 { 0, 0, 0, 0}, 278 { 0, 0, 0, 0},
424 { 0, 0, 0, 1}, 279 { 0, 0, 0, 1},
425 { 0, 0, 0, 2}, 280 { 0, 0, 0, 2},
426 { 0, 0, 0, 3}, 281 { 0, 0, 0, 3},
427 { 0, 0, 0, 4}, 282 { 0, 0, 0, 4},
428 { cat1, Pcat1, 1, 5}, 283 { cat1, Pcat1, 1, 5},
429 { cat2, Pcat2, 2, 7}, 284 { cat2, Pcat2, 2, 7},
430 { cat3, Pcat3, 3, 11}, 285 { cat3, Pcat3, 3, 11},
431 { cat4, Pcat4, 4, 19}, 286 { cat4, Pcat4, 4, 19},
432 { cat5, Pcat5, 5, 35}, 287 { cat5, Pcat5, 5, 35},
433 { cat6, Pcat6, 14, 67}, 288 { cat6, Pcat6, 14, 67},
434 { 0, 0, 0, 0} 289 { 0, 0, 0, 0}
435 }; 290 };
436 291
437 #include "vp9/common/vp9_default_coef_probs.h" 292 #include "vp9/common/vp9_default_coef_probs.h"
438 293
439 void vp9_default_coef_probs(VP9_COMMON *cm) { 294 void vp9_default_coef_probs(VP9_COMMON *cm) {
440 vp9_copy(cm->fc.coef_probs[TX_4X4], default_coef_probs_4x4); 295 vp9_copy(cm->fc.coef_probs[TX_4X4], default_coef_probs_4x4);
441 vp9_copy(cm->fc.coef_probs[TX_8X8], default_coef_probs_8x8); 296 vp9_copy(cm->fc.coef_probs[TX_8X8], default_coef_probs_8x8);
442 vp9_copy(cm->fc.coef_probs[TX_16X16], default_coef_probs_16x16); 297 vp9_copy(cm->fc.coef_probs[TX_16X16], default_coef_probs_16x16);
443 vp9_copy(cm->fc.coef_probs[TX_32X32], default_coef_probs_32x32); 298 vp9_copy(cm->fc.coef_probs[TX_32X32], default_coef_probs_32x32);
444 } 299 }
445 300
446 // Neighborhood 5-tuples for various scans and blocksizes,
447 // in {top, left, topleft, topright, bottomleft} order
448 // for each position in raster scan order.
449 // -1 indicates the neighbor does not exist.
450 DECLARE_ALIGNED(16, int16_t,
451 vp9_default_scan_4x4_neighbors[17 * MAX_NEIGHBORS]);
452 DECLARE_ALIGNED(16, int16_t,
453 vp9_col_scan_4x4_neighbors[17 * MAX_NEIGHBORS]);
454 DECLARE_ALIGNED(16, int16_t,
455 vp9_row_scan_4x4_neighbors[17 * MAX_NEIGHBORS]);
456 DECLARE_ALIGNED(16, int16_t,
457 vp9_col_scan_8x8_neighbors[65 * MAX_NEIGHBORS]);
458 DECLARE_ALIGNED(16, int16_t,
459 vp9_row_scan_8x8_neighbors[65 * MAX_NEIGHBORS]);
460 DECLARE_ALIGNED(16, int16_t,
461 vp9_default_scan_8x8_neighbors[65 * MAX_NEIGHBORS]);
462 DECLARE_ALIGNED(16, int16_t,
463 vp9_col_scan_16x16_neighbors[257 * MAX_NEIGHBORS]);
464 DECLARE_ALIGNED(16, int16_t,
465 vp9_row_scan_16x16_neighbors[257 * MAX_NEIGHBORS]);
466 DECLARE_ALIGNED(16, int16_t,
467 vp9_default_scan_16x16_neighbors[257 * MAX_NEIGHBORS]);
468 DECLARE_ALIGNED(16, int16_t,
469 vp9_default_scan_32x32_neighbors[1025 * MAX_NEIGHBORS]);
470
471 DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_4x4[16]);
472 DECLARE_ALIGNED(16, int16_t, vp9_col_iscan_4x4[16]);
473 DECLARE_ALIGNED(16, int16_t, vp9_row_iscan_4x4[16]);
474 DECLARE_ALIGNED(16, int16_t, vp9_col_iscan_8x8[64]);
475 DECLARE_ALIGNED(16, int16_t, vp9_row_iscan_8x8[64]);
476 DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_8x8[64]);
477 DECLARE_ALIGNED(16, int16_t, vp9_col_iscan_16x16[256]);
478 DECLARE_ALIGNED(16, int16_t, vp9_row_iscan_16x16[256]);
479 DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_16x16[256]);
480 DECLARE_ALIGNED(16, int16_t, vp9_default_iscan_32x32[1024]);
481
482 static int find_in_scan(const int16_t *scan, int l, int idx) {
483 int n, l2 = l * l;
484 for (n = 0; n < l2; n++) {
485 int rc = scan[n];
486 if (rc == idx)
487 return n;
488 }
489 assert(0);
490 return -1;
491 }
492 static void init_scan_neighbors(const int16_t *scan,
493 int16_t *iscan,
494 int l, int16_t *neighbors) {
495 int l2 = l * l;
496 int n, i, j;
497
498 // dc doesn't use this type of prediction
499 neighbors[MAX_NEIGHBORS * 0 + 0] = 0;
500 neighbors[MAX_NEIGHBORS * 0 + 1] = 0;
501 iscan[0] = find_in_scan(scan, l, 0);
502 for (n = 1; n < l2; n++) {
503 int rc = scan[n];
504 iscan[n] = find_in_scan(scan, l, n);
505 i = rc / l;
506 j = rc % l;
507 if (i > 0 && j > 0) {
508 // col/row scan is used for adst/dct, and generally means that
509 // energy decreases to zero much faster in the dimension in
510 // which ADST is used compared to the direction in which DCT
511 // is used. Likewise, we find much higher correlation between
512 // coefficients within the direction in which DCT is used.
513 // Therefore, if we use ADST/DCT, prefer the DCT neighbor coeff
514 // as a context. If ADST or DCT is used in both directions, we
515 // use the combination of the two as a context.
516 int a = (i - 1) * l + j;
517 int b = i * l + j - 1;
518 if (scan == vp9_col_scan_4x4 || scan == vp9_col_scan_8x8 ||
519 scan == vp9_col_scan_16x16) {
520 // in the col/row scan cases (as well as left/top edge cases), we set
521 // both contexts to the same value, so we can branchlessly do a+b+1>>1
522 // which automatically becomes a if a == b
523 neighbors[MAX_NEIGHBORS * n + 0] =
524 neighbors[MAX_NEIGHBORS * n + 1] = a;
525 } else if (scan == vp9_row_scan_4x4 || scan == vp9_row_scan_8x8 ||
526 scan == vp9_row_scan_16x16) {
527 neighbors[MAX_NEIGHBORS * n + 0] =
528 neighbors[MAX_NEIGHBORS * n + 1] = b;
529 } else {
530 neighbors[MAX_NEIGHBORS * n + 0] = a;
531 neighbors[MAX_NEIGHBORS * n + 1] = b;
532 }
533 } else if (i > 0) {
534 neighbors[MAX_NEIGHBORS * n + 0] =
535 neighbors[MAX_NEIGHBORS * n + 1] = (i - 1) * l + j;
536 } else {
537 assert(j > 0);
538 neighbors[MAX_NEIGHBORS * n + 0] =
539 neighbors[MAX_NEIGHBORS * n + 1] = i * l + j - 1;
540 }
541 assert(iscan[neighbors[MAX_NEIGHBORS * n + 0]] < n);
542 }
543 // one padding item so we don't have to add branches in code to handle
544 // calls to get_coef_context() for the token after the final dc token
545 neighbors[MAX_NEIGHBORS * l2 + 0] = 0;
546 neighbors[MAX_NEIGHBORS * l2 + 1] = 0;
547 }
548
549 void vp9_init_neighbors() {
550 init_scan_neighbors(vp9_default_scan_4x4, vp9_default_iscan_4x4, 4,
551 vp9_default_scan_4x4_neighbors);
552 init_scan_neighbors(vp9_row_scan_4x4, vp9_row_iscan_4x4, 4,
553 vp9_row_scan_4x4_neighbors);
554 init_scan_neighbors(vp9_col_scan_4x4, vp9_col_iscan_4x4, 4,
555 vp9_col_scan_4x4_neighbors);
556 init_scan_neighbors(vp9_default_scan_8x8, vp9_default_iscan_8x8, 8,
557 vp9_default_scan_8x8_neighbors);
558 init_scan_neighbors(vp9_row_scan_8x8, vp9_row_iscan_8x8, 8,
559 vp9_row_scan_8x8_neighbors);
560 init_scan_neighbors(vp9_col_scan_8x8, vp9_col_iscan_8x8, 8,
561 vp9_col_scan_8x8_neighbors);
562 init_scan_neighbors(vp9_default_scan_16x16, vp9_default_iscan_16x16, 16,
563 vp9_default_scan_16x16_neighbors);
564 init_scan_neighbors(vp9_row_scan_16x16, vp9_row_iscan_16x16, 16,
565 vp9_row_scan_16x16_neighbors);
566 init_scan_neighbors(vp9_col_scan_16x16, vp9_col_iscan_16x16, 16,
567 vp9_col_scan_16x16_neighbors);
568 init_scan_neighbors(vp9_default_scan_32x32, vp9_default_iscan_32x32, 32,
569 vp9_default_scan_32x32_neighbors);
570 }
571
572 const int16_t *vp9_get_coef_neighbors_handle(const int16_t *scan) {
573 if (scan == vp9_default_scan_4x4) {
574 return vp9_default_scan_4x4_neighbors;
575 } else if (scan == vp9_row_scan_4x4) {
576 return vp9_row_scan_4x4_neighbors;
577 } else if (scan == vp9_col_scan_4x4) {
578 return vp9_col_scan_4x4_neighbors;
579 } else if (scan == vp9_default_scan_8x8) {
580 return vp9_default_scan_8x8_neighbors;
581 } else if (scan == vp9_row_scan_8x8) {
582 return vp9_row_scan_8x8_neighbors;
583 } else if (scan == vp9_col_scan_8x8) {
584 return vp9_col_scan_8x8_neighbors;
585 } else if (scan == vp9_default_scan_16x16) {
586 return vp9_default_scan_16x16_neighbors;
587 } else if (scan == vp9_row_scan_16x16) {
588 return vp9_row_scan_16x16_neighbors;
589 } else if (scan == vp9_col_scan_16x16) {
590 return vp9_col_scan_16x16_neighbors;
591 } else {
592 assert(scan == vp9_default_scan_32x32);
593 return vp9_default_scan_32x32_neighbors;
594 }
595 }
596
597 void vp9_coef_tree_initialize() { 301 void vp9_coef_tree_initialize() {
598 vp9_init_neighbors();
599 init_bit_trees(); 302 init_bit_trees();
600 vp9_tokens_from_tree(vp9_coef_encodings, vp9_coef_tree); 303 vp9_tokens_from_tree(vp9_coef_encodings, vp9_coef_tree);
601 } 304 }
602 305
603 // #define COEF_COUNT_TESTING 306 // #define COEF_COUNT_TESTING
604 307
605 #define COEF_COUNT_SAT 24 308 #define COEF_COUNT_SAT 24
606 #define COEF_MAX_UPDATE_FACTOR 112 309 #define COEF_MAX_UPDATE_FACTOR 112
607 #define COEF_COUNT_SAT_KEY 24 310 #define COEF_COUNT_SAT_KEY 24
608 #define COEF_MAX_UPDATE_FACTOR_KEY 112 311 #define COEF_MAX_UPDATE_FACTOR_KEY 112
609 #define COEF_COUNT_SAT_AFTER_KEY 24 312 #define COEF_COUNT_SAT_AFTER_KEY 24
610 #define COEF_MAX_UPDATE_FACTOR_AFTER_KEY 128 313 #define COEF_MAX_UPDATE_FACTOR_AFTER_KEY 128
611 314
612 static void adapt_coef_probs(VP9_COMMON *cm, TX_SIZE tx_size, 315 static void adapt_coef_probs(VP9_COMMON *cm, TX_SIZE tx_size,
613 unsigned int count_sat, 316 unsigned int count_sat,
614 unsigned int update_factor) { 317 unsigned int update_factor) {
615 FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx]; 318 const FRAME_CONTEXT *pre_fc = &cm->frame_contexts[cm->frame_context_idx];
616 319
617 vp9_coeff_probs_model *dst_coef_probs = cm->fc.coef_probs[tx_size]; 320 vp9_coeff_probs_model *dst_coef_probs = cm->fc.coef_probs[tx_size];
618 vp9_coeff_probs_model *pre_coef_probs = pre_fc->coef_probs[tx_size]; 321 const vp9_coeff_probs_model *pre_coef_probs = pre_fc->coef_probs[tx_size];
619 vp9_coeff_count_model *coef_counts = cm->counts.coef[tx_size]; 322 vp9_coeff_count_model *coef_counts = cm->counts.coef[tx_size];
620 unsigned int (*eob_branch_count)[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS] = 323 unsigned int (*eob_branch_count)[REF_TYPES][COEF_BANDS][PREV_COEF_CONTEXTS] =
621 cm->counts.eob_branch[tx_size]; 324 cm->counts.eob_branch[tx_size];
622 int t, i, j, k, l; 325 int t, i, j, k, l;
623 unsigned int branch_ct[UNCONSTRAINED_NODES][2]; 326 unsigned int branch_ct[UNCONSTRAINED_NODES][2];
624 vp9_prob coef_probs[UNCONSTRAINED_NODES]; 327 vp9_prob coef_probs[UNCONSTRAINED_NODES];
625 328
626 for (i = 0; i < BLOCK_TYPES; ++i) 329 for (i = 0; i < BLOCK_TYPES; ++i)
627 for (j = 0; j < REF_TYPES; ++j) 330 for (j = 0; j < REF_TYPES; ++j)
628 for (k = 0; k < COEF_BANDS; ++k) 331 for (k = 0; k < COEF_BANDS; ++k)
629 for (l = 0; l < PREV_COEF_CONTEXTS; ++l) { 332 for (l = 0; l < PREV_COEF_CONTEXTS; ++l) {
630 if (l >= 3 && k == 0) 333 if (l >= 3 && k == 0)
631 continue; 334 continue;
632 vp9_tree_probs_from_distribution(vp9_coefmodel_tree, coef_probs, 335 vp9_tree_probs_from_distribution(vp9_coefmodel_tree, coef_probs,
633 branch_ct, coef_counts[i][j][k][l], 336 branch_ct, coef_counts[i][j][k][l],
634 0); 337 0);
635 branch_ct[0][1] = eob_branch_count[i][j][k][l] - branch_ct[0][0]; 338 branch_ct[0][1] = eob_branch_count[i][j][k][l] - branch_ct[0][0];
636 coef_probs[0] = get_binary_prob(branch_ct[0][0], branch_ct[0][1]); 339 coef_probs[0] = get_binary_prob(branch_ct[0][0], branch_ct[0][1]);
637 for (t = 0; t < UNCONSTRAINED_NODES; ++t) 340 for (t = 0; t < UNCONSTRAINED_NODES; ++t)
638 dst_coef_probs[i][j][k][l][t] = merge_probs( 341 dst_coef_probs[i][j][k][l][t] = merge_probs(
639 pre_coef_probs[i][j][k][l][t], coef_probs[t], 342 pre_coef_probs[i][j][k][l][t], coef_probs[t],
640 branch_ct[t], count_sat, update_factor); 343 branch_ct[t], count_sat, update_factor);
641 } 344 }
642 } 345 }
643 346
644 void vp9_adapt_coef_probs(VP9_COMMON *cm) { 347 void vp9_adapt_coef_probs(VP9_COMMON *cm) {
645 TX_SIZE t; 348 TX_SIZE t;
646 unsigned int count_sat, update_factor; 349 unsigned int count_sat, update_factor;
647 350
648 if (cm->frame_type == KEY_FRAME || cm->intra_only) { 351 if (frame_is_intra_only(cm)) {
649 update_factor = COEF_MAX_UPDATE_FACTOR_KEY; 352 update_factor = COEF_MAX_UPDATE_FACTOR_KEY;
650 count_sat = COEF_COUNT_SAT_KEY; 353 count_sat = COEF_COUNT_SAT_KEY;
651 } else if (cm->last_frame_type == KEY_FRAME) { 354 } else if (cm->last_frame_type == KEY_FRAME) {
652 update_factor = COEF_MAX_UPDATE_FACTOR_AFTER_KEY; /* adapt quickly */ 355 update_factor = COEF_MAX_UPDATE_FACTOR_AFTER_KEY; /* adapt quickly */
653 count_sat = COEF_COUNT_SAT_AFTER_KEY; 356 count_sat = COEF_COUNT_SAT_AFTER_KEY;
654 } else { 357 } else {
655 update_factor = COEF_MAX_UPDATE_FACTOR; 358 update_factor = COEF_MAX_UPDATE_FACTOR;
656 count_sat = COEF_COUNT_SAT; 359 count_sat = COEF_COUNT_SAT;
657 } 360 }
658 for (t = TX_4X4; t <= TX_32X32; t++) 361 for (t = TX_4X4; t <= TX_32X32; t++)
659 adapt_coef_probs(cm, t, count_sat, update_factor); 362 adapt_coef_probs(cm, t, count_sat, update_factor);
660 } 363 }
OLDNEW
« no previous file with comments | « source/libvpx/vp9/common/vp9_entropy.h ('k') | source/libvpx/vp9/common/vp9_entropymode.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698