From d90f0eb4c559595262f2cebc39adbfbbdf855efb Mon Sep 17 00:00:00 2001 From: Paul Wilkins Date: Thu, 9 Feb 2012 17:06:52 +0000 Subject: [PATCH] Removal of SEGFEATURES placeholder comments This commit only involves the removal of placeholder comments //#if CONFIG_SEGFEATURES. Change-Id: I94b350daaf998ee0cfdde5aa25b1d3b0522ab816 --- vp8/common/blockd.h | 2 -- vp8/common/loopfilter.c | 3 --- vp8/common/seg_common.c | 1 - vp8/decoder/decodemv.c | 13 ------------- vp8/decoder/decodframe.c | 6 ------ vp8/decoder/detokenize.c | 3 --- vp8/decoder/threading.c | 1 - vp8/encoder/bitstream.c | 16 ---------------- vp8/encoder/block.h | 1 - vp8/encoder/encodeframe.c | 6 ------ vp8/encoder/ethreading.c | 2 -- vp8/encoder/onyx_if.c | 9 --------- vp8/encoder/pickinter.c | 3 --- vp8/encoder/quantize.c | 8 ++------ vp8/encoder/rdopt.c | 3 --- vp8/encoder/segmentation.c | 1 - vp8/encoder/tokenize.c | 8 +------- vp8/encoder/x86/x86_csystemdependent.c | 7 ------- 18 files changed, 3 insertions(+), 90 deletions(-) diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 15b5da29f..72fee373d 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -103,7 +103,6 @@ typedef enum { SEG_LVL_ALT_Q = 0, // Use alternate Quantizer .... SEG_LVL_ALT_LF = 1, // Use alternate loop filter value... -//#if CONFIG_SEGFEATURES SEG_LVL_REF_FRAME = 2, // Optional Segment reference frame SEG_LVL_MODE = 3, // Optional Segment mode SEG_LVL_EOB = 4, // EOB end stop marker. @@ -284,7 +283,6 @@ typedef struct MacroBlockD // Segment features signed char segment_feature_data[MAX_MB_SEGMENTS][SEG_LVL_MAX]; -//#if CONFIG_SEGFEATURES unsigned int segment_feature_mask[MAX_MB_SEGMENTS]; /* mode_based Loop filter adjustment */ diff --git a/vp8/common/loopfilter.c b/vp8/common/loopfilter.c index 0832bd004..083e1de7e 100644 --- a/vp8/common/loopfilter.c +++ b/vp8/common/loopfilter.c @@ -14,9 +14,7 @@ #include "onyxc_int.h" #include "vpx_mem/vpx_mem.h" -//#if CONFIG_SEGFEATURES #include "vp8/common/seg_common.h" -//#endif typedef unsigned char uc; @@ -244,7 +242,6 @@ void vp8_loop_filter_frame_init(VP8_COMMON *cm, // Set the baseline filter values for each segment -//#if CONFIG_SEGFEATURES if ( segfeature_active( xd, seg, SEG_LVL_ALT_LF ) ) { /* Abs value */ diff --git a/vp8/common/seg_common.c b/vp8/common/seg_common.c index e4a105e6f..44588aa96 100644 --- a/vp8/common/seg_common.c +++ b/vp8/common/seg_common.c @@ -10,7 +10,6 @@ #include "vp8/common/seg_common.h" -//#if CONFIG_SEGFEATURES const int segfeaturedata_signed[SEG_LVL_MAX] = {1, 1, 0, 0, 0, 0}; const int vp8_seg_feature_data_bits[SEG_LVL_MAX] = {QINDEX_BITS, 6, 4, 4, 6, 2}; diff --git a/vp8/decoder/decodemv.c b/vp8/decoder/decodemv.c index 305268db9..4680e4aee 100644 --- a/vp8/decoder/decodemv.c +++ b/vp8/decoder/decodemv.c @@ -15,7 +15,6 @@ #include "onyxd_int.h" #include "vp8/common/findnearmv.h" -//#if CONFIG_SEGFEATURES #include "vp8/common/seg_common.h" #include "vp8/common/pred_common.h" @@ -92,7 +91,6 @@ static void vp8_kfread_modes(VP8D_COMP *pbi, pbi->common.last_frame_seg_map[map_index] = m->mbmi.segment_id; } -//#if CONFIG_SEGFEATURES if ( pbi->common.mb_no_coeff_skip && ( !segfeature_active( &pbi->mb, m->mbmi.segment_id, SEG_LVL_EOB ) || @@ -103,7 +101,6 @@ static void vp8_kfread_modes(VP8D_COMP *pbi, } else { -//#if CONFIG_SEGFEATURES if ( segfeature_active( &pbi->mb, m->mbmi.segment_id, SEG_LVL_EOB ) && ( get_segdata( &pbi->mb, @@ -238,7 +235,6 @@ static MV_REFERENCE_FRAME read_ref_frame( VP8D_COMP *pbi, int seg_ref_active; int seg_ref_count = 0; -//#if CONFIG_SEGFEATURES VP8_COMMON *const cm = & pbi->common; MACROBLOCKD *const xd = &pbi->mb; @@ -345,7 +341,6 @@ static MV_REFERENCE_FRAME read_ref_frame( VP8D_COMP *pbi, } } -//#if CONFIG_SEGFEATURES // Segment reference frame features are enabled else { @@ -567,7 +562,6 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, // Read the macroblock segment id. read_mb_segment_id ( pbi, mb_row, mb_col ); -//#if CONFIG_SEGFEATURES if ( pbi->common.mb_no_coeff_skip && ( !segfeature_active( xd, mbmi->segment_id, SEG_LVL_EOB ) || @@ -579,7 +573,6 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, } else { -//#if CONFIG_SEGFEATURES if ( segfeature_active( xd, mbmi->segment_id, SEG_LVL_EOB ) && (get_segdata( xd, mbmi->segment_id, SEG_LVL_EOB ) == 0) ) @@ -606,7 +599,6 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, mbmi->ref_frame, pbi->common.ref_frame_sign_bias); vp8_mv_ref_probs(&pbi->common, mv_ref_p, rct); -//#if CONFIG_SEGFEATURES // Is the segment level mode feature enabled for this segment if ( segfeature_active( xd, mbmi->segment_id, SEG_LVL_MODE ) ) { @@ -819,7 +811,6 @@ static void read_mb_modes_mv(VP8D_COMP *pbi, MODE_INFO *mi, MB_MODE_INFO *mbmi, /* required for left and above block mv */ mbmi->mv.as_int = 0; -//#if CONFIG_SEGFEATURES if ( segfeature_active( xd, mbmi->segment_id, SEG_LVL_MODE ) ) mbmi->mode = (MB_PREDICTION_MODE) get_segdata( xd, mbmi->segment_id, SEG_LVL_MODE ); @@ -968,7 +959,6 @@ void vp8_decode_mode_mvs(VP8D_COMP *pbi) int mb_row = -1; -//#if CONFIG_SEGFEATURES #if 0 FILE *statsfile; statsfile = fopen("decsegmap.stt", "a"); @@ -998,7 +988,6 @@ void vp8_decode_mode_mvs(VP8D_COMP *pbi) mb_to_bottom_edge = ((pbi->common.mb_rows - 1 - mb_row) * 16) << 3; mb_to_bottom_edge += RIGHT_BOTTOM_MARGIN; -//#if CONFIG_SEGFEATURES #if 0 fprintf(statsfile, "\n" ); #endif @@ -1045,7 +1034,6 @@ void vp8_decode_mode_mvs(VP8D_COMP *pbi) } #endif -//#if CONFIG_SEGFEATURES #if 0 fprintf(statsfile, "%2d%2d%2d ", mi->mbmi.segment_id, mi->mbmi.ref_frame, mi->mbmi.mode ); @@ -1058,7 +1046,6 @@ void vp8_decode_mode_mvs(VP8D_COMP *pbi) mi++; /* skip left predictor each row */ } -//#if CONFIG_SEGFEATURES #if 0 fclose(statsfile); #endif diff --git a/vp8/decoder/decodframe.c b/vp8/decoder/decodframe.c index 566af19f4..3140e70b7 100644 --- a/vp8/decoder/decodframe.c +++ b/vp8/decoder/decodframe.c @@ -38,7 +38,6 @@ #include "decoderthreading.h" #include "dboolhuff.h" -//#if CONFIG_SEGFEATURES #include "vp8/common/seg_common.h" #include @@ -81,7 +80,6 @@ void mb_init_dequantizer(VP8D_COMP *pbi, MACROBLOCKD *xd) int segment_id = xd->mode_info_context->mbmi.segment_id; // Set the Q baseline allowing for any segment level adjustment -//#if CONFIG_SEGFEATURES if ( segfeature_active( xd, segment_id, SEG_LVL_ALT_Q ) ) { /* Abs Value */ @@ -923,7 +921,6 @@ static void init_frame(VP8D_COMP *pbi) // Reset the segment feature data to the default stats: // Features disabled, 0, with delta coding (Default state). -//#if CONFIG_SEGFEATURES clearall_segfeatures( xd ); xd->mb_segement_abs_delta = SEGMENT_DELTADATA; @@ -1167,7 +1164,6 @@ int vp8_decode_frame(VP8D_COMP *pbi) xd->mb_segement_abs_delta = (unsigned char)vp8_read_bit(bc); -//#if CONFIG_SEGFEATURES clearall_segfeatures( xd ); // For each segmentation... @@ -1179,14 +1175,12 @@ int vp8_decode_frame(VP8D_COMP *pbi) // Is the feature enabled if (vp8_read_bit(bc)) { -//#if CONFIG_SEGFEATURES // Update the feature data and mask enable_segfeature(xd, i, j); data = (signed char)vp8_read_literal( bc, seg_feature_data_bits(j)); -//#if CONFIG_SEGFEATURES // Is the segment data signed.. if ( is_segfeature_signed(j) ) { diff --git a/vp8/decoder/detokenize.c b/vp8/decoder/detokenize.c index 3c0d7403d..6784ccd50 100644 --- a/vp8/decoder/detokenize.c +++ b/vp8/decoder/detokenize.c @@ -16,7 +16,6 @@ #include "vpx_ports/mem.h" #include "detokenize.h" -//#if CONFIG_SEGFEATURES #include "vp8/common/seg_common.h" #define BOOL_DATA UINT8 @@ -646,7 +645,6 @@ int vp8_decode_mb_tokens(VP8D_COMP *dx, MACROBLOCKD *xd) INT16 v; const vp8_prob *Prob; -//#if CONFIG_SEGFEATURES int seg_eob = 16; int segment_id = xd->mode_info_context->mbmi.segment_id; @@ -693,7 +691,6 @@ BLOCK_LOOP: Prob += v * ENTROPY_NODES; DO_WHILE: -//#if CONFIG_SEGFEATURES if ( c == seg_eob ) goto BLOCK_FINISHED; diff --git a/vp8/decoder/threading.c b/vp8/decoder/threading.c index 703cb95f4..3d17e18b8 100644 --- a/vp8/decoder/threading.c +++ b/vp8/decoder/threading.c @@ -72,7 +72,6 @@ static void setup_decoding_thread_data(VP8D_COMP *pbi, MACROBLOCKD *xd, MB_ROW_D vpx_memcpy(mbd->segment_feature_data, xd->segment_feature_data, sizeof(xd->segment_feature_data)); -//#if CONFIG_SEGFEATURES vpx_memcpy(mbd->segment_feature_mask, xd->segment_feature_mask, sizeof(xd->segment_feature_mask)); diff --git a/vp8/encoder/bitstream.c b/vp8/encoder/bitstream.c index 9e0211d7f..b318cc557 100644 --- a/vp8/encoder/bitstream.c +++ b/vp8/encoder/bitstream.c @@ -25,7 +25,6 @@ #include "defaultcoefcounts.h" -//#if CONFIG_SEGFEATURES #include "vp8/common/seg_common.h" #include "vp8/common/pred_common.h" @@ -844,7 +843,6 @@ static void encode_ref_frame( vp8_writer *const w, { int seg_ref_active; int seg_ref_count = 0; -//#if CONFIG_SEGFEATURES seg_ref_active = segfeature_active( xd, segment_id, SEG_LVL_REF_FRAME ); @@ -938,7 +936,6 @@ static void update_ref_probs( VP8_COMP *const cpi ) const int rf_inter = rfct[LAST_FRAME] + rfct[GOLDEN_FRAME] + rfct[ALTREF_FRAME]; -//#if CONFIG_SEGFEATURES cm->prob_intra_coded = (rf_intra + rf_inter) ? rf_intra * 255 / (rf_intra + rf_inter) : 1; @@ -1130,7 +1127,6 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) } } -//#if CONFIG_SEGFEATURES if ( pc->mb_no_coeff_skip && ( !segfeature_active( xd, segment_id, SEG_LVL_EOB ) || ( get_segdata( xd, segment_id, SEG_LVL_EOB ) != 0 ) ) ) @@ -1148,7 +1144,6 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) active_section = 6; #endif -//#if CONFIG_SEGFEATURES if ( !segfeature_active( xd, segment_id, SEG_LVL_MODE ) ) write_ymode(w, mode, pc->fc.ymode_prob); @@ -1207,7 +1202,6 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) active_section = 3; #endif -//#if CONFIG_SEGFEATURES // Is the segment coding of mode enabled if ( !segfeature_active( xd, segment_id, SEG_LVL_MODE ) ) { @@ -1471,7 +1465,6 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) } } -//#if CONFIG_SEGFEATURES if ( pc->mb_no_coeff_skip && ( !segfeature_active( xd, segment_id, SEG_LVL_EOB ) || ( get_segdata( xd, segment_id, SEG_LVL_EOB ) != 0 ) ) ) @@ -1489,7 +1482,6 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) active_section = 6; #endif -//#if CONFIG_SEGFEATURES if ( !segfeature_active( xd, segment_id, SEG_LVL_MODE ) ) write_ymode(w, mode, pc->fc.ymode_prob); @@ -1548,7 +1540,6 @@ static void pack_inter_mode_mvs(VP8_COMP *const cpi) active_section = 3; #endif -//#if CONFIG_SEGFEATURES // Is the segment coding of mode enabled if ( !segfeature_active( xd, segment_id, SEG_LVL_MODE ) ) { @@ -1671,7 +1662,6 @@ static void write_kfmodes(VP8_COMP *cpi) int col_delta[4] = {+1, -1, +1, +1}; const int mis = c->mode_info_stride; -//#if CONFIG_SEGFEATURES MACROBLOCKD *xd = &cpi->mb.e_mbd; if (c->mb_no_coeff_skip) @@ -1734,7 +1724,6 @@ static void write_kfmodes(VP8_COMP *cpi) write_mb_segid(bc, &m->mbmi, &cpi->mb.e_mbd); } -//#if CONFIG_SEGFEATURES if ( c->mb_no_coeff_skip && ( !segfeature_active( xd, segment_id, SEG_LVL_EOB ) || (get_segdata( xd, segment_id, SEG_LVL_EOB ) != 0) ) ) @@ -1798,7 +1787,6 @@ static void write_kfmodes(VP8_COMP *cpi) int mb_row = -1; int prob_skip_false = 0; -//#if CONFIG_SEGFEATURES MACROBLOCKD *xd = &cpi->mb.e_mbd; if (c->mb_no_coeff_skip) @@ -1843,7 +1831,6 @@ static void write_kfmodes(VP8_COMP *cpi) write_mb_segid(bc, &m->mbmi, &cpi->mb.e_mbd); } -//#if CONFIG_SEGFEATURES if ( c->mb_no_coeff_skip && ( !segfeature_active( xd, segment_id, SEG_LVL_EOB ) || (get_segdata( xd, segment_id, SEG_LVL_EOB ) != 0) ) ) @@ -2596,7 +2583,6 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) vp8_write_bit(bc, (xd->mb_segement_abs_delta) ? 1 : 0); -//#if CONFIG_SEGFEATURES // For each segments id... for (i = 0; i < MAX_MB_SEGMENTS; i++) { @@ -2605,13 +2591,11 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size) { Data = get_segdata( xd, i, j ); -//#if CONFIG_SEGFEATURES // If the feature is enabled... if ( segfeature_active( xd, i, j ) ) { vp8_write_bit(bc, 1); -//#if CONFIG_SEGFEATURES // Is the segment data signed.. if ( is_segfeature_signed(j) ) { diff --git a/vp8/encoder/block.h b/vp8/encoder/block.h index 68de571c5..3ac3d79f0 100644 --- a/vp8/encoder/block.h +++ b/vp8/encoder/block.h @@ -46,7 +46,6 @@ typedef struct int src; int src_stride; -//#if CONFIG_SEGFEATURES int eob_max_offset; } BLOCK; diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index 1600456ec..a0909eb76 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -33,7 +33,6 @@ #include "vpx_ports/vpx_timer.h" #include "vp8/common/pred_common.h" -//#if CONFIG_SEGFEATURES //#define DBG_PRNT_SEGMAP 1 #if CONFIG_RUNTIME_CPU_DETECT @@ -807,7 +806,6 @@ void encode_sb_row (VP8_COMP *cpi, x->partition_info += 1 - (cm->mb_cols & 0x1) + xd->mode_info_stride; x->gf_active_ptr += cm->mb_cols - (cm->mb_cols & 0x1); -//#if CONFIG_SEGFEATURES // debug output #if DBG_PRNT_SEGMAP { @@ -1061,7 +1059,6 @@ void encode_mb_row(VP8_COMP *cpi, #endif -//#if CONFIG_SEGFEATURES // debug output #if DBG_PRNT_SEGMAP { @@ -1186,7 +1183,6 @@ static void encode_frame_internal(VP8_COMP *cpi) // this frame which may be updated with each itteration of the recode loop. compute_mod_refprobs( cm ); -//#if CONFIG_SEGFEATURES // debug output #if DBG_PRNT_SEGMAP { @@ -1878,7 +1874,6 @@ int vp8cx_encode_inter_macroblock vp8cx_mb_init_quantizer(cpi, x); } } -//#if CONFIG_SEGFEATURES else { //segfeature_test_function(cpi, xd); @@ -1927,7 +1922,6 @@ int vp8cx_encode_inter_macroblock vp8_update_zbin_extra(cpi, x); } -//#if CONFIG_SEGFEATURES seg_ref_active = segfeature_active( xd, *segment_id, SEG_LVL_REF_FRAME ); // SET VARIOUS PREDICTION FLAGS diff --git a/vp8/encoder/ethreading.c b/vp8/encoder/ethreading.c index 885a8cfdf..c715149be 100644 --- a/vp8/encoder/ethreading.c +++ b/vp8/encoder/ethreading.c @@ -358,7 +358,6 @@ static void setup_mbby_copy(MACROBLOCK *mbdst, MACROBLOCK *mbsrc) z->block[i].src = x->block[i].src; */ z->block[i].src_stride = x->block[i].src_stride; -//#if CONFIG_SEGFEATURES z->block[i].eob_max_offset = x->block[i].eob_max_offset; } @@ -402,7 +401,6 @@ static void setup_mbby_copy(MACROBLOCK *mbdst, MACROBLOCK *mbsrc) xd->segment_feature_data, sizeof(xd->segment_feature_data)); -//#if CONFIG_SEGFEATURES vpx_memcpy(zd->segment_feature_mask, xd->segment_feature_mask, sizeof(xd->segment_feature_mask)); diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index d06d12822..3c94cb51d 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -34,7 +34,6 @@ #include "vpx_ports/vpx_timer.h" #include "temporal_filter.h" -//#if CONFIG_SEGFEATURES #include "vp8/common/seg_common.h" #include "mbgraph.h" #include "vp8/common/pred_common.h" @@ -298,7 +297,6 @@ static void setup_features(VP8_COMP *cpi) xd->update_mb_segmentation_data = 0; vpx_memset(xd->mb_segment_tree_probs, 255, sizeof(xd->mb_segment_tree_probs)); -//#if CONFIG_SEGFEATURES clearall_segfeatures( xd ); xd->mode_ref_lf_delta_enabled = 0; @@ -422,7 +420,6 @@ static void segmentation_test_function(VP8_PTR ptr) feature_data[SEG_LVL_ALT_LF][2] = 0; feature_data[SEG_LVL_ALT_LF][3] = 0; -//#if CONFIG_SEGFEATURES // Enable features as required enable_segfeature(xd, 1, SEG_LVL_ALT_Q); @@ -466,7 +463,6 @@ static int compute_qdelta( VP8_COMP *cpi, double qstart, double qtarget ) return target_index - start_index; } -//#if CONFIG_SEGFEATURES static void init_seg_features(VP8_COMP *cpi) { VP8_COMMON *cm = &cpi->common; @@ -791,7 +787,6 @@ static void cyclic_background_refresh(VP8_COMP *cpi, int Q, int lf_adjustment) feature_data[SEG_LVL_ALT_LF][2] = 0; feature_data[SEG_LVL_ALT_LF][3] = 0; -//#if CONFIG_SEGFEATURES // Enable the loop and quant changes in the feature mask enable_segfeature(xd, 1, SEG_LVL_ALT_Q); enable_segfeature(xd, 1, SEG_LVL_ALT_LF); @@ -2398,7 +2393,6 @@ VP8_PTR vp8_create_compressor(VP8_CONFIG *oxcf) } #endif -//#if CONFIG_SEGFEATURES for (i = 0; i < ( sizeof(cpi->mbgraph_stats) / sizeof(cpi->mbgraph_stats[0]) ); i++) { @@ -2893,7 +2887,6 @@ void vp8_remove_compressor(VP8_PTR *ptr) vpx_free(cpi->tok); vpx_free(cpi->cyclic_refresh_map); -//#if CONFIG_SEGFEATURES for (i = 0; i < sizeof(cpi->mbgraph_stats) / sizeof(cpi->mbgraph_stats[0]); i++) { vpx_free(cpi->mbgraph_stats[i].mb_stats); @@ -5106,7 +5099,6 @@ static void encode_frame_to_data_rate #endif -//#if CONFIG_SEGFEATURES #if 0 // Debug stats for segment feature experiments. print_seg_map(cpi); @@ -5853,7 +5845,6 @@ int vp8_set_roimap(VP8_PTR comp, unsigned char *map, unsigned int rows, unsigned cpi->segment_encode_breakout[2] = threshold[2]; cpi->segment_encode_breakout[3] = threshold[3]; -//#if CONFIG_SEGFEATURES // Enable the loop and quant changes in the feature mask for ( i = 0; i < 4; i++ ) { diff --git a/vp8/encoder/pickinter.c b/vp8/encoder/pickinter.c index 8b78986e2..f8afeaddc 100644 --- a/vp8/encoder/pickinter.c +++ b/vp8/encoder/pickinter.c @@ -27,7 +27,6 @@ #include "rdopt.h" #include "vpx_mem/vpx_mem.h" -//#if CONFIG_SEGFEATURES #include "vp8/common/seg_common.h" #if CONFIG_RUNTIME_CPU_DETECT @@ -544,7 +543,6 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, this_mode = vp8_mode_order[mode_index]; -//#if CONFIG_SEGFEATURES // If the segment reference frame feature is enabled.... // then do nothing if the current ref frame is not allowed.. if ( segfeature_active( xd, segment_id, SEG_LVL_REF_FRAME ) && @@ -569,7 +567,6 @@ void vp8_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, continue; } #endif -//#if !CONFIG_SEGFEATURES // Disable this drop out case if either the mode or ref frame // segment level feature is enabled for this segment. This is to // prevent the possibility that the we end up unable to pick any mode. 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 ) ) diff --git a/vp8/encoder/rdopt.c b/vp8/encoder/rdopt.c index d9409b32f..3d35228d7 100644 --- a/vp8/encoder/rdopt.c +++ b/vp8/encoder/rdopt.c @@ -38,7 +38,6 @@ #include "dct.h" #include "vp8/common/systemdependent.h" -//#if CONFIG_SEGFEATURES #include "vp8/common/seg_common.h" #include "vp8/common/pred_common.h" @@ -2248,7 +2247,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int x->e_mbd.mode_info_context->mbmi.second_ref_frame = vp8_second_ref_frame_order[mode_index]; #endif /* CONFIG_DUALPRED */ -//#if CONFIG_SEGFEATURES // If the segment reference frame feature is enabled.... // then do nothing if the current ref frame is not allowed.. if ( segfeature_active( xd, segment_id, SEG_LVL_REF_FRAME ) && @@ -2276,7 +2274,6 @@ void vp8_rd_pick_inter_mode(VP8_COMP *cpi, MACROBLOCK *x, int recon_yoffset, int } #endif -//#if !CONFIG_SEGFEATURES // Disable this drop out case if either the mode or ref frame // segment level feature is enabled for this segment. This is to // prevent the possibility that the we end up unable to pick any mode. diff --git a/vp8/encoder/segmentation.c b/vp8/encoder/segmentation.c index 4a1ce649c..c4a147558 100644 --- a/vp8/encoder/segmentation.c +++ b/vp8/encoder/segmentation.c @@ -111,7 +111,6 @@ void vp8_set_segment_data(VP8_PTR ptr, vpx_memcpy(cpi->mb.e_mbd.segment_feature_data, feature_data, sizeof(cpi->mb.e_mbd.segment_feature_data)); -//#if CONFIG_SEGFEATURES // TBD ?? Set the feature mask // vpx_memcpy(cpi->mb.e_mbd.segment_feature_mask, 0, // sizeof(cpi->mb.e_mbd.segment_feature_mask)); diff --git a/vp8/encoder/tokenize.c b/vp8/encoder/tokenize.c index f14ad0794..2a17c312c 100644 --- a/vp8/encoder/tokenize.c +++ b/vp8/encoder/tokenize.c @@ -17,7 +17,6 @@ #include "tokenize.h" #include "vpx_mem/vpx_mem.h" -//#if CONFIG_SEGFEATURES #include "vp8/common/seg_common.h" /* Global event counters used for accumulating statistics across several @@ -184,7 +183,6 @@ static void tokenize2nd_order_b ENTROPY_CONTEXT * l; int band, rc, v, token; -//#if CONFIG_SEGFEATURES int seg_eob = 16; int segment_id = xd->mode_info_context->mbmi.segment_id; @@ -220,7 +218,6 @@ static void tokenize2nd_order_b t++; } -//#if CONFIG_SEGFEATURES if (c < seg_eob) { band = vp8_coef_bands[c]; @@ -320,7 +317,6 @@ static void tokenize1st_order_b int band, rc, v; int tmp1, tmp2; -//#if CONFIG_SEGFEATURES int seg_eob = 16; int segment_id = xd->mode_info_context->mbmi.segment_id; @@ -364,7 +360,6 @@ static void tokenize1st_order_b t++; } -//#if CONFIG_SEGFEATURES if (c < seg_eob) { band = vp8_coef_bands[c]; @@ -413,7 +408,7 @@ static void tokenize1st_order_b pt = vp8_prev_token_class[token]; t++; } -//#if CONFIG_SEGFEATURES + if (c < seg_eob) { band = vp8_coef_bands[c]; @@ -483,7 +478,6 @@ void vp8_tokenize_mb(VP8_COMP *cpi, MACROBLOCKD *x, TOKENEXTRA **t) int tx_type = get_seg_tx_type(x, x->mode_info_context->mbmi.segment_id); #endif -//#if CONFIG_SEGFEATURES // If the MB is going to be skipped because of a segment level flag // exclude this from the skip count stats used to calculate the // transmitted skip probability; diff --git a/vp8/encoder/x86/x86_csystemdependent.c b/vp8/encoder/x86/x86_csystemdependent.c index 382eb0e42..d24e7dc4d 100644 --- a/vp8/encoder/x86/x86_csystemdependent.c +++ b/vp8/encoder/x86/x86_csystemdependent.c @@ -217,9 +217,6 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi) cpi->rtcd.encodemb.submby = vp8_subtract_mby_sse2; cpi->rtcd.encodemb.submbuv = vp8_subtract_mbuv_sse2; -//#if !CONFIG_SEGFEATURES -// cpi->rtcd.quantize.quantb = vp8_regular_quantize_b_sse2; -//#endif cpi->rtcd.quantize.fastquantb = vp8_fast_quantize_b_sse2; #if !(CONFIG_REALTIME_ONLY) @@ -280,10 +277,6 @@ void vp8_arch_x86_encoder_init(VP8_COMP *cpi) cpi->rtcd.variance.sad8x8x8 = vp8_sad8x8x8_sse4; cpi->rtcd.variance.sad4x4x8 = vp8_sad4x4x8_sse4; cpi->rtcd.search.full_search = vp8_full_search_sadx8; - -//#if !CONFIG_SEGFEATURES -// cpi->rtcd.quantize.quantb = vp8_regular_quantize_b_sse4; -//#endif } #endif -- 2.40.0