Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(138)

Side by Side Diff: third_party/WebKit/Source/platform/audio/VectorMath.cpp

Issue 1530723004: Use clampTo instead of chaining std::max(std::min(...)) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More rebase Created 5 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2010, Google Inc. All rights reserved. 2 * Copyright (C) 2010, Google Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
11 * documentation and/or other materials provided with the distribution. 11 * documentation and/or other materials provided with the distribution.
12 * 12 *
13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 #include "platform/audio/VectorMath.h" 25 #include "platform/audio/VectorMath.h"
26 26
27 #if ENABLE(WEB_AUDIO) 27 #if ENABLE(WEB_AUDIO)
28 #include "wtf/Assertions.h" 28 #include "wtf/Assertions.h"
29 #include "wtf/CPU.h" 29 #include "wtf/CPU.h"
30 #include "wtf/MathExtras.h"
30 #include <stdint.h> 31 #include <stdint.h>
31 32
32 #if OS(MACOSX) 33 #if OS(MACOSX)
33 #include <Accelerate/Accelerate.h> 34 #include <Accelerate/Accelerate.h>
34 #endif 35 #endif
35 36
36 #if CPU(X86) || CPU(X86_64) 37 #if CPU(X86) || CPU(X86_64)
37 #include <emmintrin.h> 38 #include <emmintrin.h>
38 #endif 39 #endif
39 40
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after
666 while (destP < endP) { 667 while (destP < endP) {
667 float32x4_t source = vld1q_f32(sourceP); 668 float32x4_t source = vld1q_f32(sourceP);
668 vst1q_f32(destP, vmaxq_f32(vminq_f32(source, high), low)); 669 vst1q_f32(destP, vmaxq_f32(vminq_f32(source, high), low));
669 sourceP += 4; 670 sourceP += 4;
670 destP += 4; 671 destP += 4;
671 } 672 }
672 n = tailFrames; 673 n = tailFrames;
673 } 674 }
674 #endif 675 #endif
675 while (n--) { 676 while (n--) {
676 *destP = std::max(std::min(*sourceP, highThreshold), lowThreshold); 677 *destP = clampTo(*sourceP, lowThreshold, highThreshold);
677 sourceP += sourceStride; 678 sourceP += sourceStride;
678 destP += destStride; 679 destP += destStride;
679 } 680 }
680 } 681 }
681 682
682 #endif // OS(MACOSX) 683 #endif // OS(MACOSX)
683 684
684 } // namespace VectorMath 685 } // namespace VectorMath
685 686
686 } // namespace blink 687 } // namespace blink
687 688
688 #endif // ENABLE(WEB_AUDIO) 689 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/audio/HRTFPanner.cpp ('k') | third_party/WebKit/Source/platform/graphics/Color.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698