diff options
| author | Daniel Kang <daniel.d.kang@gmail.com> | 2012-07-11 11:34:05 -0700 |
|---|---|---|
| committer | Luca Barbato <lu_zero@gentoo.org> | 2012-07-14 20:18:54 +0200 |
| commit | 17343e395250f5cb459f5fab198dcae50841b91d (patch) | |
| tree | b461d0f2e2b8f5ce09dba423e54c4a92aea77f7b /libavcodec/vp8.h | |
| parent | 337ade52de0e71607b16ffc99ea7696fb5bfef51 (diff) | |
vp8: move data from VP8Context->VP8Macroblock
In preparation for sliced threading.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>
Diffstat (limited to 'libavcodec/vp8.h')
| -rw-r--r-- | libavcodec/vp8.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/libavcodec/vp8.h b/libavcodec/vp8.h index a738cb76e0..2f2cb80a0a 100644 --- a/libavcodec/vp8.h +++ b/libavcodec/vp8.h @@ -79,6 +79,10 @@ typedef struct { uint8_t mode; uint8_t ref_frame; uint8_t partitioning; + uint8_t chroma_pred_mode; + uint8_t segment; + uint8_t intra4x4_pred_mode_mb[16]; + uint8_t intra4x4_pred_mode_top[4]; VP56mv mv; VP56mv bmv[16]; } VP8Macroblock; @@ -97,8 +101,6 @@ typedef struct { uint8_t keyframe; uint8_t deblock_filter; uint8_t mbskip_enabled; - uint8_t segment; ///< segment of the current macroblock - uint8_t chroma_pred_mode; ///< 8x8c pred mode of the current macroblock uint8_t profile; VP56mv mv_min; VP56mv mv_max; @@ -193,7 +195,6 @@ typedef struct { VP56RangeCoder c; ///< header context, includes mb modes and motion vectors DECLARE_ALIGNED(16, DCTELEM, block)[6][4][16]; DECLARE_ALIGNED(16, DCTELEM, block_dc)[16]; - uint8_t intra4x4_pred_mode_mb[16]; /** * These are all of the updatable probabilities for binary decisions. |