shithub: libvpx

Download patch

ref: 5d9ba7938eb62efda31d7a45bce2bc49262d8484
parent: 76c12ab9c9d08a76f79e6b50af278ebf1e5f49ad
parent: f4d2ad6915ef412435e6729db9081fa6c8b7db71
author: Yaowu Xu <yaowu@google.com>
date: Thu Mar 14 15:05:11 EDT 2013 

Merge "Remove leftover reference to 2nd order dc/ac quant" into experimental


--- a/vp9/common/vp9_quant_common.c
+++ b/vp9/common/vp9_quant_common.c
@@ -52,21 +52,6 @@
   return retval;
 }
 
-int vp9_dc2quant(int QIndex, int Delta) {
-  int retval;
-
-  QIndex = QIndex + Delta;
-
-  if (QIndex > MAXQ)
-    QIndex = MAXQ;
-  else if (QIndex < 0)
-    QIndex = 0;
-
-  retval = dc_qlookup[ QIndex ];
-
-  return retval;
-
-}
 int vp9_dc_uv_quant(int QIndex, int Delta) {
   int retval;
 
@@ -94,22 +79,6 @@
   return retval;
 }
 
-int vp9_ac2quant(int QIndex, int Delta) {
-  int retval;
-
-  QIndex = QIndex + Delta;
-
-  if (QIndex > MAXQ)
-    QIndex = MAXQ;
-  else if (QIndex < 0)
-    QIndex = 0;
-
-  retval = (ac_qlookup[ QIndex ] * 775) / 1000;
-  if (retval < 4)
-    retval = 4;
-
-  return retval;
-}
 int vp9_ac_uv_quant(int QIndex, int Delta) {
   int retval;
 
--- a/vp9/encoder/vp9_encodeframe.c
+++ b/vp9/encoder/vp9_encodeframe.c
@@ -1292,7 +1292,6 @@
   vp9_zero(cpi->mb_mv_ref_count);
 #endif
 
-
   // force lossless mode when Q0 is selected
   cpi->mb.e_mbd.lossless = (cm->base_qindex == 0 &&
                             cm->y1dc_delta_q == 0 &&