| Index: source/libvpx/vpx_ports/mem_ops_aligned.h
|
| ===================================================================
|
| --- source/libvpx/vpx_ports/mem_ops_aligned.h (revision 172621)
|
| +++ source/libvpx/vpx_ports/mem_ops_aligned.h (working copy)
|
| @@ -24,61 +24,61 @@
|
| * could redefine these macros.
|
| */
|
| #define swap_endian_16(val,raw) do {\
|
| - val = ((raw>>8) & 0x00ff) \
|
| - | ((raw<<8) & 0xff00);\
|
| - } while(0)
|
| + val = ((raw>>8) & 0x00ff) \
|
| + | ((raw<<8) & 0xff00);\
|
| + } while(0)
|
| #define swap_endian_32(val,raw) do {\
|
| - val = ((raw>>24) & 0x000000ff) \
|
| - | ((raw>>8) & 0x0000ff00) \
|
| - | ((raw<<8) & 0x00ff0000) \
|
| - | ((raw<<24) & 0xff000000); \
|
| - } while(0)
|
| + val = ((raw>>24) & 0x000000ff) \
|
| + | ((raw>>8) & 0x0000ff00) \
|
| + | ((raw<<8) & 0x00ff0000) \
|
| + | ((raw<<24) & 0xff000000); \
|
| + } while(0)
|
| #define swap_endian_16_se(val,raw) do {\
|
| - swap_endian_16(val,raw);\
|
| - val = ((val << 16) >> 16);\
|
| - } while(0)
|
| + swap_endian_16(val,raw);\
|
| + val = ((val << 16) >> 16);\
|
| + } while(0)
|
| #define swap_endian_32_se(val,raw) swap_endian_32(val,raw)
|
|
|
| #define mem_get_ne_aligned_generic(end,sz) \
|
| - static unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\
|
| - const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\
|
| - return *mem;\
|
| - }
|
| + static unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\
|
| + const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\
|
| + return *mem;\
|
| + }
|
|
|
| #define mem_get_sne_aligned_generic(end,sz) \
|
| - static signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\
|
| - const int##sz##_t *mem = (const int##sz##_t *)vmem;\
|
| - return *mem;\
|
| - }
|
| + static signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\
|
| + const int##sz##_t *mem = (const int##sz##_t *)vmem;\
|
| + return *mem;\
|
| + }
|
|
|
| #define mem_get_se_aligned_generic(end,sz) \
|
| - static unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\
|
| - const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\
|
| - unsigned MEM_VALUE_T val, raw = *mem;\
|
| - swap_endian_##sz(val,raw);\
|
| - return val;\
|
| - }
|
| + static unsigned MEM_VALUE_T mem_get_##end##sz##_aligned(const void *vmem) {\
|
| + const uint##sz##_t *mem = (const uint##sz##_t *)vmem;\
|
| + unsigned MEM_VALUE_T val, raw = *mem;\
|
| + swap_endian_##sz(val,raw);\
|
| + return val;\
|
| + }
|
|
|
| #define mem_get_sse_aligned_generic(end,sz) \
|
| - static signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\
|
| - const int##sz##_t *mem = (const int##sz##_t *)vmem;\
|
| - unsigned MEM_VALUE_T val, raw = *mem;\
|
| - swap_endian_##sz##_se(val,raw);\
|
| - return val;\
|
| - }
|
| + static signed MEM_VALUE_T mem_get_s##end##sz##_aligned(const void *vmem) {\
|
| + const int##sz##_t *mem = (const int##sz##_t *)vmem;\
|
| + unsigned MEM_VALUE_T val, raw = *mem;\
|
| + swap_endian_##sz##_se(val,raw);\
|
| + return val;\
|
| + }
|
|
|
| #define mem_put_ne_aligned_generic(end,sz) \
|
| - static void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\
|
| - uint##sz##_t *mem = (uint##sz##_t *)vmem;\
|
| - *mem = (uint##sz##_t)val;\
|
| - }
|
| + static void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\
|
| + uint##sz##_t *mem = (uint##sz##_t *)vmem;\
|
| + *mem = (uint##sz##_t)val;\
|
| + }
|
|
|
| #define mem_put_se_aligned_generic(end,sz) \
|
| - static void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\
|
| - uint##sz##_t *mem = (uint##sz##_t *)vmem, raw;\
|
| - swap_endian_##sz(raw,val);\
|
| - *mem = (uint##sz##_t)raw;\
|
| - }
|
| + static void mem_put_##end##sz##_aligned(void *vmem, MEM_VALUE_T val) {\
|
| + uint##sz##_t *mem = (uint##sz##_t *)vmem, raw;\
|
| + swap_endian_##sz(raw,val);\
|
| + *mem = (uint##sz##_t)raw;\
|
| + }
|
|
|
| #include "vpx_config.h"
|
| #if CONFIG_BIG_ENDIAN
|
|
|