shithub: libvpx

Info  •  Files  •  Log  •  Branches

Remove y2dc/ac Q delta values from the bitstream.

Since there is no Y2, these values are always zero. This changes the
bitstream results slightly, hence a separate commit.

Change-Id: I2f838f184341868f35113ec77ca89da53c4644e0

--- a/vp9/common/vp9_onyxc_int.h

+++ b/vp9/common/vp9_onyxc_int.h

@@ -183,8 +183,6 @@

   int last_kf_gf_q;  /* Q used on the last GF or KF */

   int y1dc_delta_q;

-  int y2dc_delta_q_unused;

-  int y2ac_delta_q_unused;

   int uvdc_delta_q;

   int uvac_delta_q;

--- a/vp9/decoder/vp9_decodframe.c

+++ b/vp9/decoder/vp9_decodframe.c

@@ -1484,10 +1484,6 @@

     q_update = 0;

     /* AC 1st order Q = default */

     pc->y1dc_delta_q = get_delta_q(&header_bc, pc->y1dc_delta_q, &q_update);

-    pc->y2dc_delta_q_unused = get_delta_q(&header_bc, pc->y2dc_delta_q_unused,

-                                          &q_update);

-    pc->y2ac_delta_q_unused = get_delta_q(&header_bc, pc->y2ac_delta_q_unused,

-                                          &q_update);

     pc->uvdc_delta_q = get_delta_q(&header_bc, pc->uvdc_delta_q, &q_update);

     pc->uvac_delta_q = get_delta_q(&header_bc, pc->uvac_delta_q, &q_update);

--- a/vp9/encoder/vp9_bitstream.c

+++ b/vp9/encoder/vp9_bitstream.c

@@ -1786,8 +1786,6 @@

   // Transmit Dc, Second order and Uv quantizer delta information

   put_delta_q(&header_bc, pc->y1dc_delta_q);

-  put_delta_q(&header_bc, pc->y2dc_delta_q_unused);

-  put_delta_q(&header_bc, pc->y2ac_delta_q_unused);

   put_delta_q(&header_bc, pc->uvdc_delta_q);

   put_delta_q(&header_bc, pc->uvac_delta_q);

--- a/vp9/encoder/vp9_quantize.c

+++ b/vp9/encoder/vp9_quantize.c

@@ -571,10 +571,8 @@

   // if any of the delta_q values are changing update flag will

   // have to be set.

   cm->y1dc_delta_q = 0;

-  cm->y2ac_delta_q_unused = 0;

   cm->uvdc_delta_q = 0;

   cm->uvac_delta_q = 0;

-  cm->y2dc_delta_q_unused = 0;

   // quantizer has to be reinitialized if any delta_q changes.

   // As there are not any here for now this is inactive code.

-- 

⑨