shithub: libvpx

Info  •  Files  •  Log  •  Branches

Merge "vp9/MACROBLOCKD: reorder struct members"

--- a/vp9/common/vp9_blockd.h

+++ b/vp9/common/vp9_blockd.h

@@ -212,6 +212,12 @@

   /* 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 @@

   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,