From d4164fb01a15022740c99f68bbf153ecc7e97b21 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Thu, 30 Aug 2012 20:42:01 +0000 Subject: [PATCH] Clean up posix build of YUY2 BUG=76 TEST=build on osx/linux Review URL: https://webrtc-codereview.appspot.com/762006 git-svn-id: http://libyuv.googlecode.com/svn/trunk@335 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row.h | 2 ++ source/row_posix.cc | 3 +-- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/README.chromium b/README.chromium index a3ad86971..11792fb43 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 333 +Version: 335 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index d72b25647..66a41dce7 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 333 +#define LIBYUV_VERSION 335 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row.h b/source/row.h index f52ed69c4..038c6d2b8 100644 --- a/source/row.h +++ b/source/row.h @@ -70,6 +70,8 @@ extern "C" { #define HAS_UYVYTOUVROW_SSE2 #define HAS_UYVYTOYROW_SSE2 #define HAS_YTOARGBROW_SSE2 +#define HAS_YUY2TOUVROW_SSE2 +#define HAS_YUY2TOUV422ROW_SSE2 #define HAS_YUY2TOYROW_SSE2 #define HAS_ARGBGRAYROW_SSSE3 #define HAS_ARGBSEPIAROW_SSSE3 diff --git a/source/row_posix.cc b/source/row_posix.cc index 305934663..609e7dc7a 100644 --- a/source/row_posix.cc +++ b/source/row_posix.cc @@ -2219,8 +2219,7 @@ void YUY2ToYRow_Unaligned_SSE2(const uint8* src_yuy2, void YUY2ToUVRow_Unaligned_SSE2(const uint8* src_yuy2, int stride_yuy2, - uint8* dst_u, uint8* dst_y, - int pix) { + uint8* dst_u, uint8* dst_v, int pix) { asm volatile ( "pcmpeqb %%xmm5,%%xmm5 \n" "psrlw $0x8,%%xmm5 \n"