From 589699eea2444cdcb57da235c9f91d2a1d0fd7c5 Mon Sep 17 00:00:00 2001 From: Zhongwei Yao Date: Wed, 6 May 2015 10:25:04 +0800 Subject: [PATCH] Fix bug in transform_neon.c in iSAC codec. The bug causes AcmReceiverBitExactness and AcmSenderBitExactness test failed in modules_unittests. BUG=4002 R=andrew@webrtc.org, jridges@masque.com, kjellander@webrtc.org Change-Id: I18b00056c53cf4158c186d449e5ab785065cca94 Review URL: https://webrtc-codereview.appspot.com/49889004 Patch from Zhongwei Yao . Cr-Commit-Position: refs/heads/master@{#9138} --- .../audio_coding/codecs/isac/fix/source/transform_neon.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.c index b4e95b2077..f0cbd5d075 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/transform_neon.c @@ -432,10 +432,10 @@ static inline void PostShiftAndDivideAndDemodulateNeon(int16_t* inre, xi3 = vmlal_s32(xi3, vget_high_s32(tmpi_1), vget_high_s32(outre1_1)); #endif - outre1_0 = vcombine_s32(vshrn_n_s64(xr0, 10), vshrn_n_s64(xr1, 10)); - outre2_0 = vcombine_s32(vshrn_n_s64(xi0, 10), vshrn_n_s64(xi1, 10)); - outre1_1 = vcombine_s32(vshrn_n_s64(xr2, 10), vshrn_n_s64(xr3, 10)); - outre2_1 = vcombine_s32(vshrn_n_s64(xi2, 10), vshrn_n_s64(xi3, 10)); + outre1_0 = vcombine_s32(vrshrn_n_s64(xr0, 10), vrshrn_n_s64(xr1, 10)); + outre2_0 = vcombine_s32(vrshrn_n_s64(xi0, 10), vrshrn_n_s64(xi1, 10)); + outre1_1 = vcombine_s32(vrshrn_n_s64(xr2, 10), vrshrn_n_s64(xr3, 10)); + outre2_1 = vcombine_s32(vrshrn_n_s64(xi2, 10), vrshrn_n_s64(xi3, 10)); outre1_0 = vqdmulhq_s32(outre1_0, fact); outre2_0 = vqdmulhq_s32(outre2_0, fact); outre1_1 = vqdmulhq_s32(outre1_1, fact);