Commit b0f9f15d authored by Paul Wilkins's avatar Paul Wilkins
Browse files

Merging and testing of SEGMENTATION experiment.

Removed code in #if CONFIG_SEGMENTATION that
enables segmentation and creates a test segmentation
map, to avoid conflicts with the other segmentation test
code,

Change-Id: I7a21a44ed188b814cd80b30dd628c62474eba730
parent ac2ab02d
......@@ -2013,9 +2013,7 @@ void vp8_pack_bitstream(VP8_COMP *cpi, unsigned char *dest, unsigned long *size)
}
else
vp8_start_encode(bc, cx_data);
#if CONFIG_SEGMENTATION
xd->update_mb_segmentation_map = 1;
#endif
// Signal whether or not Segmentation is enabled
vp8_write_bit(bc, (xd->segmentation_enabled) ? 1 : 0);
......
......@@ -773,12 +773,6 @@ void encode_mb_row(VP8_COMP *cpi,
// Increment the activity mask pointers.
x->mb_activity_ptr++;
#if CONFIG_SEGMENTATION
if ((xd->mode_info_context->mbmi.mode == ZEROMV) && (xd->mode_info_context->mbmi.ref_frame == LAST_FRAME))
xd->mode_info_context->mbmi.segment_id = 0;
else
xd->mode_info_context->mbmi.segment_id = 1;
#endif
// adjust to the next column of macroblocks
x->src.y_buffer += 16;
x->src.u_buffer += 8;
......
......@@ -328,11 +328,9 @@ static void setup_features(VP8_COMP *cpi)
MACROBLOCKD *xd = &cpi->mb.e_mbd;
// Set up default state for MB feature flags
#if CONFIG_SEGMENTATION
xd->segmentation_enabled = 1;
#else
xd->segmentation_enabled = 0;
#endif
xd->segmentation_enabled = 0; // Default segmentation disabled
xd->update_mb_segmentation_map = 0;
xd->update_mb_segmentation_data = 0;
vpx_memset(xd->mb_segment_tree_probs, 255, sizeof(xd->mb_segment_tree_probs));
......@@ -3706,16 +3704,8 @@ static void encode_frame_to_data_rate
update_rd_ref_frame_probs(cpi);
// Test code for segmentation of gf/arf (0,0)
//segmentation_test_function((VP8_PTR) cpi);
#if CONFIG_SEGMENTATION
cpi->mb.e_mbd.segmentation_enabled = 1;
cpi->mb.e_mbd.update_mb_segmentation_map = 1;
#else
//#if CONFIG_SEGFEATURES
// Test code for new segment features
init_seg_features( cpi );
#endif
if (cpi->drop_frames_allowed)
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment