Commit 813c6c39 authored by Deb Mukherjee's avatar Deb Mukherjee
Browse files

Expanding the coefficient encoding contexts

This patch expands the set of prev contexts used for video coding
from 3 to 4.

There is a small improvement of the order of 0.08% for derf and
0.15% on the HD set. The tests were rerun after the various merges
last week. There are two columns in each test - the first are the
results with the mbskip change, and the second with expanded contexts
added on top of that.

Derf:
http://www.corp.google.com/~debargha/vp8_results/explibvpx_newentropy_expcontext.html

HD:
http://www.corp.google.com/~debargha/vp8_results/explibvpx_hd_newentropy_expcontext.html

Rebased.

Broke up 80 char lines.

Change-Id: I82d2e72d054e530cbf5ce9aa0e6d85c582965675
parent 3b909a6f
......@@ -226,6 +226,7 @@ EXPERIMENT_LIST="
newentropy
newupdate
superblocks
expanded_coef_context
"
CONFIG_LIST="
external_build
......
......@@ -72,7 +72,6 @@ extern const unsigned char vp8_block2above[25];
extern const unsigned char vp8_block2left_8x8[25];
extern const unsigned char vp8_block2above_8x8[25];
#define VP8_COMBINEENTROPYCONTEXTS( Dest, A, B) \
Dest = ((A)!=0) + ((B)!=0);
......
This diff is collapsed.
......@@ -21,168 +21,328 @@ static const vp8_prob default_coef_probs [BLOCK_TYPES]
{ /* 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 },
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
#else
{ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }
#endif
},
{ /* Coeff Band ( 1 )*/
{ 253, 136, 254, 255, 228, 219, 128, 128, 128, 128, 128 },
{ 189, 129, 242, 255, 227, 213, 255, 219, 128, 128, 128 },
{ 106, 126, 227, 252, 214, 209, 255, 255, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 106, 126, 227, 252, 214, 209, 255, 255, 128, 128, 128 },
{ 90, 116, 227, 252, 214, 209, 255, 255, 128, 128, 128 },
#else
{ 106, 126, 227, 252, 214, 209, 255, 255, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 2 )*/
{ 1, 98, 248, 255, 236, 226, 255, 255, 128, 128, 128 },
{ 181, 133, 238, 254, 221, 234, 255, 154, 128, 128, 128 },
{ 78, 134, 202, 247, 198, 180, 255, 219, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 78, 134, 202, 247, 198, 180, 255, 219, 128, 128, 128 },
{ 64, 128, 202, 247, 198, 180, 255, 219, 128, 128, 128 },
#else
{ 78, 134, 202, 247, 198, 180, 255, 219, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 3 )*/
{ 1, 185, 249, 255, 243, 255, 128, 128, 128, 128, 128 },
{ 184, 150, 247, 255, 236, 224, 128, 128, 128, 128, 128 },
{ 77, 110, 216, 255, 236, 230, 128, 128, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 77, 110, 216, 255, 236, 230, 128, 128, 128, 128, 128 },
{ 64, 100, 216, 255, 236, 230, 128, 128, 128, 128, 128 },
#else
{ 77, 110, 216, 255, 236, 230, 128, 128, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 4 )*/
{ 1, 101, 251, 255, 241, 255, 128, 128, 128, 128, 128 },
{ 170, 139, 241, 252, 236, 209, 255, 255, 128, 128, 128 },
{ 37, 116, 196, 243, 228, 255, 255, 255, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 37, 116, 196, 243, 228, 255, 255, 255, 128, 128, 128 },
{ 28, 110, 196, 243, 228, 255, 255, 255, 128, 128, 128 },
#else
{ 37, 116, 196, 243, 228, 255, 255, 255, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 5 )*/
{ 1, 204, 254, 255, 245, 255, 128, 128, 128, 128, 128 },
{ 207, 160, 250, 255, 238, 128, 128, 128, 128, 128, 128 },
{ 102, 103, 231, 255, 211, 171, 128, 128, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 102, 103, 231, 255, 211, 171, 128, 128, 128, 128, 128 },
{ 90, 90, 231, 255, 211, 171, 128, 128, 128, 128, 128 },
#else
{ 102, 103, 231, 255, 211, 171, 128, 128, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 6 )*/
{ 1, 152, 252, 255, 240, 255, 128, 128, 128, 128, 128 },
{ 177, 135, 243, 255, 234, 225, 128, 128, 128, 128, 128 },
{ 80, 129, 211, 255, 194, 224, 128, 128, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 80, 129, 211, 255, 194, 224, 128, 128, 128, 128, 128 },
{ 64, 120, 211, 255, 194, 224, 128, 128, 128, 128, 128 },
#else
{ 80, 129, 211, 255, 194, 224, 128, 128, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 7 )*/
{ 1, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 246, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 255, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 255, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 255, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
#else
{ 255, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
#endif
}
},
{ /* Block Type ( 1 ) */
{ /* Coeff Band ( 0 )*/
{ 198, 35, 237, 223, 193, 187, 162, 160, 145, 155, 62 },
{ 131, 45, 198, 221, 172, 176, 220, 157, 252, 221, 1 },
{ 68, 47, 146, 208, 149, 167, 221, 162, 255, 223, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 68, 47, 146, 208, 149, 167, 221, 162, 255, 223, 128 },
{ 48, 32, 146, 208, 149, 167, 221, 162, 255, 223, 128 },
#else
{ 68, 47, 146, 208, 149, 167, 221, 162, 255, 223, 128 },
#endif
},
{ /* Coeff Band ( 1 )*/
{ 1, 149, 241, 255, 221, 224, 255, 255, 128, 128, 128 },
{ 184, 141, 234, 253, 222, 220, 255, 199, 128, 128, 128 },
{ 81, 99, 181, 242, 176, 190, 249, 202, 255, 255, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 81, 99, 181, 242, 176, 190, 249, 202, 255, 255, 128 },
{ 66, 90, 181, 242, 176, 190, 249, 202, 255, 255, 128 },
#else
{ 81, 99, 181, 242, 176, 190, 249, 202, 255, 255, 128 },
#endif
},
{ /* Coeff Band ( 2 )*/
{ 1, 129, 232, 253, 214, 197, 242, 196, 255, 255, 128 },
{ 99, 121, 210, 250, 201, 198, 255, 202, 128, 128, 128 },
{ 23, 91, 163, 242, 170, 187, 247, 210, 255, 255, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 23, 91, 163, 242, 170, 187, 247, 210, 255, 255, 128 },
{ 18, 80, 163, 242, 170, 187, 247, 210, 255, 255, 128 },
#else
{ 23, 91, 163, 242, 170, 187, 247, 210, 255, 255, 128 },
#endif
},
{ /* Coeff Band ( 3 )*/
{ 1, 200, 246, 255, 234, 255, 128, 128, 128, 128, 128 },
{ 109, 178, 241, 255, 231, 245, 255, 255, 128, 128, 128 },
{ 44, 130, 201, 253, 205, 192, 255, 255, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 44, 130, 201, 253, 205, 192, 255, 255, 128, 128, 128 },
{ 36, 120, 201, 253, 205, 192, 255, 255, 128, 128, 128 },
#else
{ 44, 130, 201, 253, 205, 192, 255, 255, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 4 )*/
{ 1, 132, 239, 251, 219, 209, 255, 165, 128, 128, 128 },
{ 94, 136, 225, 251, 218, 190, 255, 255, 128, 128, 128 },
{ 22, 100, 174, 245, 186, 161, 255, 199, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 22, 100, 174, 245, 186, 161, 255, 199, 128, 128, 128 },
{ 18, 90, 174, 245, 186, 161, 255, 199, 128, 128, 128 },
#else
{ 22, 100, 174, 245, 186, 161, 255, 199, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 5 )*/
{ 1, 182, 249, 255, 232, 235, 128, 128, 128, 128, 128 },
{ 124, 143, 241, 255, 227, 234, 128, 128, 128, 128, 128 },
{ 35, 77, 181, 251, 193, 211, 255, 205, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 35, 77, 181, 251, 193, 211, 255, 205, 128, 128, 128 },
{ 28, 70, 181, 251, 193, 211, 255, 205, 128, 128, 128 },
#else
{ 35, 77, 181, 251, 193, 211, 255, 205, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 6 )*/
{ 1, 157, 247, 255, 236, 231, 255, 255, 128, 128, 128 },
{ 121, 141, 235, 255, 225, 227, 255, 255, 128, 128, 128 },
{ 45, 99, 188, 251, 195, 217, 255, 224, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 45, 99, 188, 251, 195, 217, 255, 224, 128, 128, 128 },
{ 40, 90, 188, 251, 195, 217, 255, 224, 128, 128, 128 },
#else
{ 45, 99, 188, 251, 195, 217, 255, 224, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 7 )*/
{ 1, 1, 251, 255, 213, 255, 128, 128, 128, 128, 128 },
{ 203, 1, 248, 255, 255, 128, 128, 128, 128, 128, 128 },
{ 137, 1, 177, 255, 224, 255, 128, 128, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 137, 1, 177, 255, 224, 255, 128, 128, 128, 128, 128 },
{ 137, 1, 177, 255, 224, 255, 128, 128, 128, 128, 128 },
#else
{ 137, 1, 177, 255, 224, 255, 128, 128, 128, 128, 128 },
#endif
}
},
{ /* Block Type ( 2 ) */
{ /* Coeff Band ( 0 )*/
{ 253, 9, 248, 251, 207, 208, 255, 192, 128, 128, 128 },
{ 175, 13, 224, 243, 193, 185, 249, 198, 255, 255, 128 },
{ 73, 17, 171, 221, 161, 179, 236, 167, 255, 234, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 73, 17, 171, 221, 161, 179, 236, 167, 255, 234, 128 },
{ 64, 17, 171, 221, 161, 179, 236, 167, 255, 234, 128 },
#else
{ 73, 17, 171, 221, 161, 179, 236, 167, 255, 234, 128 },
#endif
},
{ /* Coeff Band ( 1 )*/
{ 1, 95, 247, 253, 212, 183, 255, 255, 128, 128, 128 },
{ 239, 90, 244, 250, 211, 209, 255, 255, 128, 128, 128 },
{ 155, 77, 195, 248, 188, 195, 255, 255, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 155, 77, 195, 248, 188, 195, 255, 255, 128, 128, 128 },
{ 140, 70, 195, 248, 188, 195, 255, 255, 128, 128, 128 },
#else
{ 155, 77, 195, 248, 188, 195, 255, 255, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 2 )*/
{ 1, 24, 239, 251, 218, 219, 255, 205, 128, 128, 128 },
{ 201, 51, 219, 255, 196, 186, 128, 128, 128, 128, 128 },
{ 69, 46, 190, 239, 201, 218, 255, 228, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 69, 46, 190, 239, 201, 218, 255, 228, 128, 128, 128 },
{ 60, 40, 190, 239, 201, 218, 255, 228, 128, 128, 128 },
#else
{ 69, 46, 190, 239, 201, 218, 255, 228, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 3 )*/
{ 1, 191, 251, 255, 255, 128, 128, 128, 128, 128, 128 },
{ 223, 165, 249, 255, 213, 255, 128, 128, 128, 128, 128 },
{ 141, 124, 248, 255, 255, 128, 128, 128, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 141, 124, 248, 255, 255, 128, 128, 128, 128, 128, 128 },
{ 132, 118, 248, 255, 255, 128, 128, 128, 128, 128, 128 },
#else
{ 141, 124, 248, 255, 255, 128, 128, 128, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 4 )*/
{ 1, 16, 248, 255, 255, 128, 128, 128, 128, 128, 128 },
{ 190, 36, 230, 255, 236, 255, 128, 128, 128, 128, 128 },
{ 149, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 149, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 149, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
#else
{ 149, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 5 )*/
{ 1, 226, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 247, 192, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 240, 128, 255, 128, 128, 128, 128, 128, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 240, 128, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 240, 128, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
#else
{ 240, 128, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 6 )*/
{ 1, 134, 252, 255, 255, 128, 128, 128, 128, 128, 128 },
{ 213, 62, 250, 255, 255, 128, 128, 128, 128, 128, 128 },
{ 55, 93, 255, 128, 128, 128, 128, 128, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 55, 93, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 48, 85, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
#else
{ 55, 93, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
#endif
},
{ /* 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 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
#else
{ 128, 128, 128, 128, 128, 128, 128, 128, 128, 128, 128 },
#endif
}
},
{ /* Block Type ( 3 ) */
{ /* Coeff Band ( 0 )*/
{ 202, 24, 213, 235, 186, 191, 220, 160, 240, 175, 255 },
{ 126, 38, 182, 232, 169, 184, 228, 174, 255, 187, 128 },
{ 61, 46, 138, 219, 151, 178, 240, 170, 255, 216, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 63, 48, 138, 219, 151, 178, 240, 170, 255, 216, 128 },
{ 54, 40, 138, 219, 151, 178, 240, 170, 255, 216, 128 },
#else
{ 61, 46, 138, 219, 151, 178, 240, 170, 255, 216, 128 },
#endif
},
{ /* Coeff Band ( 1 )*/
{ 1, 112, 230, 250, 199, 191, 247, 159, 255, 255, 128 },
{ 166, 109, 228, 252, 211, 215, 255, 174, 128, 128, 128 },
{ 39, 77, 162, 232, 172, 180, 245, 178, 255, 255, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 44, 84, 162, 232, 172, 180, 245, 178, 255, 255, 128 },
{ 32, 70, 162, 232, 172, 180, 245, 178, 255, 255, 128 },
#else
{ 39, 77, 162, 232, 172, 180, 245, 178, 255, 255, 128 },
#endif
},
{ /* Coeff Band ( 2 )*/
{ 1, 52, 220, 246, 198, 199, 249, 220, 255, 255, 128 },
{ 124, 74, 191, 243, 183, 193, 250, 221, 255, 255, 128 },
{ 24, 71, 130, 219, 154, 170, 243, 182, 255, 255, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 24, 71, 130, 219, 154, 170, 243, 182, 255, 255, 128 },
{ 24, 71, 130, 219, 154, 170, 243, 182, 255, 255, 128 },
#else
{ 24, 71, 130, 219, 154, 170, 243, 182, 255, 255, 128 },
#endif
},
{ /* Coeff Band ( 3 )*/
{ 1, 182, 225, 249, 219, 240, 255, 224, 128, 128, 128 },
{ 149, 150, 226, 252, 216, 205, 255, 171, 128, 128, 128 },
{ 28, 108, 170, 242, 183, 194, 254, 223, 255, 255, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 28, 108, 170, 242, 183, 194, 254, 223, 255, 255, 128 },
{ 26, 104, 170, 242, 183, 194, 254, 223, 255, 255, 128 },
#else
{ 28, 108, 170, 242, 183, 194, 254, 223, 255, 255, 128 },
#endif
},
{ /* Coeff Band ( 4 )*/
{ 1, 81, 230, 252, 204, 203, 255, 192, 128, 128, 128 },
{ 123, 102, 209, 247, 188, 196, 255, 233, 128, 128, 128 },
{ 20, 95, 153, 243, 164, 173, 255, 203, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 20, 95, 153, 243, 164, 173, 255, 203, 128, 128, 128 },
{ 20, 95, 153, 243, 164, 173, 255, 203, 128, 128, 128 },
#else
{ 20, 95, 153, 243, 164, 173, 255, 203, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 5 )*/
{ 1, 222, 248, 255, 216, 213, 128, 128, 128, 128, 128 },
{ 168, 175, 246, 252, 235, 205, 255, 255, 128, 128, 128 },
{ 47, 116, 215, 255, 211, 212, 255, 255, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 47, 116, 215, 255, 211, 212, 255, 255, 128, 128, 128 },
{ 47, 116, 215, 255, 211, 212, 255, 255, 128, 128, 128 },
#else
{ 47, 116, 215, 255, 211, 212, 255, 255, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 6 )*/
{ 1, 121, 236, 253, 212, 214, 255, 255, 128, 128, 128 },
{ 141, 84, 213, 252, 201, 202, 255, 219, 128, 128, 128 },
{ 42, 80, 160, 240, 162, 185, 255, 205, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 42, 80, 160, 240, 162, 185, 255, 205, 128, 128, 128 },
{ 42, 80, 160, 240, 162, 185, 255, 205, 128, 128, 128 },
#else
{ 42, 80, 160, 240, 162, 185, 255, 205, 128, 128, 128 },
#endif
},
{ /* Coeff Band ( 7 )*/
{ 1, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 244, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 238, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 }
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 238, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
{ 238, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
#else
{ 238, 1, 255, 128, 128, 128, 128, 128, 128, 128, 128 },
#endif
}
}
};
......@@ -20,168 +20,264 @@ static const unsigned int vp8_default_coef_counts_8x8[BLOCK_TYPES]
{ /* Coeff Band 0 */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
#endif
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
},
{ /* Coeff Band 1 */
{ 21041, 13314, 3420, 592, 117, 0, 0, 0, 0, 0, 0, 11783},
{ 48236, 6918, 586, 153, 0, 0, 0, 0, 0, 0, 0, 23137},
{ 676112, 106685, 24701, 6003, 1426, 429, 165, 0, 0, 0, 0, 28910}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 676112, 106685, 24701, 6003, 1426, 429, 165, 0, 0, 0, 0, 28910},
#endif
{ 676112, 106685, 24701, 6003, 1426, 429, 165, 0, 0, 0, 0, 28910},
},
{ /* Coeff Band 2 */
{ 660107, 75227, 8451, 1345, 259, 0, 0, 0, 0, 0, 0, 0},
{ 79164, 36835, 6865, 1185, 246, 47, 0, 0, 0, 0, 0, 2575},
{ 19469, 14330, 3070, 579, 94, 6, 0, 0, 0, 0, 0, 44}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 19469, 14330, 3070, 579, 94, 6, 0, 0, 0, 0, 0, 44},
#endif
{ 19469, 14330, 3070, 579, 94, 6, 0, 0, 0, 0, 0, 44},
},
{ /* Coeff Band 3 */
{ 1978004, 235343, 28485, 3242, 271, 0, 0, 0, 0, 0, 0, 0},
{ 228684, 106736, 21431, 2842, 272, 46, 0, 0, 0, 0, 0, 9266},
{ 32470, 27496, 6852, 1386, 45, 93, 0, 0, 0, 0, 0, 0}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 32470, 27496, 6852, 1386, 45, 93, 0, 0, 0, 0, 0, 0},
#endif
{ 32470, 27496, 6852, 1386, 45, 93, 0, 0, 0, 0, 0, 0},
},
{ /* Coeff Band 4 */
{ 1911212, 224613, 49653, 13748, 2541, 568, 48, 0, 0, 0, 0, 0},
{ 196670, 103472, 44473, 11490, 2432, 977, 72, 0, 0, 0, 0, 9447},
{ 37876, 40417, 19142, 6069, 1799, 727, 51, 0, 0, 0, 0, 0}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 37876, 40417, 19142, 6069, 1799, 727, 51, 0, 0, 0, 0, 0},
#endif
{ 37876, 40417, 19142, 6069, 1799, 727, 51, 0, 0, 0, 0, 0},
},
{ /* Coeff Band 5 */
{ 3813399, 437714, 64387, 11312, 695, 219, 0, 0, 0, 0, 0, 0},
{ 438288, 215917, 61905, 10194, 674, 107, 0, 0, 0, 0, 0, 17808},
{ 99139, 93643, 30054, 5758, 802, 171, 0, 0, 0, 0, 0, 0}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 99139, 93643, 30054, 5758, 802, 171, 0, 0, 0, 0, 0, 0},
#endif
{ 99139, 93643, 30054, 5758, 802, 171, 0, 0, 0, 0, 0, 0},
},
{ /* Coeff Band 6 */
{ 12259383, 1625505, 234927, 46306, 8417, 1456, 151, 0, 0, 0, 0, 0},
{ 1518161, 734287, 204240, 44228, 9462, 2240, 65, 0, 0, 0, 0, 107630},
{ 292470, 258894, 94925, 25864, 6662, 2055, 170, 0, 0, 0, 0, 0}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 292470, 258894, 94925, 25864, 6662, 2055, 170, 0, 0, 0, 0, 0},
#endif
{ 292470, 258894, 94925, 25864, 6662, 2055, 170, 0, 0, 0, 0, 0},
},
{ /* Coeff Band 7 */
{ 9791308, 2118949, 169439, 16735, 1122, 0, 0, 0, 0, 0, 0, 0},
{ 1500281, 752410, 123259, 13065, 1168, 47, 0, 0, 0, 0, 0, 707182},
{ 193067, 142638, 31018, 4719, 516, 138, 0, 0, 0, 0, 0, 12439}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 193067, 142638, 31018, 4719, 516, 138, 0, 0, 0, 0, 0, 12439},
#endif
{ 193067, 142638, 31018, 4719, 516, 138, 0, 0, 0, 0, 0, 12439},
}
},
{ /* block Type 1 */
{ /* Coeff Band 0 */
{ 16925, 10553, 852, 16, 63, 87, 47, 0, 0, 0, 0, 31232},
{ 39777, 26839, 6822, 1908, 678, 456, 227, 168, 35, 0, 0, 46825},
{ 17300, 16666, 4168, 1209, 492, 154, 118, 207, 0, 0, 0, 19608}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 17300, 16666, 4168, 1209, 492, 154, 118, 207, 0, 0, 0, 19608},
#endif
{ 17300, 16666, 4168, 1209, 492, 154, 118, 207, 0, 0, 0, 19608},
},
{ /* Coeff Band 1 */
{ 35882, 31722, 4625, 1270, 266, 237, 0, 0, 0, 0, 0, 0},
{ 15426, 13894, 4482, 1305, 281, 43, 0, 0, 0, 0, 0, 18627},
{ 3900, 6552, 3472, 1723, 746, 366, 115, 35, 0, 0, 0, 798}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 3900, 6552, 3472, 1723, 746, 366, 115, 35, 0, 0, 0, 798},
#endif
{ 3900, 6552, 3472, 1723, 746, 366, 115, 35, 0, 0, 0, 798},
},
{ /* Coeff Band 2 */
{ 21998, 29132, 3353, 679, 46, 0, 0, 0, 0, 0, 0, 0},
{ 9098, 15767, 3794, 792, 268, 47, 0, 0, 0, 0, 0, 22402},
{ 4007, 8472, 2844, 687, 217, 0, 0, 0, 0, 0, 0, 2739}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 4007, 8472, 2844, 687, 217, 0, 0, 0, 0, 0, 0, 2739},
#endif
{ 4007, 8472, 2844, 687, 217, 0, 0, 0, 0, 0, 0, 2739},
},
{ /* Coeff Band 3 */
{ 0, 31414, 2911, 682, 96, 0, 0, 0, 0, 0, 0, 0},
{ 0, 16515, 4425, 938, 124, 0, 0, 0, 0, 0, 0, 31369},
{ 0, 4833, 2787, 1213, 150, 0, 0, 0, 0, 0, 0, 3744}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 0, 4833, 2787, 1213, 150, 0, 0, 0, 0, 0, 0, 3744},
#endif
{ 0, 4833, 2787, 1213, 150, 0, 0, 0, 0, 0, 0, 3744},
},
{ /* Coeff Band 4 */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
#endif
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
},
{ /* Coeff Band 5 */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
#endif
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
},
{ /* Coeff Band 6 */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 52762},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13326}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13326},
#endif
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 13326},
},
{ /* Coeff Band 7 */
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
#endif
{ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0},
}
},
{ /* block Type 2 */
{ /* Coeff Band 0 */
{ 4444, 1614, 120, 48, 0, 48, 0, 0, 0, 0, 0, 278},
{ 192436, 103730, 24494, 9845, 4122, 1193, 102, 0, 0, 0, 0, 2577},
{ 3473446, 2308716, 815510, 370374, 167797, 92152, 12073, 86, 0, 0, 0, 6801}
#if CONFIG_EXPANDED_COEF_CONTEXT
{ 3473446, 2308716, 815510, 370374, 167797, 92152, 12073, 86, 0, 0, 0, 6801},
#endif
{ 3473446, 2308716, 815510, 370374, 167797, 92152, 12073, 86, 0, 0, 0, 6801},
},
{ /* Coeff Band 1 */
{ 2150616, 1136388, 250011, 86888, 31434, 13746, 1243, 0, 0, 0, 0, 0},