diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-06-20 15:52:47 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2013-06-21 13:05:10 -0700 |
| commit | 40141681c05cd9c988f63ddb19688f0ed7a17173 (patch) | |
| tree | bb0bcaa94380c954956b1e36aed4910dabc48c1b /vp9/decoder/vp9_decodemv.c | |
| parent | 7756e9892b312e668fc3134bad2513806d609f73 (diff) | |
| download | libvpx-40141681c05cd9c988f63ddb19688f0ed7a17173.tar libvpx-40141681c05cd9c988f63ddb19688f0ed7a17173.tar.gz libvpx-40141681c05cd9c988f63ddb19688f0ed7a17173.tar.bz2 libvpx-40141681c05cd9c988f63ddb19688f0ed7a17173.zip | |
Removing find_seg_id and using vp9_get_pred_mi_segid instead.
Change-Id: Ia40229903c08f14020e90e94cfdf494aba1be827
Diffstat (limited to 'vp9/decoder/vp9_decodemv.c')
| -rw-r--r-- | vp9/decoder/vp9_decodemv.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/vp9/decoder/vp9_decodemv.c b/vp9/decoder/vp9_decodemv.c index d8836c962..ac97e5c21 100644 --- a/vp9/decoder/vp9_decodemv.c +++ b/vp9/decoder/vp9_decodemv.c @@ -428,6 +428,7 @@ static int read_mb_segment_id(VP9D_COMP *pbi, int mi_row, int mi_col, // If the value is flagged as correctly predicted // then use the predicted value, otherwise decode it explicitly segment_id = pred_flag ? vp9_get_pred_mi_segid(cm, mbmi->sb_type, + cm->last_frame_seg_map, mi_row, mi_col) : read_mb_segid(r, xd); } else { @@ -437,7 +438,8 @@ static int read_mb_segment_id(VP9D_COMP *pbi, int mi_row, int mi_col, set_segment_id(cm, mbmi, mi_row, mi_col, segment_id); // Side effect return segment_id; } else { - return vp9_get_pred_mi_segid(cm, mbmi->sb_type, mi_row, mi_col); + return vp9_get_pred_mi_segid(cm, mbmi->sb_type, cm->last_frame_seg_map, + mi_row, mi_col); } } |