commit 6fc47e5fb2c369971af0235ea0dbfdfd1ade9de8
author Yaowu Xu <yaowu@google.com> Mon Dec 04 15:07:48 2017 -0800
committer Yaowu Xu <yaowu@google.com> Fri Dec 08 20:56:42 2017 +0000
tree 2439dec1e2867e77f5d279ca1f023ba41b0ffc61
parent ebcee0b61cff27d7f0da9e24f711f0af5ddeba5e

Add support of separte delta Qs for chroma channels

Change-Id: Iae7c054def0c0d5b5af52263f0c4d2e1e346282d

av1/encoder/bitstream.c

diff --git a/av1/encoder/bitstream.c b/av1/encoder/bitstream.c
index 3b83d0c..d914fc3 100644
--- a/av1/encoder/bitstream.c
+++ b/av1/encoder/bitstream.c
@@ -2661,10 +2661,19 @@
                                 struct aom_write_bit_buffer *wb) {
   aom_wb_write_literal(wb, cm->base_qindex, QINDEX_BITS);
   write_delta_q(wb, cm->y_dc_delta_q);
-  assert(cm->u_dc_delta_q == cm->v_dc_delta_q);
+  int diff_uv_delta = (cm->u_dc_delta_q != cm->v_dc_delta_q) ||
+                      (cm->u_ac_delta_q != cm->v_ac_delta_q);
+#if CONFIG_EXT_QM
+  if (cm->separate_uv_delta_q) aom_wb_write_bit(wb, diff_uv_delta);
+#else
+  assert(!diff_uv_delta);
+#endif
   write_delta_q(wb, cm->u_dc_delta_q);
-  assert(cm->u_ac_delta_q == cm->v_ac_delta_q);
   write_delta_q(wb, cm->u_ac_delta_q);
+  if (diff_uv_delta) {
+    write_delta_q(wb, cm->v_dc_delta_q);
+    write_delta_q(wb, cm->v_ac_delta_q);
+  }
 #if CONFIG_AOM_QM
   aom_wb_write_bit(wb, cm->using_qmatrix);
   if (cm->using_qmatrix) {
@@ -3497,6 +3506,9 @@
     assert(cm->profile == PROFILE_1 || cm->profile == PROFILE_3);
     aom_wb_write_bit(wb, 0);  // unused
   }
+#if CONFIG_EXT_QM
+  aom_wb_write_bit(wb, cm->separate_uv_delta_q);
+#endif
 }
 
 #if CONFIG_REFERENCE_BUFFER || CONFIG_OBU