From c88d335f7d204bd7529d386c8f30f77b6e81c0ad Mon Sep 17 00:00:00 2001 From: Paul Wilkins Date: Wed, 21 Mar 2012 18:22:33 +0000 Subject: Only support improved quant Deprecate fast quant and strict_quant code. Small effect on quality as fast was used in first pass but the effect is basically neutral across the derf set. The rationale here is to reduce the number of code paths for now to make experimentation easier. Optimized and fast code options can be re-introduced later along with other encode speed options. Change-Id: Ia30c5daf3dbc52e72c83b277a1d281e3c934cdad --- vp8/encoder/encodeframe.c | 25 +------------------------ 1 file changed, 1 insertion(+), 24 deletions(-) (limited to 'vp8/encoder/encodeframe.c') diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index fdc66c0c6..8feea41a6 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -1168,18 +1168,6 @@ int vp8cx_encode_inter_macroblock int zbin_mode_boost_enabled = cpi->zbin_mode_boost_enabled; int single, compound, hybrid; - /* Are we using the fast quantizer for the mode selection? */ - if(cpi->sf.use_fastquant_for_pick) - { - cpi->mb.quantize_b = QUANTIZE_INVOKE(&cpi->rtcd.quantize, - fastquantb); - cpi->mb.quantize_b_pair = QUANTIZE_INVOKE(&cpi->rtcd.quantize, - fastquantb_pair); - - /* the fast quantizer does not use zbin_extra, so - * do not recalculate */ - cpi->zbin_mode_boost_enabled = 0; - } vp8_rd_pick_inter_mode(cpi, x, recon_yoffset, recon_uvoffset, &rate, &distortion, &intra_error, &single, &compound, &hybrid); @@ -1215,14 +1203,6 @@ int vp8cx_encode_inter_macroblock cpi->t4x4_count++; } - /* switch back to the regular quantizer for the encode */ - if (cpi->sf.improved_quant) - { - cpi->mb.quantize_b = QUANTIZE_INVOKE(&cpi->rtcd.quantize, - quantb); - cpi->mb.quantize_b_pair = QUANTIZE_INVOKE(&cpi->rtcd.quantize, - quantb_pair); - } /* restore cpi->zbin_mode_boost_enabled */ cpi->zbin_mode_boost_enabled = zbin_mode_boost_enabled; @@ -1263,10 +1243,7 @@ int vp8cx_encode_inter_macroblock } } - /* The fast quantizer doesn't use zbin_extra, only do so with - * the regular quantizer. */ - if (cpi->sf.improved_quant) - vp8_update_zbin_extra(cpi, x); + vp8_update_zbin_extra(cpi, x); } seg_ref_active = segfeature_active( xd, *segment_id, SEG_LVL_REF_FRAME ); -- cgit v1.2.3