commit f7a1242075b91e2c8ae922278e0170a3780bbcd3
author Yaowu Xu <yaowu@google.com> Wed Jan 31 15:29:20 2018 -0800
committer Yaowu Xu <yaowu@google.com> Fri Feb 09 19:04:26 2018 +0000
tree 545c8c44450c8913cb42639fbc0033eae321f77d
parent dccaf3f20adf144d86fc8e48006cbbe1dc73365c

aom_qm_ext: add signaling for separate QM for U/V

Change-Id: I9879264011f6450bd2eb6648e39e9ad47f13a7d8

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 6b3dfa4..0429b52 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2473,8 +2473,19 @@
 #if CONFIG_AOM_QM
   aom_wb_write_bit(wb, cm->using_qmatrix);
   if (cm->using_qmatrix) {
+#if CONFIG_AOM_QM_EXT
+    aom_wb_write_literal(wb, cm->qm_y, QM_LEVEL_BITS);
+    aom_wb_write_literal(wb, cm->qm_u, QM_LEVEL_BITS);
+#if CONFIG_EXT_QM
+    if (!cm->separate_uv_delta_q)
+      assert(cm->qm_u == cm->qm_v);
+    else
+#endif
+      aom_wb_write_literal(wb, cm->qm_v, QM_LEVEL_BITS);
+#else
     aom_wb_write_literal(wb, cm->min_qmlevel, QM_LEVEL_BITS);
     aom_wb_write_literal(wb, cm->max_qmlevel, QM_LEVEL_BITS);
+#endif
   }
 #endif
 }