diff options
| author | Paul Wilkins <paulwilkins@google.com> | 2012-01-27 18:35:14 +0000 |
|---|---|---|
| committer | Paul Wilkins <paulwilkins@google.com> | 2012-01-31 12:52:33 +0000 |
| commit | 5f0f260f0cf304eebf2aa88a90978f3e9df20dcb (patch) | |
| tree | c3c31f9fe0b1517bd958fd4ea4a35e8e7b27eba3 /vp8/common | |
| parent | fe96afa705075fbf5426ba9932dbb88362594551 (diff) | |
| download | libvpx-5f0f260f0cf304eebf2aa88a90978f3e9df20dcb.tar libvpx-5f0f260f0cf304eebf2aa88a90978f3e9df20dcb.tar.gz libvpx-5f0f260f0cf304eebf2aa88a90978f3e9df20dcb.tar.bz2 libvpx-5f0f260f0cf304eebf2aa88a90978f3e9df20dcb.zip | |
Moved some reference frame data structures into common.
In this commit only the decoder side was updated.
Change-Id: Ia9bd58da07d1a943f028e330f0489344e62b0d02
Diffstat (limited to 'vp8/common')
| -rw-r--r-- | vp8/common/blockd.h | 5 | ||||
| -rw-r--r-- | vp8/common/onyxc_int.h | 6 |
2 files changed, 7 insertions, 4 deletions
diff --git a/vp8/common/blockd.h b/vp8/common/blockd.h index 6b0ea61cb..9c1453e2a 100644 --- a/vp8/common/blockd.h +++ b/vp8/common/blockd.h @@ -191,8 +191,7 @@ typedef struct unsigned char need_to_clamp_mvs; unsigned char segment_id; /* Which set of segmentation parameters should be used for this MB */ - // Flag used when temporal prediction of segment map is enabled. - // 1 means it is predicted 0 that it must be coded explicitly + // Flags used for prediction status of various bistream signals unsigned char seg_id_predicted; } MB_MODE_INFO; @@ -300,9 +299,9 @@ typedef struct MacroBlockD int mb_to_top_edge; int mb_to_bottom_edge; + // TODO this is not used in the decoder so should not be in this structure int ref_frame_cost[MAX_REF_FRAMES]; - unsigned int frames_since_golden; unsigned int frames_till_alt_ref_frame; vp8_subpix_fn_t subpixel_predict; diff --git a/vp8/common/onyxc_int.h b/vp8/common/onyxc_int.h index e5c7b912a..75c1c001d 100644 --- a/vp8/common/onyxc_int.h +++ b/vp8/common/onyxc_int.h @@ -208,7 +208,6 @@ typedef struct VP8Common ENTROPY_CONTEXT_PLANES *above_context; /* row of context for each plane */ ENTROPY_CONTEXT_PLANES left_context; /* (up to) 4 contexts "" */ - /* keyframe block modes are predicted by their above, left neighbors */ vp8_prob kf_bmode_prob [VP8_BINTRAMODES] [VP8_BINTRAMODES] [VP8_BINTRAMODES-1]; @@ -226,6 +225,11 @@ typedef struct VP8Common #endif vp8_prob i8x8_mode_prob [VP8_UV_MODES-1]; + + vp8_prob prob_intra_coded; + vp8_prob prob_last_coded; + vp8_prob prob_gf_coded; + // Context probabilities when using predictive coding of segment id vp8_prob segment_pred_probs[PREDICTION_PROBS]; unsigned char temporal_update; |