diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2013-02-27 11:39:16 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-02-27 11:39:16 -0800 |
| commit | 90932399b41252d2bdd28520d693a610eabeaa88 (patch) | |
| tree | 60e3eb562068ed6310d617fabe93c3b74d9cf9f4 /vp9/encoder/vp9_block.h | |
| parent | 8092aaf9ec215e3c2d2ffcc157b19f36fc5e0889 (diff) | |
| parent | e8c74e2b7037f68f10875cb74ae3a49626d28edc (diff) | |
| download | libvpx-90932399b41252d2bdd28520d693a610eabeaa88.tar libvpx-90932399b41252d2bdd28520d693a610eabeaa88.tar.gz libvpx-90932399b41252d2bdd28520d693a610eabeaa88.tar.bz2 libvpx-90932399b41252d2bdd28520d693a610eabeaa88.zip | |
Merge "Move eob from BLOCKD to MACROBLOCKD." into experimental
Diffstat (limited to 'vp9/encoder/vp9_block.h')
| -rw-r--r-- | vp9/encoder/vp9_block.h | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/vp9/encoder/vp9_block.h b/vp9/encoder/vp9_block.h index d888b6fe1..79a021cfb 100644 --- a/vp9/encoder/vp9_block.h +++ b/vp9/encoder/vp9_block.h @@ -88,7 +88,8 @@ typedef struct superblock { DECLARE_ALIGNED(16, int16_t, coeff[32*32+16*16*2]); } SUPERBLOCK; -typedef struct macroblock { +typedef struct macroblock MACROBLOCK; +struct macroblock { DECLARE_ALIGNED(16, int16_t, src_diff[384]); // 16x16 Y 8x8 U 8x8 V DECLARE_ALIGNED(16, int16_t, coeff[384]); // 16x16 Y 8x8 U 8x8 V // 16 Y blocks, 4 U blocks, 4 V blocks, @@ -171,10 +172,10 @@ typedef struct macroblock { void (*fwd_txm8x4)(int16_t *input, int16_t *output, int pitch); void (*fwd_txm8x8)(int16_t *input, int16_t *output, int pitch); void (*fwd_txm16x16)(int16_t *input, int16_t *output, int pitch); - void (*quantize_b_4x4)(BLOCK *b, BLOCKD *d); - void (*quantize_b_4x4_pair)(BLOCK *b1, BLOCK *b2, BLOCKD *d0, BLOCKD *d1); - void (*quantize_b_16x16)(BLOCK *b, BLOCKD *d); - void (*quantize_b_8x8)(BLOCK *b, BLOCKD *d); -} MACROBLOCK; + void (*quantize_b_4x4)(MACROBLOCK *x, int b_idx); + void (*quantize_b_4x4_pair)(MACROBLOCK *x, int b_idx1, int b_idx2); + void (*quantize_b_16x16)(MACROBLOCK *x, int b_idx); + void (*quantize_b_8x8)(MACROBLOCK *x, int b_idx); +}; #endif // VP9_ENCODER_VP9_BLOCK_H_ |