Commit 3af36ea8 authored by Ronald S. Bultje's avatar Ronald S. Bultje
Browse files

Remove Y2 and Y-no-DC token types from the bitstream.

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