aboutsummaryrefslogtreecommitdiff
path: root/source/scale_argb.cc
diff options
context:
space:
mode:
authoryang.zhang@arm.com <yang.zhang@arm.com>2015-03-17 02:23:59 +0000
committeryang.zhang@arm.com <yang.zhang@arm.com>2015-03-17 02:23:59 +0000
commit4d387fc61990068d062ce8a2a8417e065ff01469 (patch)
treeaa939a3c342992f8c9f7d13b4ca8736dd7f1d67d /source/scale_argb.cc
parente246e6c18f0606accdd02adce54ac85bba98f947 (diff)
downloadlibyuv-4d387fc61990068d062ce8a2a8417e065ff01469.tar.gz
Add ScaleARGBRowDown2Linear_NEON for ARM32/64
ARM32/64 NEON versions of ScaleARGBRowDown2Linear_NEON are implemented. BUG=319 TESTED=libyuvTest.ARGBScale* on ARM32/64 with Android R=fbarchard@google.com Change-Id: Ife602c81b51aa36e0d56b9d628f278a24eed96f6 Review URL: https://webrtc-codereview.appspot.com/44689004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1336 16f28f9a-4ce2-e073-06de-1de4eb20be90
Diffstat (limited to 'source/scale_argb.cc')
-rw-r--r--source/scale_argb.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/source/scale_argb.cc b/source/scale_argb.cc
index d69ecdc8..83713d55 100644
--- a/source/scale_argb.cc
+++ b/source/scale_argb.cc
@@ -61,8 +61,9 @@ static void ScaleARGBDown2(int src_width, int src_height,
#endif
#if defined(HAS_SCALEARGBROWDOWN2_NEON)
if (TestCpuFlag(kCpuHasNEON) && IS_ALIGNED(dst_width, 8)) {
- ScaleARGBRowDown2 = filtering ? ScaleARGBRowDown2Box_NEON :
- ScaleARGBRowDown2_NEON;
+ ScaleARGBRowDown2 = filtering == kFilterNone ? ScaleARGBRowDown2_NEON :
+ (filtering == kFilterLinear ? ScaleARGBRowDown2Linear_NEON :
+ ScaleARGBRowDown2Box_NEON);
}
#endif