diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-04-23 16:24:08 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-04-23 16:24:08 -0700 |
| commit | 4f35e3e1c1543f204fb5edac97e53bc467ec56ab (patch) | |
| tree | 5b7b51c9d726689b1ea8b1aa83422efb90748ebc /vp9/encoder/vp9_block.h | |
| parent | 276a1106e6db3d880e9b009725df81eacc2b316b (diff) | |
| parent | cbd1315ac433e4e81e70fcee0eaad249148dc44e (diff) | |
| download | libvpx-4f35e3e1c1543f204fb5edac97e53bc467ec56ab.tar libvpx-4f35e3e1c1543f204fb5edac97e53bc467ec56ab.tar.gz libvpx-4f35e3e1c1543f204fb5edac97e53bc467ec56ab.tar.bz2 libvpx-4f35e3e1c1543f204fb5edac97e53bc467ec56ab.zip | |
Merge "Move src_diff to per-plane MACROBLOCK data" into experimental
Diffstat (limited to 'vp9/encoder/vp9_block.h')
| -rw-r--r-- | vp9/encoder/vp9_block.h | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h index 1aa84338f..709c29ede 100644 --- a/vp9/encoder/vp9_block.h +++ b/vp9/encoder/vp9_block.h @@ -25,7 +25,6 @@ typedef struct { typedef struct block { // 16 Y blocks, 4 U blocks, 4 V blocks each with 16 entries - int16_t *src_diff; int16_t *coeff; // 16 Y blocks, 4 U blocks, 4 V blocks each with 16 entries @@ -89,9 +88,13 @@ typedef struct { unsigned int frames_with_high_error; } PICK_MODE_CONTEXT; +struct macroblock_plane { + DECLARE_ALIGNED(16, int16_t, src_diff[64*64]); +}; + typedef struct macroblock MACROBLOCK; struct macroblock { - DECLARE_ALIGNED(16, int16_t, src_diff[64*64+32*32*2]); + struct macroblock_plane plane[MAX_MB_PLANE]; DECLARE_ALIGNED(16, int16_t, coeff[64*64+32*32*2]); // 16 Y blocks, 4 U blocks, 4 V blocks, BLOCK block[24]; |