define yuvconstants structure all the time, so its can be referred to on all builds.

currently only intel code uses this structure, but the prototypes are there for neon and lack of a structure cases a compile error on arm.

R=tpsiaki@google.com
BUG=none

Review URL: https://webrtc-codereview.appspot.com/52799004 .
This commit is contained in:
Frank Barchard 2015-09-02 14:55:11 -07:00
parent 925c3d9e26
commit fbc3d595e9
3 changed files with 3 additions and 24 deletions

View File

@ -1,6 +1,6 @@
Name: libyuv
URL: http://code.google.com/p/libyuv/
Version: 1476
Version: 1477
License: BSD
License File: LICENSE

View File

@ -420,9 +420,7 @@ typedef uint8 ulvec8[32];
#endif
// This struct is for Intel color conversion.
#if defined(_M_IX86) || defined(_M_X64) || \
defined(__x86_64__) || defined(__i386__)
// TODO(fnbarchard): Consider different struct for other platforms.
struct YuvConstants {
lvec8 kUVToB;
lvec8 kUVToG;
@ -432,7 +430,6 @@ struct YuvConstants {
lvec16 kUVBiasR;
lvec16 kYToRgb;
};
#endif
#if defined(__APPLE__) || defined(__x86_64__) || defined(__llvm__)
#define OMITFP
@ -1247,12 +1244,6 @@ void I422ToARGBRow_Any_AVX2(const uint8* src_y,
const uint8* src_v,
uint8* dst_argb,
int width);
void I422ToARGBMatrixRow_Any_AVX2(const uint8* src_y,
const uint8* src_u,
const uint8* src_v,
uint8* dst_argb,
struct YuvConstants* YuvConstants,
int width);
void I422ToBGRARow_Any_AVX2(const uint8* src_y,
const uint8* src_u,
const uint8* src_v,
@ -1283,12 +1274,6 @@ void I422ToARGBRow_Any_SSSE3(const uint8* src_y,
const uint8* src_v,
uint8* dst_argb,
int width);
void I422ToARGBMatrixRow_Any_SSSE3(const uint8* src_y,
const uint8* src_u,
const uint8* src_v,
uint8* dst_argb,
struct YuvConstants* YuvConstants,
int width);
void I411ToARGBRow_Any_SSSE3(const uint8* src_y,
const uint8* src_u,
const uint8* src_v,
@ -1519,13 +1504,7 @@ void I422ToARGBRow_Any_NEON(const uint8* src_y,
const uint8* src_u,
const uint8* src_v,
uint8* dst_argb,
struct YuvConstants* YuvConstants,
int width);
void I422ToARGBMatrixRow_Any_NEON(const uint8* src_y,
const uint8* src_u,
const uint8* src_v,
uint8* dst_argb,
int width);
void I411ToARGBRow_Any_NEON(const uint8* src_y,
const uint8* src_u,
const uint8* src_v,

View File

@ -11,6 +11,6 @@
#ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT
#define INCLUDE_LIBYUV_VERSION_H_
#define LIBYUV_VERSION 1476
#define LIBYUV_VERSION 1477
#endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT