From f4d2ad6915ef412435e6729db9081fa6c8b7db71 Mon Sep 17 00:00:00 2001 From: Yaowu Xu Date: Thu, 14 Mar 2013 10:46:15 -0700 Subject: [PATCH] Remove leftover reference to 2nd order dc/ac quant Change-Id: Ib8dacf1d2797743569771b8f699e40e1aeb085cb --- vp9/common/vp9_quant_common.c | 31 ------------------------------- vp9/encoder/vp9_encodeframe.c | 1 - 2 files changed, 32 deletions(-) diff --git a/vp9/common/vp9_quant_common.c b/vp9/common/vp9_quant_common.c index 1190381..90eb88e 100644 --- a/vp9/common/vp9_quant_common.c +++ b/vp9/common/vp9_quant_common.c @@ -52,21 +52,6 @@ int vp9_dc_quant(int QIndex, int Delta) { 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 @@ int vp9_ac_yquant(int QIndex) { 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; diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 87d456d..650e39b 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -1292,7 +1292,6 @@ static void encode_frame_internal(VP9_COMP *cpi) { 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 && -- 2.7.4