From d0a4b4ac01088fa6272f01f33112c02b7740cf8b Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Tue, 3 Dec 2013 07:00:11 +0000 Subject: [PATCH] Switch I4xxToI420 to point sample to pass drmemory. BUG=289 TESTED=drmemory R=ryanpetrie@google.com Review URL: https://webrtc-codereview.appspot.com/4809004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@886 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- Android.mk | 1 - README.chromium | 2 +- include/libyuv/version.h | 2 +- libyuv.gyp | 1 - source/convert.cc | 12 ++++++------ source/scale_argb_neon.cc | 2 -- 6 files changed, 8 insertions(+), 12 deletions(-) delete mode 100644 source/scale_argb_neon.cc diff --git a/Android.mk b/Android.mk index 2284239c7..3d8ba49a3 100644 --- a/Android.mk +++ b/Android.mk @@ -43,7 +43,6 @@ ifeq ($(TARGET_ARCH_ABI),armeabi-v7a) source/compare_neon.cc.neon \ source/rotate_neon.cc.neon \ source/row_neon.cc.neon \ - source/scale_argb_neon.cc.neon \ source/scale_neon.cc.neon endif diff --git a/README.chromium b/README.chromium index c3d58b987..27c2069e1 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 885 +Version: 886 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index f14bdbf6a..071cd4101 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 885 +#define LIBYUV_VERSION 886 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/libyuv.gyp b/libyuv.gyp index e3f5046a9..4130bd0d3 100644 --- a/libyuv.gyp +++ b/libyuv.gyp @@ -108,7 +108,6 @@ 'source/row_win.cc', 'source/scale.cc', 'source/scale_argb.cc', - 'source/scale_argb_neon.cc', # Deprecated. 'source/scale_common.cc', 'source/scale_mips.cc', 'source/scale_neon.cc', diff --git a/source/convert.cc b/source/convert.cc index 4c2a90156..eeacb8b46 100644 --- a/source/convert.cc +++ b/source/convert.cc @@ -95,12 +95,12 @@ int I422ToI420(const uint8* src_y, int src_stride_y, // Resample U plane. ScalePlane(src_u, src_stride_u, halfwidth, height, dst_u, dst_stride_u, halfwidth, halfheight, - kFilterBilinear); + kFilterNone); // Resample V plane. ScalePlane(src_v, src_stride_v, halfwidth, height, dst_v, dst_stride_v, halfwidth, halfheight, - kFilterBilinear); + kFilterNone); return 0; } @@ -141,12 +141,12 @@ int I444ToI420(const uint8* src_y, int src_stride_y, // Resample U plane. ScalePlane(src_u, src_stride_u, width, height, dst_u, dst_stride_u, halfwidth, halfheight, - kFilterBilinear); + kFilterNone); // Resample V plane. ScalePlane(src_v, src_stride_v, width, height, dst_v, dst_stride_v, halfwidth, halfheight, - kFilterBilinear); + kFilterNone); return 0; } @@ -188,12 +188,12 @@ int I411ToI420(const uint8* src_y, int src_stride_y, // Resample U plane. ScalePlane(src_u, src_stride_u, quarterwidth, height, dst_u, dst_stride_u, halfwidth, halfheight, - kFilterBilinear); + kFilterNone); // Resample V plane. ScalePlane(src_v, src_stride_v, quarterwidth, height, dst_v, dst_stride_v, halfwidth, halfheight, - kFilterBilinear); + kFilterNone); return 0; } diff --git a/source/scale_argb_neon.cc b/source/scale_argb_neon.cc deleted file mode 100644 index 43842b9d2..000000000 --- a/source/scale_argb_neon.cc +++ /dev/null @@ -1,2 +0,0 @@ -// This file is deprecated. -