Removal of SEGFEATURES placeholder comments

This commit only involves the removal of placeholder comments
//#if CONFIG_SEGFEATURES.

Change-Id: I94b350daaf998ee0cfdde5aa25b1d3b0522ab816

4 files changed, 0 insertions, 23 deletions

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 <assert.h>
@@ -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));