diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-04-20 11:05:50 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-20 11:05:50 -0700 |
| commit | c7a38f77ef8aefbfec20f90da681659ec2f05cce (patch) | |
| tree | 3257406f70d0555520eb2de1c549337233970f31 /vp9/encoder/vp9_segmentation.c | |
| parent | d6da2ae308edc0376b7e65eafaf2584bc67c9cc0 (diff) | |
| parent | c09f652590fe6a18f76eeee15c8722ce236c8a0a (diff) | |
| download | libvpx-c7a38f77ef8aefbfec20f90da681659ec2f05cce.tar libvpx-c7a38f77ef8aefbfec20f90da681659ec2f05cce.tar.gz libvpx-c7a38f77ef8aefbfec20f90da681659ec2f05cce.tar.bz2 libvpx-c7a38f77ef8aefbfec20f90da681659ec2f05cce.zip | |
Merge "Removing get_segment_id function and using existing vp9_get_pred_mb_segid." into experimental
Diffstat (limited to 'vp9/encoder/vp9_segmentation.c')
| -rw-r--r-- | vp9/encoder/vp9_segmentation.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_segmentation.c b/vp9/encoder/vp9_segmentation.c index e48c11db1..6336969fb 100644 --- a/vp9/encoder/vp9_segmentation.c +++ b/vp9/encoder/vp9_segmentation.c @@ -171,7 +171,6 @@ static void count_segs(VP9_COMP *cpi, int bw, int bh, int mb_row, int mb_col) { VP9_COMMON *const cm = &cpi->common; MACROBLOCKD *const xd = &cpi->mb.e_mbd; - const int segmap_index = mb_row * cm->mb_cols + mb_col; const int segment_id = mi->mbmi.segment_id; xd->mode_info_context = mi; @@ -184,7 +183,8 @@ static void count_segs(VP9_COMP *cpi, // Temporal prediction not allowed on key frames if (cm->frame_type != KEY_FRAME) { // Test to see if the segment id matches the predicted value. - const int pred_seg_id = vp9_get_pred_mb_segid(cm, xd, segmap_index); + const int pred_seg_id = vp9_get_pred_mb_segid(cm, mi->mbmi.sb_type, + mb_row, mb_col); const int seg_predicted = (segment_id == pred_seg_id); // Get the segment id prediction context |