diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2013-04-24 13:04:45 +0100 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2013-04-24 16:36:47 +0100 |
| commit | 31ee193a9ccfccef65dad0fba3462b9f83db97fa (patch) | |
| tree | a2d5f3cfb21c928911173031951c78604f37284c /vp9/encoder/vp9_encodeframe.c | |
| parent | c77aff1286df07fb9f3b49feaacf384703813eca (diff) | |
| download | libvpx-31ee193a9ccfccef65dad0fba3462b9f83db97fa.tar libvpx-31ee193a9ccfccef65dad0fba3462b9f83db97fa.tar.gz libvpx-31ee193a9ccfccef65dad0fba3462b9f83db97fa.tar.bz2 libvpx-31ee193a9ccfccef65dad0fba3462b9f83db97fa.zip | |
Extension of segmentation to 8 segments.
Also some further simplification following removal
of top node code.
There is an issue in regards to the shared file vp8cx.h
in regard to the roi_map as this interface assumes that
there are only 4 segments. I have left the value here as
4 for now meaning that the roi_map interface is broken
for VP9.
Note that this change would have been easier if I hadn't
had to search for hard wire instances of the number 4
and <= 3.
Change-Id: Ia8b6deea4be4dbd20deb1656e689dd43a5f190e8
Diffstat (limited to 'vp9/encoder/vp9_encodeframe.c')
| -rw-r--r-- | vp9/encoder/vp9_encodeframe.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 0837931e5..b1b28c785 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -594,7 +594,7 @@ static void set_offsets(VP9_COMP *cpi, mbmi->segment_id = find_seg_id(cm->last_frame_seg_map, bsize, mb_row, cm->mb_rows, mb_col, cm->mb_cols); } - assert(mbmi->segment_id <= 3); + assert(mbmi->segment_id <= (MAX_MB_SEGMENTS-1)); vp9_mb_init_quantizer(cpi, x); if (xd->segmentation_enabled && cpi->seg0_cnt > 0 && |