diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-10-17 15:15:10 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2012-10-17 15:15:10 -0700 |
| commit | c6f13f32784330350f176f453c8a4c2a9f6b90a6 (patch) | |
| tree | 98b17d6bfc0fcbc980a41b6f68375c667f118184 /vp8/common/pred_common.h | |
| parent | eab804558bb7ff3fb503a1f9ccaf641d0dbc0120 (diff) | |
| parent | 47a2154c0e1130a247b7920b0a0c57ada212abc1 (diff) | |
| download | libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.tar libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.tar.gz libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.tar.bz2 libvpx-c6f13f32784330350f176f453c8a4c2a9f6b90a6.zip | |
Merge changes Ic711a378,I43a46c36,If19ee74a into experimental
* changes:
Move remaining per-frame data into partition 0
Interleave modes/residual per macroblock
Force interleaved decoding
Diffstat (limited to 'vp8/common/pred_common.h')
| -rw-r--r-- | vp8/common/pred_common.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/vp8/common/pred_common.h b/vp8/common/pred_common.h index f4992f555..402e0235f 100644 --- a/vp8/common/pred_common.h +++ b/vp8/common/pred_common.h @@ -28,19 +28,19 @@ typedef enum { } PRED_ID; -extern unsigned char get_pred_context(VP8_COMMON *const cm, - MACROBLOCKD *const xd, +extern unsigned char get_pred_context(const VP8_COMMON *const cm, + const MACROBLOCKD *const xd, PRED_ID pred_id); -extern vp8_prob get_pred_prob(VP8_COMMON *const cm, - MACROBLOCKD *const xd, +extern vp8_prob get_pred_prob(const VP8_COMMON *const cm, + const MACROBLOCKD *const xd, PRED_ID pred_id); -extern vp8_prob *get_pred_probs(VP8_COMMON *const cm, - MACROBLOCKD *const xd, +extern const vp8_prob *get_pred_probs(const VP8_COMMON *const cm, + const MACROBLOCKD *const xd, PRED_ID pred_id); -extern unsigned char get_pred_flag(MACROBLOCKD *const xd, +extern unsigned char get_pred_flag(const MACROBLOCKD *const xd, PRED_ID pred_id); extern void set_pred_flag(MACROBLOCKD *const xd, @@ -48,10 +48,10 @@ extern void set_pred_flag(MACROBLOCKD *const xd, unsigned char pred_flag); -extern unsigned char get_pred_mb_segid(VP8_COMMON *const cm, int MbIndex); +extern unsigned char get_pred_mb_segid(const VP8_COMMON *const cm, int MbIndex); -extern MV_REFERENCE_FRAME get_pred_ref(VP8_COMMON *const cm, - MACROBLOCKD *const xd); +extern MV_REFERENCE_FRAME get_pred_ref(const VP8_COMMON *const cm, + const MACROBLOCKD *const xd); extern void compute_mod_refprobs(VP8_COMMON *const cm); #endif /* __INC_PRED_COMMON_H__ */ |