diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-29 16:07:17 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-04-29 16:07:17 -0700 |
| commit | ee97da2c0317275e12eae68437a5cf212323c4fb (patch) | |
| tree | acbae01c29d1624cfe5c77e4bf652d36610b4782 /vp9/encoder/vp9_encodeframe.c | |
| parent | bbac4094e4cb2cc782040733656bf2ee5738ee59 (diff) | |
| download | libvpx-ee97da2c0317275e12eae68437a5cf212323c4fb.tar libvpx-ee97da2c0317275e12eae68437a5cf212323c4fb.tar.gz libvpx-ee97da2c0317275e12eae68437a5cf212323c4fb.tar.bz2 libvpx-ee97da2c0317275e12eae68437a5cf212323c4fb.zip | |
Cleaning up encoder segmentation code.
Moving code from vp9_pack_bitstream to new function encode_segmentation.
Change-Id: I1f1e59a1f038618ad95162b7db4b6f8164850ea8
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 3877391d8..06b4d6316 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -631,13 +631,11 @@ static void set_offsets(VP9_COMP *cpi, /* segment ID */ if (xd->segmentation_enabled) { - if (xd->update_mb_segmentation_map) { - mbmi->segment_id = find_seg_id(cpi->segmentation_map, bsize, - mi_row, cm->mi_rows, mi_col, cm->mi_cols); - } else { - mbmi->segment_id = find_seg_id(cm->last_frame_seg_map, bsize, - mi_row, cm->mi_rows, mi_col, cm->mi_cols); - } + uint8_t *map = xd->update_mb_segmentation_map ? cpi->segmentation_map + : cm->last_frame_seg_map; + mbmi->segment_id = find_seg_id(map, bsize, mi_row, + cm->mi_rows, mi_col, cm->mi_cols); + assert(mbmi->segment_id <= (MAX_MB_SEGMENTS-1)); vp9_mb_init_quantizer(cpi, x); |