generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "vp8/vp9: neon: msvc: move the 'ifdef _MSC_VER' bit to vpx_ports/mem.h. fix compiling warning."

Browse Source
This commit is contained in:
Johann 2014-09-15 15:53:12 -07:00 committed by Gerrit Code Review
commit 8caba8565a
4 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
vp8/common/arm/neon/sixtappredict_neon.c
View File

@ -9,10 +9,7 @@
*/ */
#include <arm_neon.h> #include <arm_neon.h>
#include "vpx_ports/mem.h"
#ifdef _MSC_VER
#define __builtin_prefetch(x)
#endif
static const int8_t vp8_sub_pel_filters[8][8] = { static const int8_t vp8_sub_pel_filters[8][8] = {
{0, 0, 128, 0, 0, 0, 0, 0}, /* note that 1/8 pel positionyys are */ {0, 0, 128, 0, 0, 0, 0, 0}, /* note that 1/8 pel positionyys are */

5
vp8/common/arm/neon/variance_neon.c
View File

@ -9,10 +9,7 @@
*/ */
#include <arm_neon.h> #include <arm_neon.h>
#include "vpx_ports/mem.h"
#ifdef _MSC_VER
#define __builtin_prefetch(x)
#endif
unsigned int vp8_variance16x16_neon( unsigned int vp8_variance16x16_neon(
const unsigned char *src_ptr, const unsigned char *src_ptr,

4
vp8/common/arm/neon/vp8_subpixelvariance_neon.c
View File

@ -12,10 +12,6 @@
#include "vpx_ports/mem.h" #include "vpx_ports/mem.h"
#include "vpx/vpx_integer.h" #include "vpx/vpx_integer.h"
#ifdef _MSC_VER
#define __builtin_prefetch(x)
#endif
static const uint16_t bilinear_taps_coeff[8][2] = { static const uint16_t bilinear_taps_coeff[8][2] = {
{128, 0}, {128, 0},
{112, 16}, {112, 16},

7
vpx_ports/mem.h
View File

@ -23,7 +23,6 @@
#warning No alignment directives known for this compiler. #warning No alignment directives known for this compiler.
#define DECLARE_ALIGNED(n,typ,val) typ val #define DECLARE_ALIGNED(n,typ,val) typ val
#endif #endif
#endif
/* Declare an aligned array on the stack, for situations where the stack /* Declare an aligned array on the stack, for situations where the stack
@ -44,4 +43,10 @@
#define UNINITIALIZED_IS_SAFE(x) x=x #define UNINITIALIZED_IS_SAFE(x) x=x
#else #else
#define UNINITIALIZED_IS_SAFE(x) x #define UNINITIALIZED_IS_SAFE(x) x
#endif
#if HAVE_NEON && defined(_MSC_VER)
#define __builtin_prefetch(x)
#endif
#endif // VPX_PORTS_MEM_H_ #endif // VPX_PORTS_MEM_H_