From 0014ce0056ba7bcbdf7e7fd31825ed58c68cb68e Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Mon, 2 Dec 2013 20:07:29 +0000 Subject: [PATCH] test odd width and fix for unaligned used on odd width conversion. BUG=283 TESTED=try bots R=tpsiaki@google.com Review URL: https://webrtc-codereview.appspot.com/4729004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@883 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row_posix.cc | 4 ++-- unit_test/compare_test.cc | 2 +- unit_test/unit_test.cc | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.chromium b/README.chromium index d97aa5327..cd77ad11c 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 882 +Version: 883 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index f9449b297..6c55976af 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 882 +#define LIBYUV_VERSION 883 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_posix.cc b/source/row_posix.cc index e96f2983a..475d2f815 100644 --- a/source/row_posix.cc +++ b/source/row_posix.cc @@ -2955,8 +2955,8 @@ void OMITFP I422ToRGBARow_Unaligned_SSSE3(const uint8* y_buf, "movdqa %%xmm5,%%xmm0 \n" "punpcklwd %%xmm1,%%xmm5 \n" "punpckhwd %%xmm1,%%xmm0 \n" - "movdqa %%xmm5," MEMACCESS([dst_rgba]) "\n" - "movdqa %%xmm0," MEMACCESS2(0x10,[dst_rgba]) "\n" + "movdqu %%xmm5," MEMACCESS([dst_rgba]) "\n" + "movdqu %%xmm0," MEMACCESS2(0x10,[dst_rgba]) "\n" "lea " MEMLEA(0x20,[dst_rgba]) ",%[dst_rgba] \n" "sub $0x8,%[width] \n" "jg 1b \n" diff --git a/unit_test/compare_test.cc b/unit_test/compare_test.cc index 6aa210c58..efc2e39e6 100644 --- a/unit_test/compare_test.cc +++ b/unit_test/compare_test.cc @@ -288,7 +288,7 @@ TEST_F(libyuvTest, Psnr) { EXPECT_GT(err, 2.0); if (kSrcWidth * kSrcHeight >= 256) { - EXPECT_LT(err, 5.0); + EXPECT_LT(err, 6.0); } srandom(time(NULL)); diff --git a/unit_test/unit_test.cc b/unit_test/unit_test.cc index 3c00fc8b0..c8845e1f5 100644 --- a/unit_test/unit_test.cc +++ b/unit_test/unit_test.cc @@ -19,8 +19,8 @@ #define BENCHMARK_ITERATIONS 1 libyuvTest::libyuvTest() : rotate_max_w_(128), rotate_max_h_(128), - benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(128), - benchmark_height_(72) { + benchmark_iterations_(BENCHMARK_ITERATIONS), benchmark_width_(33), + benchmark_height_(19) { const char* repeat = getenv("LIBYUV_REPEAT"); if (repeat) { benchmark_iterations_ = atoi(repeat); // NOLINT