commit 3c60d614636a858e18fda9e52045fd1192517b8d
author pkasting <pkasting@chromium.org> Mon Jun 29 22:16:43 2015
committer Commit bot <commit-bot@chromium.org> Mon Jun 29 22:16:48 2015
tree 557e6586c045d7a1743c76a22052e2a0485bfeee
parent 71f6f4405c1c5f60097f8d10841378088e78e8b9

Remove a cast again, after it was shown to worsen Windows perf.

This will hurt Linux x64 perf, but we think that's a compiler bug and we're
willing to take the hit for the better clarity of the code sans cast as well as
the better Windows perf.  Hopefully eventually the compiler will improve.

BUG=504813
TEST=none
TBR=andrew

Review URL: https://codereview.webrtc.org/1215053002

Cr-Commit-Position: refs/heads/master@{#9516}

webrtc/common_audio/signal_processing/cross_correlation.c

diff --git a/webrtc/common_audio/signal_processing/cross_correlation.c b/webrtc/common_audio/signal_processing/cross_correlation.c
index 898d934..ba34438 100644
--- a/webrtc/common_audio/signal_processing/cross_correlation.c
+++ b/webrtc/common_audio/signal_processing/cross_correlation.c
@@ -22,11 +22,8 @@
 
   for (i = 0; i < dim_cross_correlation; i++) {
     int32_t corr = 0;
-    // Linux 64-bit performance is improved by the int16_t cast below.
-    // Presumably this is some sort of compiler bug, as there's no obvious
-    // reason why that should result in better code.
     for (j = 0; j < dim_seq; j++)
-      corr += (seq1[j] * seq2[j]) >> (int16_t)right_shifts;
+      corr += (seq1[j] * seq2[j]) >> right_shifts;
     seq2 += step_seq2;
     *cross_correlation++ = corr;
   }