diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2013-06-27 14:57:07 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-06-27 14:57:07 -0700 |
| commit | a3664258c5cb8295c128c157bf73363434635960 (patch) | |
| tree | 4804435979c3c55a2bd02d211f617ca6897a51b3 /vp9/common/vp9_pred_common.h | |
| parent | be83ef3104311fd507108e93a07b75f08d937e46 (diff) | |
| parent | be07485e9a9dec736d3619fc7e39657e55415bca (diff) | |
| download | libvpx-a3664258c5cb8295c128c157bf73363434635960.tar libvpx-a3664258c5cb8295c128c157bf73363434635960.tar.gz libvpx-a3664258c5cb8295c128c157bf73363434635960.tar.bz2 libvpx-a3664258c5cb8295c128c157bf73363434635960.zip | |
Merge "General cleanup in segmentation-related code."
Diffstat (limited to 'vp9/common/vp9_pred_common.h')
| -rw-r--r-- | vp9/common/vp9_pred_common.h | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/vp9/common/vp9_pred_common.h b/vp9/common/vp9_pred_common.h index 100102b61..2717ff188 100644 --- a/vp9/common/vp9_pred_common.h +++ b/vp9/common/vp9_pred_common.h @@ -27,27 +27,21 @@ typedef enum { PRED_TX_SIZE = 8 } PRED_ID; -unsigned char vp9_get_pred_context(const VP9_COMMON *const cm, - const MACROBLOCKD *const xd, +unsigned char vp9_get_pred_context(const VP9_COMMON *cm, const MACROBLOCKD *xd, PRED_ID pred_id); -vp9_prob vp9_get_pred_prob(const VP9_COMMON *const cm, - const MACROBLOCKD *const xd, +vp9_prob vp9_get_pred_prob(const VP9_COMMON *cm, const MACROBLOCKD *xd, PRED_ID pred_id); -const vp9_prob *vp9_get_pred_probs(const VP9_COMMON *const cm, - const MACROBLOCKD *const xd, +const vp9_prob *vp9_get_pred_probs(const VP9_COMMON *cm, const MACROBLOCKD *xd, PRED_ID pred_id); -unsigned char vp9_get_pred_flag(const MACROBLOCKD *const xd, - PRED_ID pred_id); +unsigned char vp9_get_pred_flag(const MACROBLOCKD *xd, PRED_ID pred_id); -void vp9_set_pred_flag(MACROBLOCKD *const xd, - PRED_ID pred_id, +void vp9_set_pred_flag(MACROBLOCKD *xd, PRED_ID pred_id, unsigned char pred_flag); - -int vp9_get_pred_mi_segid(VP9_COMMON *cm, BLOCK_SIZE_TYPE sb_type, - uint8_t *segment_ids, int mi_row, int mi_col); +int vp9_get_segment_id(VP9_COMMON *cm, const uint8_t *segment_ids, + BLOCK_SIZE_TYPE bsize, int mi_row, int mi_col); #endif // VP9_COMMON_VP9_PRED_COMMON_H_ |