From 1b40d8caa2811759aa5fa87f2e23061d26f8968c Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 12 Dec 2012 01:49:52 +0000 Subject: [PATCH] disable shade_neon BUG=168 TEST=TestShade Review URL: https://webrtc-codereview.appspot.com/971021 git-svn-id: http://libyuv.googlecode.com/svn/trunk@515 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/row.h | 1 - include/libyuv/version.h | 2 +- source/row_neon.cc | 12 ++++++------ 4 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.chromium b/README.chromium index cbe0faca4..a453a12b9 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 514 +Version: 515 License: BSD License File: LICENSE diff --git a/include/libyuv/row.h b/include/libyuv/row.h index 698e75964..320df9f55 100644 --- a/include/libyuv/row.h +++ b/include/libyuv/row.h @@ -223,7 +223,6 @@ extern "C" { #define HAS_ARGBBLENDROW_NEON #define HAS_ARGBATTENUATEROW_NEON #define HAS_ARGBQUANTIZEROW_NEON -#define HAS_ARGBSHADEROW_NEON #define HAS_ARGBGRAYROW_NEON #define HAS_ARGBSEPIAROW_NEON #define HAS_ARGBCOLORMATRIXROW_NEON diff --git a/include/libyuv/version.h b/include/libyuv/version.h index 0038616f9..ea8bbc4d8 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 514 +#define LIBYUV_VERSION 515 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_neon.cc b/source/row_neon.cc index 776b4a8b7..26e2e16f4 100644 --- a/source/row_neon.cc +++ b/source/row_neon.cc @@ -782,7 +782,7 @@ void SetRow_NEON(uint8* dst, uint32 v32, int count) { // TODO(fbarchard): Make fully assembler // SetRow32 writes 'count' words using a 32 bit value repeated. void ARGBSetRows_NEON(uint8* dst, uint32 v32, int width, - int dst_stride, int height) { + int dst_stride, int height) { for (int y = 0; y < height; ++y) { SetRow_NEON(dst, v32, width << 2); dst += dst_stride; @@ -2361,7 +2361,7 @@ void ARGBShadeRow_NEON(const uint8* src_argb, uint8* dst_argb, int width, asm volatile ( "vdup.u32 q0, %3 \n" // duplicate scale value. "vtrn.u8 d0, d1 \n" // d0 rrbb, d1 aagg - "vshr.u16 q0, q0, #1 \n" // scale >>= 1 + "vshr.u16 q0, q0, #1 \n" // scale / 2 // 8 pixel loop. ".p2align 2 \n" @@ -2372,10 +2372,10 @@ void ARGBShadeRow_NEON(const uint8* src_argb, uint8* dst_argb, int width, "vmovl.u8 q11, d22 \n" "vmovl.u8 q12, d24 \n" "vmovl.u8 q13, d26 \n" - "vqrdmulh.s16 q10, q10, d0[0] \n" // b * scale - "vqrdmulh.s16 q11, q11, d1[0] \n" // g - "vqrdmulh.s16 q12, q12, d0[1] \n" // r - "vqrdmulh.s16 q13, q13, d1[0] \n" // a + "vqdmulh.s16 q10, q10, d0[0] \n" // b * scale * 2 + "vqdmulh.s16 q11, q11, d1[0] \n" // g + "vqdmulh.s16 q12, q12, d0[1] \n" // r + "vqdmulh.s16 q13, q13, d1[0] \n" // a "vqmovn.u16 d20, q10 \n" "vqmovn.u16 d22, q11 \n" "vqmovn.u16 d24, q12 \n"