Fix the 8x4 and 4x8 quant matrices in levels 13-14 The 8x4 and 4x8 matrices in levels 13-14 were swapped. Fixed in https://gitlab.com/toddnguyen1/avm-qm-generation/-/merge_requests/2.
diff --git a/av1/common/quant_common.c b/av1/common/quant_common.c index 2acedaf..72a982e 100644 --- a/av1/common/quant_common.c +++ b/av1/common/quant_common.c
@@ -1201,33 +1201,33 @@ { { /* Luma */ - 31, 31, 31, 32, 31, 32, 32, 32, - 31, 32, 32, 32, 31, 32, 32, 32, - 31, 32, 32, 32, 31, 32, 32, 33, - 32, 32, 32, 33, 32, 32, 32, 33, + 31, 31, 31, 31, 31, 31, 32, 32, + 31, 32, 32, 32, 32, 32, 32, 32, + 31, 32, 32, 32, 32, 32, 32, 32, + 32, 32, 32, 32, 32, 33, 33, 33, }, { /* Chroma */ - 31, 31, 31, 34, 31, 31, 31, 35, - 31, 31, 31, 35, 31, 32, 32, 36, - 31, 32, 32, 36, 31, 33, 33, 37, - 34, 36, 36, 40, 34, 36, 36, 40, + 31, 31, 31, 31, 31, 31, 34, 34, + 31, 31, 31, 32, 32, 33, 36, 36, + 31, 31, 31, 32, 32, 33, 36, 36, + 34, 35, 35, 36, 36, 37, 40, 40, }, }, { { /* Luma */ 31, 31, 31, 31, 31, 31, 31, 31, - 31, 32, 32, 32, 31, 32, 32, 32, - 31, 32, 32, 32, 31, 32, 32, 32, - 31, 32, 32, 32, 31, 32, 32, 32, + 31, 31, 32, 32, 32, 32, 32, 32, + 31, 31, 32, 32, 32, 32, 32, 32, + 31, 31, 32, 32, 32, 32, 32, 32, }, { /* Chroma */ + 31, 31, 31, 31, 31, 31, 31, 30, 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 32, 32, 30, 31, 32, 32, + 31, 31, 31, 31, 31, 31, 32, 32, + 31, 31, 31, 31, 31, 31, 32, 32, }, }, }; @@ -1547,25 +1547,25 @@ { { /* Luma */ - 31, 31, 31, 31, - 31, 31, 32, 32, + 31, 31, 31, 32, 31, 32, 32, 32, - 32, 32, 32, 32, 31, 32, 32, 32, - 32, 32, 32, 32, - 32, 32, 32, 32, - 32, 33, 33, 33, + 31, 32, 32, 32, + 31, 32, 32, 32, + 31, 32, 32, 33, + 32, 32, 32, 33, + 32, 32, 32, 33, }, { /* Chroma */ - 31, 31, 31, 31, - 31, 31, 34, 34, - 31, 31, 31, 32, - 32, 33, 36, 36, - 31, 31, 31, 32, - 32, 33, 36, 36, - 34, 35, 35, 36, - 36, 37, 40, 40, + 31, 31, 31, 34, + 31, 31, 31, 35, + 31, 31, 31, 35, + 31, 32, 32, 36, + 31, 32, 32, 36, + 31, 33, 33, 37, + 34, 36, 36, 40, + 34, 36, 36, 40, }, }, { @@ -1573,23 +1573,23 @@ /* Luma */ 31, 31, 31, 31, 31, 31, 31, 31, - 31, 31, 32, 32, - 32, 32, 32, 32, - 31, 31, 32, 32, - 32, 32, 32, 32, - 31, 31, 32, 32, - 32, 32, 32, 32, + 31, 32, 32, 32, + 31, 32, 32, 32, + 31, 32, 32, 32, + 31, 32, 32, 32, + 31, 32, 32, 32, + 31, 32, 32, 32, }, { /* Chroma */ 31, 31, 31, 31, - 31, 31, 31, 30, + 31, 31, 31, 31, + 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 31, 32, 32, - 31, 31, 31, 31, - 31, 31, 32, 32, + 30, 31, 32, 32, }, }, };