From 6ef5a00538d6862634ce7d95507e9d4d3e037736 Mon Sep 17 00:00:00 2001 From: John Koleszar Date: Tue, 16 Oct 2012 13:52:39 -0700 Subject: Interleave modes/residual per macroblock Packs the bitstream with each mb's residual following its mode/mv information. TODO: There are still a few fields that should be packed into partition 0 but are included in partition 1, due to them being serialized from write_kfmodes/pack_inter_mode_mvs, which execute after the first partition is finalized. These need to be separated out into a separate function, similar to mb_mode_mv_init() in decodemv.c. Change-Id: I43a46c363601ab36954d07ebe498760e1e2e3af4 --- vp8/common/pred_common.h | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) (limited to 'vp8/common/pred_common.h') 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__ */ -- cgit v1.2.3