diff options
author | Johann <johannkoenig@google.com> | 2015-05-07 14:26:25 -0700 |
---|---|---|
committer | Johann <johannkoenig@google.com> | 2015-05-07 14:39:37 -0700 |
commit | 802e1d84cc10a99060a9fa6c770f3ffafa4e0555 (patch) | |
tree | ec081d430b055399fc3cd7d4d2c6b21535f64b86 /vp8/common/copy_c.c | |
parent | 76a08210b667f5c7ce8d64d930382c948dbeaea7 (diff) | |
download | libvpx-802e1d84cc10a99060a9fa6c770f3ffafa4e0555.tar libvpx-802e1d84cc10a99060a9fa6c770f3ffafa4e0555.tar.gz libvpx-802e1d84cc10a99060a9fa6c770f3ffafa4e0555.tar.bz2 libvpx-802e1d84cc10a99060a9fa6c770f3ffafa4e0555.zip |
Remove only remaining uses of 'fast_unaligned'
Use memcpy instead of casting.
Change-Id: Ieca725cc628883985bde23c7d742af8781c5dbb5
Diffstat (limited to 'vp8/common/copy_c.c')
-rw-r--r-- | vp8/common/copy_c.c | 47 |
1 files changed, 4 insertions, 43 deletions
diff --git a/vp8/common/copy_c.c b/vp8/common/copy_c.c index febfcb24c..fd96c8634 100644 --- a/vp8/common/copy_c.c +++ b/vp8/common/copy_c.c @@ -9,6 +9,8 @@ */ +#include <string.h> + #include "vpx_config.h" #include "vpx/vpx_integer.h" @@ -21,49 +23,8 @@ void vp8_copy32xn_c(unsigned char *src_ptr, int src_stride, for (r = 0; r < height; r++) { -#if !(CONFIG_FAST_UNALIGNED) - dst_ptr[0] = src_ptr[0]; - dst_ptr[1] = src_ptr[1]; - dst_ptr[2] = src_ptr[2]; - dst_ptr[3] = src_ptr[3]; - dst_ptr[4] = src_ptr[4]; - dst_ptr[5] = src_ptr[5]; - dst_ptr[6] = src_ptr[6]; - dst_ptr[7] = src_ptr[7]; - dst_ptr[8] = src_ptr[8]; - dst_ptr[9] = src_ptr[9]; - dst_ptr[10] = src_ptr[10]; - dst_ptr[11] = src_ptr[11]; - dst_ptr[12] = src_ptr[12]; - dst_ptr[13] = src_ptr[13]; - dst_ptr[14] = src_ptr[14]; - dst_ptr[15] = src_ptr[15]; - dst_ptr[16] = src_ptr[16]; - dst_ptr[17] = src_ptr[17]; - dst_ptr[18] = src_ptr[18]; - dst_ptr[19] = src_ptr[19]; - dst_ptr[20] = src_ptr[20]; - dst_ptr[21] = src_ptr[21]; - dst_ptr[22] = src_ptr[22]; - dst_ptr[23] = src_ptr[23]; - dst_ptr[24] = src_ptr[24]; - dst_ptr[25] = src_ptr[25]; - dst_ptr[26] = src_ptr[26]; - dst_ptr[27] = src_ptr[27]; - dst_ptr[28] = src_ptr[28]; - dst_ptr[29] = src_ptr[29]; - dst_ptr[30] = src_ptr[30]; - dst_ptr[31] = src_ptr[31]; -#else - ((uint32_t *)dst_ptr)[0] = ((uint32_t *)src_ptr)[0] ; - ((uint32_t *)dst_ptr)[1] = ((uint32_t *)src_ptr)[1] ; - ((uint32_t *)dst_ptr)[2] = ((uint32_t *)src_ptr)[2] ; - ((uint32_t *)dst_ptr)[3] = ((uint32_t *)src_ptr)[3] ; - ((uint32_t *)dst_ptr)[4] = ((uint32_t *)src_ptr)[4] ; - ((uint32_t *)dst_ptr)[5] = ((uint32_t *)src_ptr)[5] ; - ((uint32_t *)dst_ptr)[6] = ((uint32_t *)src_ptr)[6] ; - ((uint32_t *)dst_ptr)[7] = ((uint32_t *)src_ptr)[7] ; -#endif + memcpy(dst_ptr, src_ptr, 32); + src_ptr += src_stride; dst_ptr += dst_stride; |