Skip to content

L
libyuv
Commit 2430e04e authored by fbarchard@google.com's avatar fbarchard@google.com
Browse files
Options

fix internal compiler error on mac by removing const from vectors 

BUG=none
TEST=compile on mac
Review URL: http://webrtc-codereview.appspot.com/266013

git-svn-id: http://libyuv.googlecode.com/svn/trunk@78 16f28f9a-4ce2-e073-06de-1de4eb20be90
parent eaedc1d7
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 76 deletions
README.chromium
View file @ 2430e04e
Name: libyuv Name: libyuv
URL: http://code.google.com/p/libyuv/ URL: http://code.google.com/p/libyuv/
Version: 77 Version: 78
License: BSD License: BSD
License File: LICENSE License File: LICENSE
......
source/rotate.cc
View file @ 2430e04e
...@@ -18,15 +18,16 @@ ...@@ -18,15 +18,16 @@
namespace libyuv { namespace libyuv {
#if (defined(WIN32) || defined(__x86_64__) || defined(__i386__)) && \ #if (defined(WIN32) || defined(__x86_64__) || defined(__i386__)) && \
!defined(__APPLE__) && \ !defined(LIBYUV_DISABLE_ASM)
!defined(COVERAGE_ENABLED) && !defined(TARGET_IPHONE_SIMULATOR) // Note static const preferred, but gives internal compiler error on gcc 4.2
// Shuffle table for reversing the bytes. // Shuffle table for reversing the bytes.
static const uvec8 kShuffleReverse = uvec8 kShuffleReverse = {
{ 15u, 14u, 13u, 12u, 11u, 10u, 9u, 8u, 7u, 6u, 5u, 4u, 3u, 2u, 1u, 0u }; 15u, 14u, 13u, 12u, 11u, 10u, 9u, 8u, 7u, 6u, 5u, 4u, 3u, 2u, 1u, 0u
};
// Shuffle table for reversing the bytes of UV channels. // Shuffle table for reversing the bytes of UV channels.
static const uvec8 kShuffleReverseUV = uvec8 kShuffleReverseUV = {
{ 14u, 12u, 10u, 8u, 6u, 4u, 2u, 0u, 15u, 13u, 11u, 9u, 7u, 5u, 3u, 1u }; 14u, 12u, 10u, 8u, 6u, 4u, 2u, 0u, 15u, 13u, 11u, 9u, 7u, 5u, 3u, 1u
};
#endif #endif
typedef void (*reverse_uv_func)(const uint8*, uint8*, uint8*, int); typedef void (*reverse_uv_func)(const uint8*, uint8*, uint8*, int);
...@@ -41,10 +42,10 @@ typedef void (*rotate_wx8_func)(const uint8*, int, uint8*, int, int); ...@@ -41,10 +42,10 @@ typedef void (*rotate_wx8_func)(const uint8*, int, uint8*, int, int);
typedef void (*rotate_wxh_func)(const uint8*, int, uint8*, int, int, int); typedef void (*rotate_wxh_func)(const uint8*, int, uint8*, int, int, int);
#ifdef __ARM_NEON__ #ifdef __ARM_NEON__
#define HAS_REVERSE_LINE_NEON #define HAS_REVERSE_ROW_NEON
void ReverseLine_NEON(const uint8* src, uint8* dst, int width); void ReverseRow_NEON(const uint8* src, uint8* dst, int width);
#define HAS_REVERSE_LINE_UV_NEON #define HAS_REVERSE_ROW_UV_NEON
void ReverseLineUV_NEON(const uint8* src, void ReverseRowUV_NEON(const uint8* src,
uint8* dst_a, uint8* dst_b, uint8* dst_a, uint8* dst_b,
int width); int width);
#define HAS_TRANSPOSE_WX8_NEON #define HAS_TRANSPOSE_WX8_NEON
...@@ -57,7 +58,7 @@ void TransposeUVWx8_NEON(const uint8* src, int src_stride, ...@@ -57,7 +58,7 @@ void TransposeUVWx8_NEON(const uint8* src, int src_stride,
int width); int width);
#endif #endif
#if defined(WIN32) && !defined(COVERAGE_ENABLED) #if defined(WIN32) && !defined(LIBYUV_DISABLE_ASM)
#define HAS_TRANSPOSE_WX8_SSSE3 #define HAS_TRANSPOSE_WX8_SSSE3
__declspec(naked) __declspec(naked)
static void TransposeWx8_SSSE3(const uint8* src, int src_stride, static void TransposeWx8_SSSE3(const uint8* src, int src_stride,
...@@ -276,7 +277,7 @@ __asm { ...@@ -276,7 +277,7 @@ __asm {
} }
} }
#elif (defined(__i386__) || defined(__x86_64__)) && \ #elif (defined(__i386__) || defined(__x86_64__)) && \
!defined(COVERAGE_ENABLED) && !defined(TARGET_IPHONE_SIMULATOR) !defined(LIBYUV_DISABLE_ASM) && !defined(TARGET_IPHONE_SIMULATOR)
#define HAS_TRANSPOSE_WX8_SSSE3 #define HAS_TRANSPOSE_WX8_SSSE3
static void TransposeWx8_SSSE3(const uint8* src, int src_stride, static void TransposeWx8_SSSE3(const uint8* src, int src_stride,
uint8* dst, int dst_stride, int width) { uint8* dst, int dst_stride, int width) {
...@@ -844,7 +845,7 @@ void RotatePlane270(const uint8* src, int src_stride, ...@@ -844,7 +845,7 @@ void RotatePlane270(const uint8* src, int src_stride,
TransposePlane(src, src_stride, dst, dst_stride, width, height); TransposePlane(src, src_stride, dst, dst_stride, width, height);
} }
static void ReverseLine_C(const uint8* src, uint8* dst, int width) { static void ReverseRow_C(const uint8* src, uint8* dst, int width) {
int i; int i;
src += width - 1; src += width - 1;
for (i = 0; i < width; ++i) { for (i = 0; i < width; ++i) {
...@@ -853,10 +854,10 @@ static void ReverseLine_C(const uint8* src, uint8* dst, int width) { ...@@ -853,10 +854,10 @@ static void ReverseLine_C(const uint8* src, uint8* dst, int width) {
} }
} }
#if defined(WIN32) && !defined(COVERAGE_ENABLED) #if defined(WIN32) && !defined(LIBYUV_DISABLE_ASM)
#define HAS_REVERSE_LINE_SSSE3 #define HAS_REVERSE_ROW_SSSE3
__declspec(naked) __declspec(naked)
static void ReverseLine_SSSE3(const uint8* src, uint8* dst, int width) { static void ReverseRow_SSSE3(const uint8* src, uint8* dst, int width) {
__asm { __asm {
mov eax, [esp + 4] // src mov eax, [esp + 4] // src
mov edx, [esp + 8] // dst mov edx, [esp + 8] // dst
...@@ -876,16 +877,12 @@ __asm { ...@@ -876,16 +877,12 @@ __asm {
} }
#elif (defined(__i386__) || defined(__x86_64__)) && \ #elif (defined(__i386__) || defined(__x86_64__)) && \
!defined(__APPLE__) && \ !defined(LIBYUV_DISABLE_ASM) && !defined(TARGET_IPHONE_SIMULATOR)
!defined(COVERAGE_ENABLED) && !defined(TARGET_IPHONE_SIMULATOR) #define HAS_REVERSE_ROW_SSSE3
#define HAS_REVERSE_LINE_SSSE3 static void ReverseRow_SSSE3(const uint8* src, uint8* dst, int width) {
static void ReverseLine_SSSE3(const uint8* src, uint8* dst, int width) {
intptr_t temp_width = static_cast<intptr_t>(width); intptr_t temp_width = static_cast<intptr_t>(width);
asm volatile ( asm volatile (
"movdqa %0,%%xmm5 \n" "movdqa %3,%%xmm5 \n"
:: "m"(kShuffleReverse)
);
asm volatile (
"lea -0x10(%0,%2,1),%0 \n" "lea -0x10(%0,%2,1),%0 \n"
"1: \n" "1: \n"
"movdqa (%0),%%xmm0 \n" "movdqa (%0),%%xmm0 \n"
...@@ -898,7 +895,7 @@ static void ReverseLine_SSSE3(const uint8* src, uint8* dst, int width) { ...@@ -898,7 +895,7 @@ static void ReverseLine_SSSE3(const uint8* src, uint8* dst, int width) {
: "+r"(src), // %0 : "+r"(src), // %0
"+r"(dst), // %1 "+r"(dst), // %1
"+r"(temp_width) // %2 "+r"(temp_width) // %2
: : "m"(kShuffleReverse) // %3
: "memory", "cc" : "memory", "cc"
#if defined(__SSE2__) #if defined(__SSE2__)
, "xmm0", "xmm5" , "xmm0", "xmm5"
...@@ -911,29 +908,29 @@ void RotatePlane180(const uint8* src, int src_stride, ...@@ -911,29 +908,29 @@ void RotatePlane180(const uint8* src, int src_stride,
uint8* dst, int dst_stride, uint8* dst, int dst_stride,
int width, int height) { int width, int height) {
int i; int i;
reverse_func ReverseLine; reverse_func ReverseRow;
#if defined(HAS_REVERSE_LINE_NEON) #if defined(HAS_REVERSE_ROW_NEON)
if (TestCpuFlag(kCpuHasNEON)) { if (TestCpuFlag(kCpuHasNEON)) {
ReverseLine = ReverseLine_NEON; ReverseRow = ReverseRow_NEON;
} else } else
#endif #endif
#if defined(HAS_REVERSE_LINE_SSSE3) #if defined(HAS_REVERSE_ROW_SSSE3)
if (TestCpuFlag(kCpuHasSSSE3) && if (TestCpuFlag(kCpuHasSSSE3) &&
(width % 16 == 0) && (width % 16 == 0) &&
IS_ALIGNED(src, 16) && (src_stride % 16 == 0) && IS_ALIGNED(src, 16) && (src_stride % 16 == 0) &&
IS_ALIGNED(dst, 16) && (dst_stride % 16 == 0)) { IS_ALIGNED(dst, 16) && (dst_stride % 16 == 0)) {
ReverseLine = ReverseLine_SSSE3; ReverseRow = ReverseRow_SSSE3;
} else } else
#endif #endif
{ {
ReverseLine = ReverseLine_C; ReverseRow = ReverseRow_C;
} }
// Rotate by 180 is a mirror and vertical flip // Rotate by 180 is a mirror and vertical flip
src += src_stride * (height - 1); src += src_stride * (height - 1);
for (i = 0; i < height; ++i) { for (i = 0; i < height; ++i) {
ReverseLine(src, dst, width); ReverseRow(src, dst, width);
src -= src_stride; src -= src_stride;
dst += dst_stride; dst += dst_stride;
} }
...@@ -1056,10 +1053,10 @@ void RotateUV270(const uint8* src, int src_stride, ...@@ -1056,10 +1053,10 @@ void RotateUV270(const uint8* src, int src_stride,
width, height); width, height);
} }
#if defined(WIN32) && !defined(COVERAGE_ENABLED) #if defined(WIN32) && !defined(LIBYUV_DISABLE_ASM)
#define HAS_REVERSE_LINE_UV_SSSE3 #define HAS_REVERSE_ROW_UV_SSSE3
__declspec(naked) __declspec(naked)
void ReverseLineUV_SSSE3(const uint8* src, void ReverseRowUV_SSSE3(const uint8* src,
uint8* dst_a, uint8* dst_b, uint8* dst_a, uint8* dst_b,
int width) { int width) {
__asm { __asm {
...@@ -1087,18 +1084,14 @@ __asm { ...@@ -1087,18 +1084,14 @@ __asm {
} }
#elif (defined(__i386__) || defined(__x86_64__)) && \ #elif (defined(__i386__) || defined(__x86_64__)) && \
!defined(__APPLE__) && \ !defined(LIBYUV_DISABLE_ASM) && !defined(TARGET_IPHONE_SIMULATOR)
!defined(COVERAGE_ENABLED) && !defined(TARGET_IPHONE_SIMULATOR) #define HAS_REVERSE_ROW_UV_SSSE3
#define HAS_REVERSE_LINE_UV_SSSE3 void ReverseRowUV_SSSE3(const uint8* src,
void ReverseLineUV_SSSE3(const uint8* src,
uint8* dst_a, uint8* dst_b, uint8* dst_a, uint8* dst_b,
int width) { int width) {
intptr_t temp_width = static_cast<intptr_t>(width); intptr_t temp_width = static_cast<intptr_t>(width);
asm volatile ( asm volatile (
"movdqa %0,%%xmm5 \n" "movdqa %4,%%xmm5 \n"
:: "m"(kShuffleReverseUV)
);
asm volatile (
"lea -16(%0,%3,2),%0 \n" "lea -16(%0,%3,2),%0 \n"
"1: \n" "1: \n"
"movdqa (%0),%%xmm0 \n" "movdqa (%0),%%xmm0 \n"
...@@ -1114,7 +1107,7 @@ void ReverseLineUV_SSSE3(const uint8* src, ...@@ -1114,7 +1107,7 @@ void ReverseLineUV_SSSE3(const uint8* src,
"+r"(dst_a), // %1 "+r"(dst_a), // %1
"+r"(dst_b), // %2 "+r"(dst_b), // %2
"+r"(temp_width) // %3 "+r"(temp_width) // %3
: : "m"(kShuffleReverseUV) // %4
: "memory", "cc" : "memory", "cc"
#if defined(__SSE2__) #if defined(__SSE2__)
, "xmm0", "xmm5" , "xmm0", "xmm5"
...@@ -1123,7 +1116,7 @@ void ReverseLineUV_SSSE3(const uint8* src, ...@@ -1123,7 +1116,7 @@ void ReverseLineUV_SSSE3(const uint8* src,
} }
#endif #endif
static void ReverseLineUV_C(const uint8* src, static void ReverseRowUV_C(const uint8* src,
uint8* dst_a, uint8* dst_b, uint8* dst_a, uint8* dst_b,
int width) { int width) {
int i; int i;
...@@ -1140,31 +1133,31 @@ void RotateUV180(const uint8* src, int src_stride, ...@@ -1140,31 +1133,31 @@ void RotateUV180(const uint8* src, int src_stride,
uint8* dst_b, int dst_stride_b, uint8* dst_b, int dst_stride_b,
int width, int height) { int width, int height) {
int i; int i;
reverse_uv_func ReverseLine; reverse_uv_func ReverseRow;
#if defined(HAS_REVERSE_LINE_UV_NEON) #if defined(HAS_REVERSE_ROW_UV_NEON)
if (TestCpuFlag(kCpuHasNEON)) { if (TestCpuFlag(kCpuHasNEON)) {
ReverseLine = ReverseLineUV_NEON; ReverseRow = ReverseRowUV_NEON;
} else } else
#endif #endif
#if defined(HAS_REVERSE_LINE_UV_SSSE3) #if defined(HAS_REVERSE_ROW_UV_SSSE3)
if (TestCpuFlag(kCpuHasSSSE3) && if (TestCpuFlag(kCpuHasSSSE3) &&
(width % 16 == 0) && (width % 16 == 0) &&
IS_ALIGNED(src, 16) && (src_stride % 16 == 0) && IS_ALIGNED(src, 16) && (src_stride % 16 == 0) &&
IS_ALIGNED(dst_a, 8) && (dst_stride_a % 8 == 0) && IS_ALIGNED(dst_a, 8) && (dst_stride_a % 8 == 0) &&
IS_ALIGNED(dst_b, 8) && (dst_stride_b % 8 == 0) ) { IS_ALIGNED(dst_b, 8) && (dst_stride_b % 8 == 0) ) {
ReverseLine = ReverseLineUV_SSSE3; ReverseRow = ReverseRowUV_SSSE3;
} else } else
#endif #endif
{ {
ReverseLine = ReverseLineUV_C; ReverseRow = ReverseRowUV_C;
} }
dst_a += dst_stride_a * (height - 1); dst_a += dst_stride_a * (height - 1);
dst_b += dst_stride_b * (height - 1); dst_b += dst_stride_b * (height - 1);
for (i = 0; i < height; ++i) { for (i = 0; i < height; ++i) {
ReverseLine(src, dst_a, dst_b, width); ReverseRow(src, dst_a, dst_b, width);
src += src_stride; // down one line at a time src += src_stride; // down one line at a time
dst_a -= dst_stride_a; // nominally up one line at a time dst_a -= dst_stride_a; // nominally up one line at a time
......
source/rotate_neon.cc
View file @ 2430e04e
...@@ -12,9 +12,10 @@ ...@@ -12,9 +12,10 @@
namespace libyuv { namespace libyuv {
#if defined(__ARM_NEON__) && !defined(COVERAGE_ENABLED) #if defined(__ARM_NEON__) && \
!defined(COVERAGE_ENABLED) && !defined(TARGET_IPHONE_SIMULATOR)
void ReverseLine_NEON(const uint8* src, uint8* dst, int width) { void ReverseRow_NEON(const uint8* src, uint8* dst, int width) {
asm volatile ( asm volatile (
// compute where to start writing destination // compute where to start writing destination
"add %1, %2 \n" "add %1, %2 \n"
...@@ -267,7 +268,7 @@ void TransposeWx8_NEON(const uint8* src, int src_stride, ...@@ -267,7 +268,7 @@ void TransposeWx8_NEON(const uint8* src, int src_stride,
); );
} }
void ReverseLineUV_NEON(const uint8* src, void ReverseRowUV_NEON(const uint8* src,
uint8* dst_a, uint8* dst_b, uint8* dst_a, uint8* dst_b,
int width) { int width) {
asm volatile ( asm volatile (
......
source/rotate_priv.h
View file @ 2430e04e
...@@ -16,23 +16,19 @@ ...@@ -16,23 +16,19 @@
namespace libyuv { namespace libyuv {
// Rotate planes by 90, 180, 270 // Rotate planes by 90, 180, 270
void void RotatePlane90(const uint8* src, int src_stride,
RotatePlane90(const uint8* src, int src_stride,
uint8* dst, int dst_stride, uint8* dst, int dst_stride,
int width, int height); int width, int height);
void void RotatePlane180(const uint8* src, int src_stride,
RotatePlane180(const uint8* src, int src_stride,
uint8* dst, int dst_stride, uint8* dst, int dst_stride,
int width, int height); int width, int height);
void void RotatePlane270(const uint8* src, int src_stride,
RotatePlane270(const uint8* src, int src_stride,
uint8* dst, int dst_stride, uint8* dst, int dst_stride,
int width, int height); int width, int height);
void void RotateUV90(const uint8* src, int src_stride,
RotateUV90(const uint8* src, int src_stride,
uint8* dst_a, int dst_stride_a, uint8* dst_a, int dst_stride_a,
uint8* dst_b, int dst_stride_b, uint8* dst_b, int dst_stride_b,
int width, int height); int width, int height);
...@@ -41,14 +37,12 @@ RotateUV90(const uint8* src, int src_stride, ...@@ -41,14 +37,12 @@ RotateUV90(const uint8* src, int src_stride,
// These functions take one input pointer and // These functions take one input pointer and
// split the data into two buffers while // split the data into two buffers while
// rotating them. // rotating them.
void void RotateUV180(const uint8* src, int src_stride,
RotateUV180(const uint8* src, int src_stride,
uint8* dst_a, int dst_stride_a, uint8* dst_a, int dst_stride_a,
uint8* dst_b, int dst_stride_b, uint8* dst_b, int dst_stride_b,
int width, int height); int width, int height);
void void RotateUV270(const uint8* src, int src_stride,
RotateUV270(const uint8* src, int src_stride,
uint8* dst_a, int dst_stride_a, uint8* dst_a, int dst_stride_a,
uint8* dst_b, int dst_stride_b, uint8* dst_b, int dst_stride_b,
int width, int height); int width, int height);
...@@ -56,13 +50,11 @@ RotateUV270(const uint8* src, int src_stride, ...@@ -56,13 +50,11 @@ RotateUV270(const uint8* src, int src_stride,
// The 90 and 270 functions are based on transposes. // The 90 and 270 functions are based on transposes.
// Doing a transpose with reversing the read/write // Doing a transpose with reversing the read/write
// order will result in a rotation by +- 90 degrees. // order will result in a rotation by +- 90 degrees.
void void TransposePlane(const uint8* src, int src_stride,
TransposePlane(const uint8* src, int src_stride,
uint8* dst, int dst_stride, uint8* dst, int dst_stride,
int width, int height); int width, int height);
void void TransposeUV(const uint8* src, int src_stride,
TransposeUV(const uint8* src, int src_stride,
uint8* dst_a, int dst_stride_a, uint8* dst_a, int dst_stride_a,
uint8* dst_b, int dst_stride_b, uint8* dst_b, int dst_stride_b,
int width, int height); int width, int height);
......
source/row_posix.cc
View file @ 2430e04e
...@@ -22,8 +22,7 @@ static const vec8 kARGBToY = { ...@@ -22,8 +22,7 @@ static const vec8 kARGBToY = {
}; };
static const uvec8 kAddY16 = { static const uvec8 kAddY16 = {
16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u
16u, 16u, 16u, 16u, 16u, 16u, 16u, 16u,
}; };
#ifdef HAS_ARGBTOUVROW_SSSE3 #ifdef HAS_ARGBTOUVROW_SSSE3
...@@ -32,8 +31,9 @@ static const vec8 kARGBToU = { ...@@ -32,8 +31,9 @@ static const vec8 kARGBToU = {
}; };
static const uvec8 kARGBToV = { static const uvec8 kARGBToV = {
-18, -94, 112, 0, -18, -94, 112, 0, -18, -94, 112, 0, -18, -94, 112, 0, -18, -94, 112, 0, -18, -94, 112, 0, -18, -94, 112, 0, -18, -94, 112, 0
}; };
static const uvec8 kAddUV128 = { static const uvec8 kAddUV128 = {
128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u,
128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u 128u, 128u, 128u, 128u, 128u, 128u, 128u, 128u
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment