Use 7 neighbors for nz_map ctx
This will let coding performance drop slightly
lowres 0.093%
Increase encoder speed by 24%
Reduce nz_map's context size by 20%
Change-Id: I871c18a7e0341e066afc334556b9998194b3f8c9
diff --git a/av1/common/entropymode.c b/av1/common/entropymode.c
index 4a695bc..ad5f7ac 100644
--- a/av1/common/entropymode.c
+++ b/av1/common/entropymode.c
@@ -175,133 +175,178 @@
#if CONFIG_EXT_TX
#if CONFIG_CHROMA_2X2
{
- { 34, 103, 61, 106, 62, 160, 112, 54, 173, 121,
- 75, 157, 92, 75, 157, 129, 94, 65, 52, 37,
+ {
+ 34, 103, 61, 106, 62, 160, 112, 54,
+ 173, 121, 157, 92, 157, 129, 94, 65,
- 34, 103, 61, 106, 62, 160, 112, 54, 173, 121,
- 75, 157, 92, 75, 157, 129, 94, 65, 52, 37,
+ 34, 103, 61, 106, 62, 160, 112, 54,
+ 173, 121, 157, 92, 157, 129, 94, 65,
- 34, 103, 61, 106, 62, 160, 112, 54, 173, 121,
- 75, 157, 92, 75, 157, 129, 94, 65, 52, 37 },
+ 34, 103, 61, 106, 62, 160, 112, 54,
+ 173, 121, 157, 92, 157, 129, 94, 65,
+ },
- { 52, 124, 84, 136, 107, 197, 161, 82, 183, 151,
- 109, 153, 140, 103, 152, 134, 109, 81, 69, 50,
+ {
+ 52, 124, 84, 136, 107, 197, 161, 82,
+ 183, 151, 153, 140, 152, 134, 109, 81,
- 52, 124, 84, 136, 107, 197, 161, 82, 183, 151,
- 109, 153, 140, 103, 152, 134, 109, 81, 69, 50,
+ 52, 124, 84, 136, 107, 197, 161, 82,
+ 183, 151, 153, 140, 152, 134, 109, 81,
- 52, 124, 84, 136, 107, 197, 161, 82, 183, 151,
- 109, 153, 140, 103, 152, 134, 109, 81, 69, 50 },
+ 52, 124, 84, 136, 107, 197, 161, 82,
+ 183, 151, 153, 140, 152, 134, 109, 81,
+ },
},
#endif
{
- { 34, 103, 61, 106, 62, 160, 112, 54, 173, 121,
- 75, 157, 92, 75, 157, 129, 94, 65, 52, 37,
+ {
+ 34, 103, 61, 106, 62, 160, 112, 54,
+ 173, 121, 157, 92, 157, 129, 94, 65,
- 34, 103, 61, 106, 62, 160, 112, 54, 173, 121,
- 75, 157, 92, 75, 157, 129, 94, 65, 52, 37,
+ 34, 103, 61, 106, 62, 160, 112, 54,
+ 173, 121, 157, 92, 157, 129, 94, 65,
- 34, 103, 61, 106, 62, 160, 112, 54, 173, 121,
- 75, 157, 92, 75, 157, 129, 94, 65, 52, 37 },
+ 34, 103, 61, 106, 62, 160, 112, 54,
+ 173, 121, 157, 92, 157, 129, 94, 65,
+ },
- { 52, 124, 84, 136, 107, 197, 161, 82, 183, 151,
- 109, 153, 140, 103, 152, 134, 109, 81, 69, 50,
+ {
+ 52, 124, 84, 136, 107, 197, 161, 82,
+ 183, 151, 153, 140, 152, 134, 109, 81,
- 52, 124, 84, 136, 107, 197, 161, 82, 183, 151,
- 109, 153, 140, 103, 152, 134, 109, 81, 69, 50,
+ 52, 124, 84, 136, 107, 197, 161, 82,
+ 183, 151, 153, 140, 152, 134, 109, 81,
- 52, 124, 84, 136, 107, 197, 161, 82, 183, 151,
- 109, 153, 140, 103, 152, 134, 109, 81, 69, 50 },
+ 52, 124, 84, 136, 107, 197, 161, 82,
+ 183, 151, 153, 140, 152, 134, 109, 81,
+ },
},
{
- { 34, 127, 74, 124, 74, 204, 153, 76, 226, 162,
- 92, 207, 126, 91, 227, 192, 149, 108, 85, 55,
+ {
+ 34, 127, 74, 124, 74, 204, 153, 76,
+ 226, 162, 207, 126, 227, 192, 149, 108,
- 34, 127, 74, 124, 74, 204, 153, 76, 226, 162,
- 92, 207, 126, 91, 227, 192, 149, 108, 85, 55,
+ 34, 127, 74, 124, 74, 204, 153, 76,
+ 226, 162, 207, 126, 227, 192, 149, 108,
- 34, 127, 74, 124, 74, 204, 153, 76, 226, 162,
- 92, 207, 126, 91, 227, 192, 149, 108, 85, 55 },
+ 34, 127, 74, 124, 74, 204, 153, 76,
+ 226, 162, 207, 126, 227, 192, 149, 108,
+ },
- { 43, 136, 115, 158, 130, 212, 187, 112, 231, 180,
- 130, 202, 164, 130, 236, 204, 168, 139, 112, 114,
+ {
+ 43, 136, 115, 158, 130, 212, 187, 112,
+ 231, 180, 202, 164, 236, 204, 168, 139,
- 43, 136, 115, 158, 130, 212, 187, 112, 231, 180,
- 130, 202, 164, 130, 236, 204, 168, 139, 112, 114,
+ 43, 136, 115, 158, 130, 212, 187, 112,
+ 231, 180, 202, 164, 236, 204, 168, 139,
- 43, 136, 115, 158, 130, 212, 187, 112, 231, 180,
- 130, 202, 164, 130, 236, 204, 168, 139, 112, 114 },
+ 43, 136, 115, 158, 130, 212, 187, 112,
+ 231, 180, 202, 164, 236, 204, 168, 139,
+ },
},
{
- { 25, 117, 70, 120, 77, 215, 171, 102, 234, 156,
- 105, 235, 155, 109, 247, 220, 176, 127, 92, 72,
+ {
+ 25, 117, 70, 120, 77, 215, 171, 102,
+ 234, 156, 235, 155, 247, 220, 176, 127,
- 25, 117, 70, 120, 77, 215, 171, 102, 234, 156,
- 105, 235, 155, 109, 247, 220, 176, 127, 92, 72,
+ 25, 117, 70, 120, 77, 215, 171, 102,
+ 234, 156, 235, 155, 247, 220, 176, 127,
- 25, 117, 70, 120, 77, 215, 171, 102, 234, 156,
- 105, 235, 155, 109, 247, 220, 176, 127, 92, 72 },
+ 25, 117, 70, 120, 77, 215, 171, 102,
+ 234, 156, 235, 155, 247, 220, 176, 127,
+ },
- { 24, 88, 49, 100, 62, 202, 148, 62, 237, 178,
- 102, 233, 168, 105, 244, 198, 162, 127, 103, 71,
+ {
+ 24, 88, 49, 100, 62, 202, 148, 62,
+ 237, 178, 233, 168, 244, 198, 162, 127,
- 24, 88, 49, 100, 62, 202, 148, 62, 237, 178,
- 102, 233, 168, 105, 244, 198, 162, 127, 103, 71,
+ 24, 88, 49, 100, 62, 202, 148, 62,
+ 237, 178, 233, 168, 244, 198, 162, 127,
- 24, 88, 49, 100, 62, 202, 148, 62, 237, 178,
- 102, 233, 168, 105, 244, 198, 162, 127, 103, 71 },
+ 24, 88, 49, 100, 62, 202, 148, 62,
+ 237, 178, 233, 168, 244, 198, 162, 127,
+ },
},
{
- { 11, 54, 17, 69, 26, 128, 125, 56, 232, 130,
- 60, 237, 121, 66, 250, 168, 134, 114, 93, 53,
+ {
+ 11, 54, 17, 69, 26, 128, 125, 56,
+ 232, 130, 237, 121, 250, 168, 134, 114,
- 11, 54, 17, 69, 26, 128, 125, 56, 232, 130,
- 60, 237, 121, 66, 250, 168, 134, 114, 93, 53,
+ 11, 54, 17, 69, 26, 128, 125, 56,
+ 232, 130, 237, 121, 250, 168, 134, 114,
- 11, 54, 17, 69, 26, 128, 125, 56, 232, 130,
- 60, 237, 121, 66, 250, 168, 134, 114, 93, 53 },
+ 11, 54, 17, 69, 26, 128, 125, 56,
+ 232, 130, 237, 121, 250, 168, 134, 114,
+ },
- { 21, 52, 32, 95, 64, 171, 152, 70, 247, 159,
- 81, 252, 177, 100, 252, 221, 192, 143, 195, 146,
+ {
+ 21, 52, 32, 95, 64, 171, 152, 70,
+ 247, 159, 252, 177, 252, 221, 192, 143,
- 21, 52, 32, 95, 64, 171, 152, 70, 247, 159,
- 81, 252, 177, 100, 252, 221, 192, 143, 195, 146,
+ 21, 52, 32, 95, 64, 171, 152, 70,
+ 247, 159, 252, 177, 252, 221, 192, 143,
- 21, 52, 32, 95, 64, 171, 152, 70, 247, 159,
- 81, 252, 177, 100, 252, 221, 192, 143, 195, 146 },
+ 21, 52, 32, 95, 64, 171, 152, 70,
+ 247, 159, 252, 177, 252, 221, 192, 143,
+ },
},
#else // CONFIG_EXT_TX
#if CONFIG_CHROMA_2X2
{
- { 34, 103, 61, 106, 62, 160, 112, 54, 173, 121,
- 75, 157, 92, 75, 157, 129, 94, 65, 52, 37 },
- { 52, 124, 84, 136, 107, 197, 161, 82, 183, 151,
- 109, 153, 140, 103, 152, 134, 109, 81, 69, 50 },
+ {
+ 34, 103, 61, 106, 62, 160, 112, 54, 173, 121, 157, 92, 157, 129, 94,
+ 65,
+ },
+
+ {
+ 52, 124, 84, 136, 107, 197, 161, 82, 183, 151, 153, 140, 152, 134,
+ 109, 81,
+ },
},
#endif
{
- { 34, 103, 61, 106, 62, 160, 112, 54, 173, 121,
- 75, 157, 92, 75, 157, 129, 94, 65, 52, 37 },
- { 52, 124, 84, 136, 107, 197, 161, 82, 183, 151,
- 109, 153, 140, 103, 152, 134, 109, 81, 69, 50 },
+ {
+ 34, 103, 61, 106, 62, 160, 112, 54, 173, 121, 157, 92, 157, 129, 94,
+ 65,
+ },
+
+ {
+ 52, 124, 84, 136, 107, 197, 161, 82, 183, 151, 153, 140, 152, 134,
+ 109, 81,
+ },
},
{
- { 34, 127, 74, 124, 74, 204, 153, 76, 226, 162,
- 92, 207, 126, 91, 227, 192, 149, 108, 85, 55 },
- { 43, 136, 115, 158, 130, 212, 187, 112, 231, 180,
- 130, 202, 164, 130, 236, 204, 168, 139, 112, 114 },
+ {
+ 34, 127, 74, 124, 74, 204, 153, 76, 226, 162, 207, 126, 227, 192, 149,
+ 108,
+ },
+
+ {
+ 43, 136, 115, 158, 130, 212, 187, 112, 231, 180, 202, 164, 236, 204,
+ 168, 139,
+ },
},
{
- { 25, 117, 70, 120, 77, 215, 171, 102, 234, 156,
- 105, 235, 155, 109, 247, 220, 176, 127, 92, 72 },
- { 24, 88, 49, 100, 62, 202, 148, 62, 237, 178,
- 102, 233, 168, 105, 244, 198, 162, 127, 103, 71 },
+ {
+ 25, 117, 70, 120, 77, 215, 171, 102, 234, 156, 235, 155, 247, 220,
+ 176, 127,
+ },
+
+ {
+ 24, 88, 49, 100, 62, 202, 148, 62, 237, 178, 233, 168, 244, 198, 162,
+ 127,
+ },
},
{
- { 11, 54, 17, 69, 26, 128, 125, 56, 232, 130,
- 60, 237, 121, 66, 250, 168, 134, 114, 93, 53 },
- { 21, 52, 32, 95, 64, 171, 152, 70, 247, 159,
- 81, 252, 177, 100, 252, 221, 192, 143, 195, 146 },
+ {
+ 11, 54, 17, 69, 26, 128, 125, 56, 232, 130, 237, 121, 250, 168, 134,
+ 114,
+ },
+
+ {
+ 21, 52, 32, 95, 64, 171, 152, 70, 247, 159, 252, 177, 252, 221, 192,
+ 143,
+ },
},
#endif // CONFIG_EXT_TX
};
