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/seg_common.c | |
| 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/seg_common.c')
| -rw-r--r-- | vp8/common/seg_common.c | 6 |
1 files changed, 3 insertions, 3 deletions
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] & |