diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2011-11-08 15:40:32 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2011-11-09 11:59:20 +0000 |
| commit | b0f9f15dbd200a02103afc18e5674d2000699f65 (patch) | |
| tree | 30ebc5bb0d1c1629ea60e05286cddd242e87e4c2 /vp8/encoder/encodeframe.c | |
| parent | ac2ab02dcfc52a3cf97dde620c65a698b5fd376b (diff) | |
| download | libvpx-b0f9f15dbd200a02103afc18e5674d2000699f65.tar libvpx-b0f9f15dbd200a02103afc18e5674d2000699f65.tar.gz libvpx-b0f9f15dbd200a02103afc18e5674d2000699f65.tar.bz2 libvpx-b0f9f15dbd200a02103afc18e5674d2000699f65.zip | |
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
Diffstat (limited to 'vp8/encoder/encodeframe.c')
| -rw-r--r-- | vp8/encoder/encodeframe.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/vp8/encoder/encodeframe.c b/vp8/encoder/encodeframe.c index eab6c817a..031e63ac7 100644 --- a/vp8/encoder/encodeframe.c +++ b/vp8/encoder/encodeframe.c @@ -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; |