From d90f0eb4c559595262f2cebc39adbfbbdf855efb Mon Sep 17 00:00:00 2001 From: Paul Wilkins Date: Thu, 9 Feb 2012 17:06:52 +0000 Subject: Removal of SEGFEATURES placeholder comments This commit only involves the removal of placeholder comments //#if CONFIG_SEGFEATURES. Change-Id: I94b350daaf998ee0cfdde5aa25b1d3b0522ab816 --- vp8/encoder/quantize.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'vp8/encoder/quantize.c') diff --git a/vp8/encoder/quantize.c b/vp8/encoder/quantize.c index 1fc39b343..b1603c39e 100644 --- a/vp8/encoder/quantize.c +++ b/vp8/encoder/quantize.c @@ -16,7 +16,6 @@ #include "quantize.h" #include "vp8/common/quant_common.h" -//#if CONFIG_SEGFEATURES #include "vp8/common/seg_common.h" #ifdef ENC_DEBUG @@ -135,7 +134,6 @@ void vp8_regular_quantize_b(BLOCK *b, BLOCKD *d) eob = -1; -//#if CONFIG_SEGFEATURES for (i = 0; i < b->eob_max_offset; i++) { rc = vp8_default_zig_zag1d[i]; @@ -1099,7 +1097,6 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x) int segment_id = xd->mode_info_context->mbmi.segment_id; // Select the baseline MB Q index allowing for any segment level change. -//#if CONFIG_SEGFEATURES if ( segfeature_active( xd, segment_id, SEG_LVL_ALT_Q ) ) { // Abs Value @@ -1135,7 +1132,7 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x) x->e_mbd.block[i].dequant = cpi->common.Y1dequant[QIndex]; x->block[i].zrun_zbin_boost = cpi->zrun_zbin_boost_y1[QIndex]; x->block[i].zbin_extra = (short)zbin_extra; -//#if CONFIG_SEGFEATURES + // Segment max eob offset feature. if ( segfeature_active( xd, segment_id, SEG_LVL_EOB ) ) { @@ -1162,7 +1159,7 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x) x->e_mbd.block[i].dequant = cpi->common.UVdequant[QIndex]; x->block[i].zrun_zbin_boost = cpi->zrun_zbin_boost_uv[QIndex]; x->block[i].zbin_extra = (short)zbin_extra; -//#if CONFIG_SEGFEATURES + // Segment max eob offset feature. if ( segfeature_active( xd, segment_id, SEG_LVL_EOB ) ) { @@ -1188,7 +1185,6 @@ void vp8cx_mb_init_quantizer(VP8_COMP *cpi, MACROBLOCK *x) x->block[24].zrun_zbin_boost = cpi->zrun_zbin_boost_y2[QIndex]; x->block[24].zbin_extra = (short)zbin_extra; -//#if CONFIG_SEGFEATURES // TBD perhaps not use for Y2 // Segment max eob offset feature. if ( segfeature_active( xd, segment_id, SEG_LVL_EOB ) ) -- cgit v1.2.3