diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-06-25 10:16:06 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-25 10:16:06 -0700 |
| commit | 70e96221850445d82908b3b50f12e176de005974 (patch) | |
| tree | 2d135f38d5581a782afac16d3a98700d3ba3a3f3 /vp9/common | |
| parent | 529679bd52640010aabafef6a0b879a4196d3163 (diff) | |
| parent | 40141681c05cd9c988f63ddb19688f0ed7a17173 (diff) | |
| download | libvpx-70e96221850445d82908b3b50f12e176de005974.tar libvpx-70e96221850445d82908b3b50f12e176de005974.tar.gz libvpx-70e96221850445d82908b3b50f12e176de005974.tar.bz2 libvpx-70e96221850445d82908b3b50f12e176de005974.zip | |
Merge "Removing find_seg_id and using vp9_get_pred_mi_segid instead."
Diffstat (limited to 'vp9/common')
| -rw-r--r-- | vp9/common/vp9_pred_common.c | 4 | ||||
| -rw-r--r-- | vp9/common/vp9_pred_common.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vp9/common/vp9_pred_common.c b/vp9/common/vp9_pred_common.c index 17da4f215..d921a1197 100644 --- a/vp9/common/vp9_pred_common.c +++ b/vp9/common/vp9_pred_common.c @@ -501,7 +501,7 @@ void vp9_set_pred_flag(MACROBLOCKD *const xd, // Macroblock segment id prediction function int vp9_get_pred_mi_segid(VP9_COMMON *cm, BLOCK_SIZE_TYPE sb_type, - int mi_row, int mi_col) { + uint8_t *segment_ids, int mi_row, int mi_col) { const int mi_index = mi_row * cm->mi_cols + mi_col; const int bw = 1 << mi_width_log2(sb_type); const int bh = 1 << mi_height_log2(sb_type); @@ -513,7 +513,7 @@ int vp9_get_pred_mi_segid(VP9_COMMON *cm, BLOCK_SIZE_TYPE sb_type, for (y = 0; y < ymis; y++) { for (x = 0; x < xmis; x++) { const int index = mi_index + (y * cm->mi_cols + x); - segment_id = MIN(segment_id, cm->last_frame_seg_map[index]); + segment_id = MIN(segment_id, segment_ids[index]); } } return segment_id; diff --git a/vp9/common/vp9_pred_common.h b/vp9/common/vp9_pred_common.h index b728724b7..100102b61 100644 --- a/vp9/common/vp9_pred_common.h +++ b/vp9/common/vp9_pred_common.h @@ -48,6 +48,6 @@ void vp9_set_pred_flag(MACROBLOCKD *const xd, int vp9_get_pred_mi_segid(VP9_COMMON *cm, BLOCK_SIZE_TYPE sb_type, - int mi_row, int mi_col); + uint8_t *segment_ids, int mi_row, int mi_col); #endif // VP9_COMMON_VP9_PRED_COMMON_H_ |