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/seg_common.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'vp8/common/seg_common.c') diff --git a/vp8/common/seg_common.c b/vp8/common/seg_common.c index b616391ba..a11fe87e9 100644 --- a/vp8/common/seg_common.c +++ b/vp8/common/seg_common.c @@ -19,7 +19,7 @@ const int vp8_seg_feature_data_bits[SEG_LVL_MAX] = // the coding mechanism is still subject to change so these provide a // convenient single point of change. -int segfeature_active(MACROBLOCKD *xd, +int segfeature_active(const MACROBLOCKD *xd, int segment_id, SEG_LVL_FEATURES feature_id) { // Return true if mask bit set and segmentation enabled. @@ -66,7 +66,7 @@ void set_segdata(MACROBLOCKD *xd, xd->segment_feature_data[segment_id][feature_id] = seg_data; } -int get_segdata(MACROBLOCKD *xd, +int get_segdata(const MACROBLOCKD *xd, int segment_id, SEG_LVL_FEATURES feature_id) { return xd->segment_feature_data[segment_id][feature_id]; @@ -126,7 +126,7 @@ void set_segref(MACROBLOCKD *xd, (1 << ref_frame); } -int check_segref(MACROBLOCKD *xd, +int check_segref(const MACROBLOCKD *xd, int segment_id, MV_REFERENCE_FRAME ref_frame) { return (xd->segment_feature_data[segment_id][SEG_LVL_REF_FRAME] & -- cgit v1.2.3