diff options
| author | Ronald S. Bultje <rbultje@google.com> | 2012-12-18 15:31:19 -0800 |
|---|---|---|
| committer | Ronald S. Bultje <rbultje@google.com> | 2012-12-18 15:31:19 -0800 |
| commit | 4cca47b5385adb8ace28b10db7a20f337b15bbeb (patch) | |
| tree | 74b0e4692a4d26995dc98f9ca160a2b27a8c40dc /vp9/common/vp9_blockd.c | |
| parent | d47828ed59999ca9379860c13a753e092062748c (diff) | |
| download | libvpx-4cca47b5385adb8ace28b10db7a20f337b15bbeb.tar libvpx-4cca47b5385adb8ace28b10db7a20f337b15bbeb.tar.gz libvpx-4cca47b5385adb8ace28b10db7a20f337b15bbeb.tar.bz2 libvpx-4cca47b5385adb8ace28b10db7a20f337b15bbeb.zip | |
Use standard integer types for pixel values and coefficients.
For coefficients, use int16_t (instead of short); for pixel values in
16-bit intermediates, use uint16_t (instead of unsigned short); for all
others, use uint8_t (instead of unsigned char).
Change-Id: I3619cd9abf106c3742eccc2e2f5e89a62774f7da
Diffstat (limited to 'vp9/common/vp9_blockd.c')
| -rw-r--r-- | vp9/common/vp9_blockd.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vp9/common/vp9_blockd.c b/vp9/common/vp9_blockd.c index 4c88a4fa2..b8ad433dc 100644 --- a/vp9/common/vp9_blockd.c +++ b/vp9/common/vp9_blockd.c @@ -12,7 +12,7 @@ #include "vp9/common/vp9_blockd.h" #include "vpx_mem/vpx_mem.h" -const unsigned char vp9_block2left[TX_SIZE_MAX_SB][25] = { +const uint8_t vp9_block2left[TX_SIZE_MAX_SB][25] = { {0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8}, {0, 0, 0, 0, 0, 0, 0, 0, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 8}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 6, 6, 6, 6, 8}, @@ -20,7 +20,7 @@ const unsigned char vp9_block2left[TX_SIZE_MAX_SB][25] = { {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 6, 6, 6, 6, 8} #endif }; -const unsigned char vp9_block2above[TX_SIZE_MAX_SB][25] = { +const uint8_t vp9_block2above[TX_SIZE_MAX_SB][25] = { {0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 0, 1, 2, 3, 4, 5, 4, 5, 6, 7, 6, 7, 8}, {0, 0, 0, 0, 2, 2, 2, 2, 0, 0, 0, 0, 2, 2, 2, 2, 4, 4, 4, 4, 6, 6, 6, 6, 8}, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 4, 4, 4, 4, 6, 6, 6, 6, 8}, |