From 2a26734f0413434952015fc71fa13ad6cda87880 Mon Sep 17 00:00:00 2001 From: "henrik.lundin@webrtc.org" Date: Mon, 12 Jan 2015 20:52:21 +0000 Subject: [PATCH] Partial revert of r7396 This change reverts a small part of what was done in r7396. It seems like that change uncovered another issue with NEON. BUG=4177,chrome-os-partner:31534 R=tina.legrand@webrtc.org Review URL: https://webrtc-codereview.appspot.com/33849004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@8043 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc/modules/audio_coding/codecs/isac/fix/source/fft.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/webrtc/modules/audio_coding/codecs/isac/fix/source/fft.c b/webrtc/modules/audio_coding/codecs/isac/fix/source/fft.c index a1876d0939..08701b219f 100644 --- a/webrtc/modules/audio_coding/codecs/isac/fix/source/fft.c +++ b/webrtc/modules/audio_coding/codecs/isac/fix/source/fft.c @@ -176,8 +176,10 @@ int16_t WebRtcIsacfix_FftRadix16Fastest(int16_t RexQx[], int16_t ImxQx[], int16_ bjQx = ImxQx[k1] + ImxQx[k2]; RexQx[kk] = akQx + ajQx; ImxQx[kk] = bkQx + bjQx; - akQx -= ajQx >> 1; - bkQx -= bjQx >> 1; + tmp116 = ajQx >> 1; + tmp216 = bjQx >> 1; + akQx = akQx - tmp116; + bkQx = bkQx - tmp216; tmp116 = RexQx[k1] - RexQx[k2]; tmp216 = ImxQx[k1] - ImxQx[k2];