Commit 3120dbdd authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Redo banding for all transforms.

Now that the first AC coefficient in both directions use the same DC
as their context, there no longer is a purpose in letting both have
their own band. Merging these two bands allows us to split bands for
some of the very high-frequency AC bands.

In addition, I'm redoing the banding for the 1D-ADST col/row scans. I
don't think the old banding made any sense at all (it merged the last
coefficient of the first row/col in the same band as the first two of
the second row/col), which was clearly an oversight from the band being
applied in scan-order (rather than in their actual position). Now,
coefficients at the same position will be in the same band, regardless
what scan order is used. I think this makes most sense for the purpose
of banding, which is basically "predict energy for this coefficient
depending on the energy of context coefficients" (i.e. pt).

After full re-training, together with previous patch, derf gains about
1.2-1.3%, and hd/stdhd gain about 0.9-1.0%.

Change-Id: I7a0cc12ba724e88b278034113cb4adaaebf87e0c
parent 790fb132
......@@ -19,169 +19,169 @@ static const vp9_coeff_probs default_coef_probs_4x4[BLOCK_TYPES] = {
{ /* block Type 0 */
{ /* Intra */
{ /* Coeff Band 0 */
{ 201, 32, 166, 187, 155, 167, 175, 141, 211, 179, 126 },
{ 96, 39, 117, 157, 143, 158, 146, 131, 196, 159, 160 },
{ 13, 28, 54, 109, 114, 147, 133, 120, 205, 154, 188 }
{ 208, 32, 178, 198, 161, 167, 196, 147, 244, 194, 210 },
{ 102, 43, 132, 185, 148, 162, 185, 141, 237, 181, 215 },
{ 15, 36, 68, 143, 119, 151, 169, 133, 230, 173, 214 }
}, { /* Coeff Band 1 */
{ 128, 91, 156, 207, 155, 169, 211, 156, 244, 198, 224 },
{ 72, 84, 154, 208, 157, 170, 211, 156, 244, 198, 227 },
{ 34, 68, 123, 203, 149, 169, 211, 157, 243, 199, 227 },
{ 14, 53, 92, 187, 127, 159, 210, 156, 244, 198, 223 },
{ 3, 35, 56, 140, 108, 145, 200, 134, 245, 200, 227 },
{ 1, 15, 22, 68, 92, 136, 117, 107, 218, 158, 208 }
{ 71, 91, 178, 226, 169, 176, 232, 170, 252, 219, 231 },
{ 72, 88, 174, 226, 168, 176, 232, 170, 252, 219, 234 },
{ 40, 79, 154, 222, 161, 174, 231, 169, 251, 219, 238 },
{ 21, 68, 126, 211, 144, 167, 230, 167, 252, 219, 236 },
{ 7, 49, 84, 175, 121, 152, 223, 151, 251, 218, 237 },
{ 1, 20, 32, 100, 97, 140, 163, 116, 237, 186, 222 }
}, { /* Coeff Band 2 */
{ 24, 81, 164, 207, 158, 170, 205, 153, 241, 193, 221 },
{ 48, 75, 154, 206, 157, 169, 206, 154, 241, 193, 226 },
{ 18, 64, 123, 201, 150, 168, 205, 154, 240, 192, 225 },
{ 6, 51, 90, 187, 130, 161, 204, 152, 239, 192, 221 },
{ 1, 33, 52, 143, 106, 145, 195, 139, 239, 191, 220 },
{ 1, 15, 19, 65, 89, 135, 117, 105, 214, 157, 202 }
{ 108, 110, 206, 237, 182, 183, 239, 181, 252, 221, 245 },
{ 72, 98, 191, 236, 180, 182, 240, 183, 252, 223, 239 },
{ 26, 77, 152, 230, 166, 179, 239, 181, 252, 222, 241 },
{ 7, 57, 106, 212, 141, 167, 236, 173, 252, 223, 243 },
{ 1, 35, 60, 171, 110, 149, 225, 155, 251, 218, 240 },
{ 1, 14, 22, 90, 86, 134, 163, 116, 238, 181, 233 }
}, { /* Coeff Band 3 */
{ 46, 119, 186, 221, 170, 176, 214, 161, 241, 193, 228 },
{ 50, 100, 175, 224, 170, 177, 219, 165, 243, 197, 227 },
{ 17, 77, 137, 217, 157, 174, 219, 166, 243, 200, 230 },
{ 6, 58, 98, 195, 133, 162, 216, 160, 244, 201, 228 },
{ 2, 38, 61, 149, 111, 147, 200, 138, 243, 199, 225 },
{ 1, 17, 25, 76, 94, 138, 126, 109, 221, 161, 212 }
{ 105, 139, 222, 245, 196, 192, 245, 195, 253, 229, 255 },
{ 76, 118, 205, 245, 192, 192, 247, 198, 254, 230, 255 },
{ 21, 88, 164, 240, 175, 186, 246, 197, 255, 232, 255 },
{ 5, 63, 118, 222, 149, 172, 242, 185, 255, 230, 254 },
{ 1, 42, 74, 186, 120, 157, 227, 161, 253, 220, 250 },
{ 1, 18, 30, 97, 92, 136, 163, 118, 244, 184, 244 }
}, { /* Coeff Band 4 */
{ 56, 131, 201, 231, 179, 181, 227, 172, 248, 209, 235 },
{ 52, 105, 187, 233, 179, 183, 229, 175, 248, 213, 240 },
{ 12, 77, 142, 225, 162, 178, 229, 173, 250, 214, 247 },
{ 3, 53, 93, 197, 133, 163, 222, 163, 250, 211, 240 },
{ 1, 31, 50, 145, 104, 145, 203, 140, 247, 204, 233 },
{ 1, 13, 19, 66, 85, 132, 129, 105, 228, 166, 217 }
{ 143, 117, 233, 251, 207, 201, 250, 210, 255, 239, 128 },
{ 99, 104, 214, 249, 200, 199, 251, 211, 255, 238, 255 },
{ 26, 81, 170, 245, 183, 192, 250, 206, 255, 242, 255 },
{ 6, 60, 116, 226, 151, 176, 242, 187, 255, 235, 255 },
{ 1, 38, 65, 178, 114, 153, 224, 157, 254, 224, 255 },
{ 1, 15, 26, 86, 88, 133, 163, 110, 251, 197, 252 }
}, { /* Coeff Band 5 */
{ 93, 99, 221, 242, 194, 189, 240, 187, 251, 227, 199 },
{ 104, 81, 205, 242, 191, 190, 240, 187, 253, 227, 248 },
{ 39, 60, 155, 234, 172, 183, 237, 182, 254, 224, 251 },
{ 14, 42, 96, 203, 136, 166, 226, 166, 253, 216, 244 },
{ 4, 25, 49, 144, 102, 144, 205, 141, 249, 207, 238 },
{ 1, 10, 19, 65, 86, 131, 132, 103, 233, 171, 221 }
{ 155, 74, 238, 252, 215, 206, 252, 223, 255, 255, 128 },
{ 152, 64, 223, 250, 205, 201, 254, 219, 255, 255, 128 },
{ 67, 55, 182, 246, 187, 192, 251, 210, 255, 240, 128 },
{ 27, 44, 127, 227, 155, 176, 244, 186, 255, 240, 255 },
{ 9, 27, 69, 176, 115, 152, 227, 154, 255, 229, 255 },
{ 2, 11, 28, 91, 84, 133, 177, 115, 254, 210, 255 }
}
}, { /* Inter */
{ /* Coeff Band 0 */
{ 218, 134, 212, 233, 187, 182, 227, 169, 250, 213, 211 },
{ 137, 121, 176, 211, 169, 173, 200, 153, 236, 191, 201 },
{ 43, 96, 132, 181, 150, 164, 177, 141, 224, 175, 197 }
{ 207, 112, 234, 244, 192, 193, 246, 194, 255, 237, 255 },
{ 145, 120, 212, 233, 178, 183, 232, 177, 252, 216, 228 },
{ 77, 114, 177, 214, 164, 174, 210, 159, 245, 199, 230 }
}, { /* Coeff Band 1 */
{ 128, 178, 225, 239, 192, 188, 232, 178, 250, 216, 243 },
{ 29, 147, 210, 239, 191, 189, 231, 176, 249, 215, 239 },
{ 20, 101, 159, 236, 177, 189, 231, 178, 249, 214, 248 },
{ 7, 69, 107, 219, 132, 168, 235, 185, 250, 214, 245 },
{ 2, 40, 62, 150, 106, 142, 228, 146, 252, 223, 242 },
{ 1, 18, 28, 74, 96, 139, 127, 103, 234, 175, 228 }
{ 93, 174, 243, 248, 205, 200, 245, 195, 255, 232, 255 },
{ 100, 144, 231, 248, 204, 200, 244, 193, 255, 232, 255 },
{ 28, 101, 186, 247, 194, 199, 244, 194, 255, 232, 255 },
{ 9, 73, 132, 238, 155, 186, 245, 197, 255, 232, 250 },
{ 2, 44, 76, 187, 112, 151, 240, 172, 255, 235, 249 },
{ 1, 19, 33, 98, 92, 138, 176, 113, 252, 208, 249 }
}, { /* Coeff Band 2 */
{ 38, 163, 224, 240, 192, 188, 234, 178, 251, 217, 233 },
{ 34, 134, 206, 239, 189, 188, 233, 177, 251, 218, 248 },
{ 14, 95, 156, 234, 171, 186, 234, 179, 251, 220, 238 },
{ 6, 68, 110, 215, 133, 166, 236, 181, 251, 217, 235 },
{ 2, 43, 68, 155, 111, 146, 223, 144, 252, 224, 239 },
{ 1, 21, 32, 86, 98, 139, 136, 110, 235, 174, 221 }
{ 116, 175, 246, 250, 212, 202, 248, 198, 255, 238, 255 },
{ 78, 142, 231, 250, 208, 203, 249, 200, 255, 241, 255 },
{ 14, 93, 177, 245, 186, 196, 248, 198, 255, 241, 255 },
{ 4, 65, 122, 227, 148, 177, 244, 186, 255, 241, 243 },
{ 1, 38, 69, 180, 111, 152, 235, 162, 255, 237, 247 },
{ 1, 18, 30, 101, 89, 133, 190, 116, 255, 219, 246 }
}, { /* Coeff Band 3 */
{ 61, 173, 225, 241, 195, 190, 236, 181, 252, 221, 221 },
{ 39, 134, 205, 241, 191, 191, 237, 182, 252, 220, 239 },
{ 6, 82, 144, 233, 167, 183, 237, 182, 252, 220, 242 },
{ 2, 53, 92, 207, 130, 165, 232, 172, 253, 220, 243 },
{ 1, 28, 49, 146, 98, 141, 217, 146, 252, 216, 245 },
{ 1, 12, 21, 68, 88, 132, 140, 101, 241, 182, 236 }
{ 138, 183, 249, 253, 220, 209, 252, 210, 255, 251, 128 },
{ 93, 147, 237, 252, 213, 209, 253, 213, 255, 251, 128 },
{ 21, 104, 187, 247, 185, 196, 252, 210, 255, 249, 128 },
{ 6, 73, 131, 225, 147, 174, 248, 190, 255, 248, 128 },
{ 1, 47, 83, 189, 119, 155, 239, 167, 255, 246, 128 },
{ 1, 26, 44, 130, 96, 139, 209, 129, 255, 235, 255 }
}, { /* Coeff Band 4 */
{ 83, 175, 229, 246, 201, 195, 241, 190, 253, 225, 249 },
{ 49, 134, 211, 245, 195, 195, 242, 192, 254, 228, 252 },
{ 12, 86, 154, 237, 169, 185, 242, 190, 254, 227, 252 },
{ 4, 56, 100, 208, 134, 166, 235, 173, 254, 228, 247 },
{ 1, 33, 57, 157, 104, 146, 217, 148, 253, 219, 250 },
{ 1, 16, 27, 82, 89, 132, 156, 108, 245, 188, 241 }
{ 188, 143, 252, 255, 228, 218, 253, 218, 255, 209, 128 },
{ 137, 124, 241, 253, 215, 211, 254, 221, 255, 255, 128 },
{ 32, 89, 188, 248, 186, 198, 254, 216, 255, 253, 128 },
{ 7, 61, 122, 231, 146, 176, 252, 201, 255, 250, 128 },
{ 1, 34, 66, 186, 103, 149, 246, 176, 255, 249, 128 },
{ 1, 18, 34, 115, 91, 134, 217, 124, 255, 233, 255 }
}, { /* Coeff Band 5 */
{ 142, 137, 243, 252, 218, 207, 250, 205, 255, 241, 128 },
{ 117, 102, 224, 250, 204, 202, 249, 204, 255, 238, 255 },
{ 40, 69, 169, 242, 175, 190, 247, 198, 255, 238, 209 },
{ 14, 47, 106, 213, 135, 168, 239, 177, 255, 233, 244 },
{ 4, 26, 53, 152, 99, 143, 220, 147, 254, 224, 252 },
{ 1, 14, 25, 79, 87, 130, 160, 105, 249, 195, 249 }
{ 198, 92, 253, 255, 231, 222, 255, 230, 128, 128, 128 },
{ 189, 79, 244, 254, 220, 217, 255, 237, 255, 255, 128 },
{ 78, 61, 200, 252, 196, 207, 255, 231, 255, 255, 128 },
{ 34, 50, 146, 242, 161, 187, 255, 222, 255, 255, 128 },
{ 11, 38, 93, 215, 122, 159, 253, 202, 255, 255, 128 },
{ 1, 31, 55, 143, 102, 143, 227, 148, 255, 238, 128 }
}
}
}, { /* block Type 1 */
{ /* Intra */
{ /* Coeff Band 0 */
{ 198, 34, 200, 220, 173, 177, 207, 161, 219, 190, 170 },
{ 100, 41, 144, 187, 152, 166, 179, 145, 219, 175, 182 },
{ 24, 38, 81, 143, 126, 153, 161, 131, 222, 169, 201 }
{ 207, 35, 219, 243, 195, 192, 243, 188, 251, 232, 238 },
{ 126, 46, 182, 230, 177, 182, 228, 171, 248, 214, 232 },
{ 51, 47, 125, 196, 147, 166, 206, 151, 245, 199, 229 }
}, { /* Coeff Band 1 */
{ 128, 132, 197, 226, 174, 179, 225, 167, 250, 206, 238 },
{ 116, 117, 189, 226, 173, 179, 224, 168, 250, 212, 210 },
{ 58, 97, 162, 226, 170, 181, 225, 170, 250, 210, 255 },
{ 29, 76, 128, 216, 147, 171, 226, 171, 249, 217, 232 },
{ 13, 52, 84, 175, 121, 152, 223, 155, 251, 212, 241 },
{ 6, 29, 44, 102, 105, 142, 153, 115, 236, 180, 223 }
{ 114, 124, 220, 244, 197, 192, 242, 189, 253, 226, 255 },
{ 142, 116, 213, 243, 194, 191, 241, 188, 252, 226, 255 },
{ 81, 101, 190, 242, 188, 190, 242, 190, 253, 229, 255 },
{ 42, 83, 155, 235, 166, 183, 241, 190, 253, 227, 246 },
{ 16, 62, 104, 205, 133, 161, 238, 176, 254, 227, 250 },
{ 6, 40, 60, 132, 109, 145, 190, 128, 248, 202, 239 }
}, { /* Coeff Band 2 */
{ 84, 90, 195, 230, 178, 181, 225, 171, 248, 204, 249 },
{ 75, 85, 186, 227, 174, 179, 225, 170, 249, 213, 246 },
{ 49, 75, 163, 224, 169, 179, 225, 171, 249, 211, 251 },
{ 27, 63, 131, 216, 150, 171, 225, 168, 250, 211, 239 },
{ 10, 47, 88, 181, 124, 155, 221, 156, 249, 211, 241 },
{ 3, 29, 47, 105, 106, 141, 153, 118, 233, 176, 221 }
{ 139, 149, 228, 248, 205, 198, 244, 196, 255, 223, 255 },
{ 115, 127, 221, 248, 202, 198, 245, 198, 255, 228, 255 },
{ 43, 100, 189, 246, 195, 195, 244, 196, 254, 234, 228 },
{ 13, 77, 141, 238, 168, 187, 243, 191, 255, 232, 255 },
{ 3, 49, 88, 203, 125, 160, 237, 178, 253, 227, 251 },
{ 1, 23, 41, 118, 97, 136, 191, 127, 250, 207, 247 }
}, { /* Coeff Band 3 */
{ 98, 143, 209, 237, 187, 186, 233, 177, 251, 216, 255 },
{ 81, 118, 204, 237, 186, 186, 232, 178, 252, 213, 255 },
{ 30, 91, 172, 234, 179, 184, 235, 177, 252, 221, 248 },
{ 10, 68, 124, 223, 153, 176, 232, 175, 252, 221, 253 },
{ 2, 41, 73, 181, 115, 153, 226, 163, 252, 217, 240 },
{ 1, 18, 30, 93, 94, 134, 168, 113, 245, 192, 242 }
{ 119, 185, 236, 251, 216, 205, 249, 202, 253, 237, 255 },
{ 89, 140, 224, 251, 211, 205, 250, 208, 255, 241, 255 },
{ 34, 105, 189, 248, 195, 197, 250, 208, 255, 245, 255 },
{ 14, 78, 142, 235, 166, 182, 246, 194, 255, 242, 255 },
{ 5, 49, 90, 196, 128, 160, 235, 165, 255, 237, 255 },
{ 1, 22, 41, 114, 97, 139, 180, 124, 252, 201, 249 }
}, { /* Coeff Band 4 */
{ 119, 172, 224, 244, 198, 193, 239, 185, 251, 222, 255 },
{ 89, 126, 213, 245, 196, 195, 241, 192, 254, 226, 255 },
{ 35, 94, 180, 239, 182, 187, 242, 192, 255, 232, 255 },
{ 11, 68, 129, 222, 156, 174, 237, 177, 253, 226, 255 },
{ 2, 42, 78, 184, 121, 156, 225, 159, 253, 215, 240 },
{ 1, 20, 35, 104, 96, 137, 171, 120, 246, 194, 248 }
{ 162, 142, 244, 254, 228, 215, 255, 230, 128, 128, 128 },
{ 129, 120, 231, 253, 216, 210, 255, 228, 255, 255, 128 },
{ 44, 90, 189, 249, 195, 199, 253, 217, 255, 240, 128 },
{ 14, 65, 132, 234, 158, 181, 249, 203, 255, 248, 128 },
{ 3, 38, 72, 188, 112, 154, 239, 171, 255, 243, 128 },
{ 1, 17, 39, 110, 86, 141, 201, 123, 255, 240, 128 }
}, { /* Coeff Band 5 */
{ 150, 126, 240, 252, 218, 204, 248, 204, 255, 255, 128 },
{ 126, 100, 224, 250, 207, 202, 249, 207, 255, 244, 128 },
{ 49, 77, 183, 245, 188, 194, 248, 202, 255, 255, 255 },
{ 15, 55, 125, 225, 152, 175, 242, 183, 255, 235, 255 },
{ 3, 32, 64, 174, 109, 152, 229, 158, 255, 225, 255 },
{ 1, 18, 33, 96, 89, 135, 179, 117, 252, 208, 255 }
{ 167, 96, 247, 255, 230, 218, 249, 231, 255, 255, 128 },
{ 163, 84, 234, 253, 214, 209, 255, 231, 255, 255, 128 },
{ 70, 63, 185, 249, 189, 197, 255, 230, 255, 255, 128 },
{ 30, 44, 132, 238, 157, 180, 251, 210, 255, 220, 128 },
{ 13, 30, 80, 195, 121, 153, 243, 179, 255, 224, 128 },
{ 5, 13, 38, 103, 109, 128, 196, 147, 255, 255, 128 }
}
}, { /* Inter */
{ /* Coeff Band 0 */
{ 242, 100, 229, 235, 190, 184, 229, 172, 249, 219, 192 },
{ 162, 103, 196, 217, 175, 175, 208, 157, 237, 198, 191 },
{ 60, 109, 167, 206, 167, 172, 192, 150, 235, 185, 211 }
{ 242, 90, 246, 244, 200, 192, 242, 189, 255, 234, 255 },
{ 186, 102, 228, 233, 187, 182, 231, 172, 254, 225, 252 },
{ 102, 108, 203, 228, 181, 180, 218, 167, 243, 201, 223 }
}, { /* Coeff Band 1 */
{ 128, 183, 242, 246, 208, 196, 237, 185, 254, 222, 255 },
{ 105, 152, 229, 247, 209, 198, 239, 185, 252, 225, 255 },
{ 43, 109, 183, 247, 200, 203, 237, 186, 254, 212, 171 },
{ 17, 76, 124, 238, 149, 185, 241, 198, 252, 213, 255 },
{ 7, 45, 71, 176, 108, 145, 242, 172, 253, 224, 248 },
{ 4, 26, 39, 95, 100, 137, 165, 109, 244, 196, 228 }
{ 152, 169, 250, 253, 223, 209, 251, 208, 255, 250, 128 },
{ 164, 149, 242, 253, 222, 209, 249, 207, 253, 238, 255 },
{ 63, 108, 204, 252, 215, 211, 251, 211, 255, 242, 128 },
{ 39, 83, 153, 248, 175, 199, 250, 214, 255, 245, 128 },
{ 31, 66, 108, 214, 130, 161, 251, 196, 255, 237, 128 },
{ 27, 65, 71, 150, 112, 149, 213, 133, 255, 230, 255 }
}, { /* Coeff Band 2 */
{ 110, 129, 232, 252, 220, 211, 242, 190, 253, 217, 255 },
{ 82, 121, 222, 250, 211, 204, 243, 194, 242, 225, 219 },
{ 43, 97, 185, 247, 198, 201, 241, 193, 251, 221, 255 },
{ 22, 75, 135, 238, 154, 184, 243, 200, 252, 214, 255 },
{ 9, 51, 86, 187, 118, 151, 242, 173, 252, 226, 221 },
{ 3, 31, 49, 112, 107, 141, 169, 118, 240, 192, 232 }
{ 161, 174, 250, 254, 226, 215, 254, 226, 255, 230, 128 },
{ 133, 150, 239, 254, 222, 213, 254, 225, 255, 255, 128 },
{ 32, 105, 197, 252, 206, 207, 253, 220, 255, 255, 128 },
{ 10, 78, 147, 245, 173, 193, 253, 212, 255, 255, 128 },
{ 2, 49, 99, 221, 133, 164, 250, 198, 255, 252, 128 },
{ 1, 26, 53, 154, 96, 135, 234, 142, 255, 240, 128 }
}, { /* Coeff Band 3 */
{ 127, 158, 236, 251, 219, 208, 244, 199, 255, 235, 255 },
{ 91, 134, 226, 250, 214, 204, 244, 196, 252, 228, 183 },
{ 23, 98, 182, 247, 196, 197, 245, 195, 255, 224, 255 },
{ 8, 69, 125, 233, 157, 182, 241, 186, 254, 232, 255 },
{ 2, 42, 72, 187, 113, 152, 233, 170, 253, 228, 249 },
{ 1, 19, 32, 95, 94, 134, 172, 111, 249, 199, 248 }
{ 160, 187, 251, 255, 234, 223, 255, 233, 128, 128, 128 },
{ 131, 155, 241, 255, 228, 222, 255, 232, 255, 255, 128 },
{ 42, 108, 198, 253, 207, 212, 255, 234, 255, 255, 128 },
{ 18, 81, 151, 246, 176, 194, 254, 222, 255, 255, 128 },
{ 9, 60, 112, 225, 144, 167, 252, 199, 255, 255, 128 },
{ 5, 35, 49, 163, 113, 150, 237, 118, 255, 255, 128 }
}, { /* Coeff Band 4 */
{ 145, 182, 245, 253, 228, 210, 250, 209, 255, 235, 128 },
{ 106, 140, 233, 252, 220, 209, 250, 209, 255, 238, 128 },
{ 41, 103, 195, 248, 196, 199, 249, 209, 255, 239, 128 },
{ 13, 76, 137, 231, 161, 181, 244, 187, 255, 239, 255 },
{ 2, 45, 79, 193, 121, 158, 234, 168, 255, 231, 255 },
{ 1, 20, 34, 110, 94, 135, 195, 124, 251, 203, 255 }
{ 195, 141, 253, 255, 242, 232, 255, 255, 128, 128, 128 },
{ 169, 128, 245, 255, 235, 227, 255, 248, 128, 128, 128 },
{ 62, 91, 204, 255, 216, 220, 255, 233, 128, 128, 128 },
{ 23, 70, 150, 248, 178, 202, 255, 223, 128, 128, 128 },
{ 2, 44, 78, 220, 110, 164, 255, 209, 128, 128, 128 },
{ 1, 1, 128, 255, 255, 128, 128, 128, 128, 128, 128 }
}, { /* Coeff Band 5 */
{ 182, 133, 250, 255, 234, 217, 255, 215, 128, 128, 128 },
{ 158, 113, 240, 254, 223, 212, 254, 225, 255, 255, 128 },
{ 68, 83, 196, 250, 200, 201, 253, 217, 255, 255, 128 },
{ 18, 60, 130, 235, 158, 180, 247, 193, 255, 245, 128 },
{ 3, 34, 66, 186, 108, 149, 239, 174, 255, 232, 128 },
{ 1, 20, 36, 111, 94, 145, 195, 123, 250, 212, 255 }
{ 195, 104, 253, 255, 246, 246, 255, 171, 128, 128, 128 },
{ 197, 92, 248, 255, 239, 228, 255, 239, 128, 128, 128 },
{ 88, 71, 214, 255, 219, 220, 255, 244, 128, 128, 128 },
{ 39, 56, 160, 250, 187, 204, 255, 255, 128, 128, 128 },
{ 18, 28, 90, 217, 81, 137, 255, 128, 128, 128, 128 },
{ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }
}
}
}
......@@ -190,169 +190,169 @@ static const vp9_coeff_probs default_coef_probs_8x8[BLOCK_TYPES] = {
{ /* block Type 0 */
{ /* Intra */
{ /* Coeff Band 0 */
{ 173, 27, 142, 173, 151, 161, 162, 140, 196, 179, 128 },
{ 56, 32, 85, 136, 131, 154, 142, 123, 202, 161, 161 },
{ 8, 26, 47, 104, 110, 146, 130, 119, 197, 153, 170 }
{ 196, 40, 199, 180, 158, 161, 172, 135, 226, 183, 140 },
{ 83, 38, 128, 153, 142, 157, 155, 128, 222, 164, 202 },
{ 10, 29, 55, 116, 113, 146, 150, 122, 223, 169, 200 }
}, { /* Coeff Band 1 */
{ 128, 124, 161, 206, 156, 170, 210, 157, 241, 196, 214 },
{ 56, 118, 160, 206, 157, 169, 208, 154, 241, 197, 218 },
{ 33, 102, 144, 203, 153, 169, 210, 156, 241, 198, 237 },
{ 17, 83, 121, 195, 143, 165, 206, 154, 241, 196, 219 },
{ 6, 56, 86, 168, 125, 155, 200, 145, 242, 194, 221 },
{ 1, 25, 37, 93, 103, 141, 132, 117, 211, 158, 195 }
{ 33, 114, 160, 211, 155, 169, 223, 162, 248, 212, 215 },
{ 69, 107, 155, 210, 154, 169, 224, 163, 248, 212, 216 },
{ 30, 91, 138, 207, 150, 168, 223, 162, 248, 212, 216 },
{ 12, 74, 115, 200, 140, 164, 222, 160, 249, 212, 219 },
{ 4, 52, 80, 172, 121, 153, 216, 149, 249, 212, 226 },
{ 1, 27, 40, 105, 101, 141, 157, 120, 231, 177, 210 }
}, { /* Coeff Band 2 */
{ 18, 89, 158, 208, 159, 170, 212, 158, 243, 205, 225 },
{ 28, 86, 153, 207, 156, 170, 213, 156, 245, 200, 232 },
{ 18, 77, 135, 202, 150, 167, 212, 156, 242, 207, 217 },
{ 11, 65, 113, 192, 139, 161, 208, 151, 243, 202, 217 },
{ 4, 46, 78, 163, 122, 153, 200, 142, 242, 196, 219 },
{ 1, 22, 34, 90, 101, 140, 132, 114, 212, 159, 197 }
{ 38, 159, 190, 227, 171, 177, 229, 172, 250, 214, 237 },
{ 34, 130, 182, 229, 173, 180, 231, 174, 249, 215, 234 },
{ 10, 97, 153, 226, 164, 178, 232, 175, 250, 215, 241 },
{ 3, 71, 115, 213, 145, 170, 230, 171, 251, 217, 235 },
{ 1, 41, 68, 172, 114, 152, 219, 154, 250, 212, 235 },
{ 1, 16, 27, 88, 90, 135, 155, 113, 235, 180, 216 }
}, { /* Coeff Band 3 */
{ 29, 153, 186, 219, 167, 175, 214, 159, 243, 201, 228 },
{ 37, 129, 180, 223, 170, 177, 219, 168, 243, 201, 222 },
{ 12, 95, 149, 219, 161, 174, 219, 167, 241, 203, 234 },
{ 3, 67, 108, 202, 140, 165, 218, 161, 246, 204, 223 },
{ 1, 38, 61, 156, 112, 149, 201, 144, 242, 197, 220 },
{ 1, 15, 22, 72, 91, 133, 126, 108, 218, 160, 206 }
{ 41, 184, 214, 238, 187, 186, 235, 180, 252, 217, 236 },
{ 24, 142, 199, 241, 188, 189, 237, 184, 252, 220, 235 },
{ 6, 97, 159, 235, 172, 184, 239, 185, 252, 221, 243 },
{ 1, 63, 110, 214, 144, 170, 234, 174, 253, 223, 243 },
{ 1, 32, 58, 166, 109, 149, 218, 152, 251, 215, 238 },
{ 1, 12, 21, 78, 85, 131, 152, 109, 236, 180, 224 }
}, { /* Coeff Band 4 */
{ 33, 182, 210, 231, 183, 184, 223, 169, 244, 207, 226 },
{ 23, 137, 194, 236, 183, 187, 228, 176, 244, 204, 224 },
{ 4, 89, 147, 228, 166, 179, 229, 176, 247, 208, 234 },
{ 1, 56, 95, 200, 134, 164, 222, 164, 249, 209, 226 },
{ 1, 28, 47, 141, 101, 144, 199, 139, 245, 199, 227 },
{ 1, 11, 16, 58, 84, 131, 118, 101, 221, 160, 209 }
{ 54, 207, 231, 245, 201, 193, 238, 186, 252, 221, 220 },
{ 32, 156, 213, 246, 198, 195, 242, 192, 252, 224, 245 },
{ 7, 98, 164, 240, 177, 187, 243, 193, 252, 227, 244 },
{ 2, 62, 108, 216, 143, 170, 237, 177, 254, 227, 248 },
{ 1, 32, 57, 165, 108, 148, 219, 152, 252, 217, 243 },
{ 1, 13, 22, 79, 87, 132, 153, 109, 240, 182, 232 }
}, { /* Coeff Band 5 */
{ 58, 203, 233, 246, 208, 196, 233, 178, 251, 214, 255 },
{ 37, 147, 214, 246, 201, 197, 238, 191, 249, 217, 213 },
{ 7, 93, 160, 237, 175, 186, 239, 186, 251, 217, 240 },
{ 1, 57, 98, 206, 136, 165, 229, 168, 252, 220, 235 },
{ 1, 30, 51, 146, 103, 145, 206, 142, 249, 207, 229 },
{ 1, 12, 20, 68, 87, 132, 133, 103, 231, 169, 214 }
{ 89, 208, 239, 250, 216, 200, 240, 190, 255, 222, 219 },
{ 53, 155, 223, 250, 209, 202, 245, 199, 253, 225, 246 },
{ 12, 102, 170, 243, 183, 192, 246, 198, 254, 230, 255 },
{ 3, 67, 111, 218, 144, 171, 239, 180, 254, 231, 248 },
{ 1, 38, 60, 164, 108, 148, 221, 152, 253, 220, 246 },
{ 1, 18, 26, 81, 88, 132, 157, 108, 245, 188, 241 }
}
}, { /* Inter */
{ /* Coeff Band 0 */
{ 201, 133, 221, 227, 187, 180, 210, 161, 242, 194, 232 },
{ 122, 113, 177, 201, 170, 170, 178, 146, 218, 175, 191 },
{ 31, 85, 125, 175, 149, 163, 169, 138, 218, 171, 187 }
{ 205, 121, 244, 237, 187, 188, 229, 174, 248, 215, 228 },
{ 140, 120, 211, 219, 174, 177, 207, 158, 241, 195, 214 },
{ 51, 100, 152, 198, 155, 168, 199, 148, 240, 193, 207 }
}, { /* Coeff Band 1 */
{ 128, 195, 224, 236, 188, 184, 230, 173, 249, 212, 245 },
{ 41, 172, 213, 235, 185, 186, 230, 173, 250, 211, 235 },
{ 31, 131, 178, 232, 175, 185, 229, 174, 250, 211, 236 },
{ 14, 96, 134, 219, 146, 172, 230, 178, 251, 214, 239 },
{ 5, 62, 87, 169, 120, 151, 223, 149, 250, 217, 239 },
{ 1, 30, 41, 90, 105, 142, 131, 111, 224, 168, 199 }
{ 66, 196, 236, 247, 202, 197, 243, 193, 254, 228, 246 },
{ 99, 164, 223,