diff options
| author | Scott LaVarnway <slavarnway@google.com> | 2015-06-11 04:20:55 -0700 |
|---|---|---|
| committer | Scott LaVarnway <slavarnway@google.com> | 2015-06-11 04:20:55 -0700 |
| commit | 42c0b1b1f11f8e5714dac98a1b48d30f32cc0268 (patch) | |
| tree | 9bd1b98e6aa5d43b465fec79ad13993b24676a54 /vp9/common/vp9_seg_common.h | |
| parent | 97880c332445cdc3cfbf82433bb4a6b6d6cfc010 (diff) | |
| download | libvpx-42c0b1b1f11f8e5714dac98a1b48d30f32cc0268.tar libvpx-42c0b1b1f11f8e5714dac98a1b48d30f32cc0268.tar.gz libvpx-42c0b1b1f11f8e5714dac98a1b48d30f32cc0268.tar.bz2 libvpx-42c0b1b1f11f8e5714dac98a1b48d30f32cc0268.zip | |
inline vp9_segfeature_active()
and changed name.
Change-Id: Ie023ca66cc2c823032f58d4faeb53fd1863c94f3
Diffstat (limited to 'vp9/common/vp9_seg_common.h')
| -rw-r--r-- | vp9/common/vp9_seg_common.h | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/vp9/common/vp9_seg_common.h b/vp9/common/vp9_seg_common.h index ff2d66a36..679476388 100644 --- a/vp9/common/vp9_seg_common.h +++ b/vp9/common/vp9_seg_common.h @@ -49,9 +49,12 @@ struct segmentation { unsigned int feature_mask[MAX_SEGMENTS]; }; -int vp9_segfeature_active(const struct segmentation *seg, - int segment_id, - SEG_LVL_FEATURES feature_id); +static INLINE int segfeature_active(const struct segmentation *seg, + int segment_id, + SEG_LVL_FEATURES feature_id) { + return seg->enabled && + (seg->feature_mask[segment_id] & (1 << feature_id)); +} void vp9_clearall_segfeatures(struct segmentation *seg); |