diff options
| author | James Zern <jzern@google.com> | 2014-12-15 11:54:51 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-15 11:54:51 -0800 |
| commit | 8d558f2ca5867828cbf07ef1dce9ad457be7e818 (patch) | |
| tree | 25ee37755b3c046e54ef9e5d39f179501136823d | |
| parent | 91471d6aad285ff10e7582e485d8adadd1986fe2 (diff) | |
| parent | c58c579ec4661efade8a012a5996027ec5f1cae5 (diff) | |
| download | libvpx-8d558f2ca5867828cbf07ef1dce9ad457be7e818.tar libvpx-8d558f2ca5867828cbf07ef1dce9ad457be7e818.tar.gz libvpx-8d558f2ca5867828cbf07ef1dce9ad457be7e818.tar.bz2 libvpx-8d558f2ca5867828cbf07ef1dce9ad457be7e818.zip | |
Merge "vp9/MACROBLOCKD: reorder struct members"
| -rw-r--r-- | vp9/common/vp9_blockd.h | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index 7d7209c56..ebb1d1d0a 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -212,6 +212,12 @@ typedef struct macroblockd { /* pointer to current frame */ const YV12_BUFFER_CONFIG *cur_buf; + ENTROPY_CONTEXT *above_context[MAX_MB_PLANE]; + ENTROPY_CONTEXT left_context[MAX_MB_PLANE][16]; + + PARTITION_CONTEXT *above_seg_context; + PARTITION_CONTEXT left_seg_context[8]; + /* mc buffer */ DECLARE_ALIGNED(16, uint8_t, mc_buf[80 * 2 * 80 * 2]); @@ -221,17 +227,10 @@ typedef struct macroblockd { DECLARE_ALIGNED(16, uint16_t, mc_buf_high[80 * 2 * 80 * 2]); #endif - int lossless; - - int corrupted; - DECLARE_ALIGNED(16, tran_low_t, dqcoeff[MAX_MB_PLANE][64 * 64]); - ENTROPY_CONTEXT *above_context[MAX_MB_PLANE]; - ENTROPY_CONTEXT left_context[MAX_MB_PLANE][16]; - - PARTITION_CONTEXT *above_seg_context; - PARTITION_CONTEXT left_seg_context[8]; + int lossless; + int corrupted; } MACROBLOCKD; static INLINE BLOCK_SIZE get_subsize(BLOCK_SIZE bsize, |