diff options
Diffstat (limited to 'vp8/common/blockd.h')
| -rw-r--r-- | vp8/common/blockd.h | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 5a8991e65..3b4986f49 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -32,8 +32,8 @@ void vpx_log(const char *format, ...); #define UCONTEXT 1 #define VCONTEXT 2 #define Y2CONTEXT 3 - #define MB_FEATURE_TREE_PROBS 3 + #define MAX_MB_SEGMENTS 4 #define MAX_REF_LF_DELTAS 4 @@ -168,6 +168,7 @@ typedef struct int as_int; MV as_mv; } mv; + unsigned char segment_flag; unsigned char partitioning; unsigned char mb_skip_coeff; /* does this mb has coefficients at all, 1=no coefficients, 0=need decode tokens */ @@ -251,11 +252,15 @@ typedef struct /* 0 (do not update) 1 (update) the macroblock segmentation feature data. */ unsigned char mb_segement_abs_delta; + unsigned char temporal_update; /* Per frame flags that define which MB level features (such as quantizer or loop filter level) */ /* are enabled and when enabled the proabilities used to decode the per MB flags in MB_MODE_INFO */ - vp8_prob mb_segment_tree_probs[MB_FEATURE_TREE_PROBS]; /* Probability Tree used to code Segment number */ - - signed char segment_feature_data[MB_LVL_MAX][MAX_MB_SEGMENTS]; /* Segment parameters */ +#if CONFIG_SEGMENTATION + vp8_prob mb_segment_tree_probs[MB_FEATURE_TREE_PROBS + 3]; // Probability Tree used to code Segment number +#else + vp8_prob mb_segment_tree_probs[MB_FEATURE_TREE_PROBS]; +#endif + signed char segment_feature_data[MB_LVL_MAX][MAX_MB_SEGMENTS]; // Segment parameters /* mode_based Loop filter adjustment */ unsigned char mode_ref_lf_delta_enabled; |