commit d467bba2bfe3ae49faa5b354a11bd0bbdd7ef0c9
author Yaowu Xu <yaowu@google.com> Thu Nov 09 13:39:11 2017 -0800
committer Yaowu Xu <yaowu@google.com> Wed Nov 15 01:21:13 2017 +0000
tree 0bb991964e3d3e5b541f36f6f643bb2d2d968db5
parent 088251e4aca86661d303c599f388d3328cb8b7e9

Support Separate qmatrix for U and V planes

This commit adds support of a separate qmatrix and iqmatrix for each
of the U and V planes. Currently the separate matrices are intialized
to the same ones, then the commit does not have any coding impact
yet.

Change-Id: I5c4045fe1879db262c6ec1567d8d7dfd9a98fbed

av1/encoder/av1_quantize.c

diff --git a/av1/encoder/av1_quantize.c b/av1/encoder/av1_quantize.c
index f985a42..8c4a5db 100644
--- a/av1/encoder/av1_quantize.c
+++ b/av1/encoder/av1_quantize.c
@@ -1745,10 +1745,10 @@
     x->plane[2].round_QTX = quants->v_round[qindex];
     x->plane[2].dequant_QTX = cpi->dequants.v_dequant_QTX[qindex];
 #if CONFIG_AOM_QM
-    memcpy(&xd->plane[2].seg_qmatrix[segment_id], cm->gqmatrix[qmlevel][1],
-           sizeof(cm->gqmatrix[qmlevel][1]));
-    memcpy(&xd->plane[2].seg_iqmatrix[segment_id], cm->giqmatrix[qmlevel][1],
-           sizeof(cm->giqmatrix[qmlevel][1]));
+    memcpy(&xd->plane[2].seg_qmatrix[segment_id], cm->gqmatrix[qmlevel][2],
+           sizeof(cm->gqmatrix[qmlevel][2]));
+    memcpy(&xd->plane[2].seg_iqmatrix[segment_id], cm->giqmatrix[qmlevel][2],
+           sizeof(cm->giqmatrix[qmlevel][2]));
 #endif
     x->plane[2].dequant_QTX = cpi->dequants.v_dequant_QTX[qindex];
     xd->plane[2].dequant_Q3 = cpi->dequants.v_dequant_Q3[qindex];