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

Side by Side Diff: third_party/WebKit/Source/platform/audio/HRTFDatabase.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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 12 matching lines...) Expand all
23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 23 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 24 * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
27 */ 27 */
28 28
29 #include "platform/audio/HRTFDatabase.h" 29 #include "platform/audio/HRTFDatabase.h"
30 30
31 #if ENABLE(WEB_AUDIO) 31 #if ENABLE(WEB_AUDIO)
32 32
33 #include "wtf/MathExtras.h"
34
33 namespace blink { 35 namespace blink {
34 36
35 const int HRTFDatabase::MinElevation = -45; 37 const int HRTFDatabase::MinElevation = -45;
36 const int HRTFDatabase::MaxElevation = 90; 38 const int HRTFDatabase::MaxElevation = 90;
37 const unsigned HRTFDatabase::RawElevationAngleSpacing = 15; 39 const unsigned HRTFDatabase::RawElevationAngleSpacing = 15;
38 const unsigned HRTFDatabase::NumberOfRawElevations = 10; // -45 -> +90 (each 15 degrees) 40 const unsigned HRTFDatabase::NumberOfRawElevations = 10; // -45 -> +90 (each 15 degrees)
39 const unsigned HRTFDatabase::InterpolationFactor = 1; 41 const unsigned HRTFDatabase::InterpolationFactor = 1;
40 const unsigned HRTFDatabase::NumberOfTotalElevations = NumberOfRawElevations * I nterpolationFactor; 42 const unsigned HRTFDatabase::NumberOfTotalElevations = NumberOfRawElevations * I nterpolationFactor;
41 43
42 PassOwnPtr<HRTFDatabase> HRTFDatabase::create(float sampleRate) 44 PassOwnPtr<HRTFDatabase> HRTFDatabase::create(float sampleRate)
(...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 kernelR = 0; 101 kernelR = 0;
100 return; 102 return;
101 } 103 }
102 104
103 hrtfElevation->getKernelsFromAzimuth(azimuthBlend, azimuthIndex, kernelL, ke rnelR, frameDelayL, frameDelayR); 105 hrtfElevation->getKernelsFromAzimuth(azimuthBlend, azimuthIndex, kernelL, ke rnelR, frameDelayL, frameDelayR);
104 } 106 }
105 107
106 unsigned HRTFDatabase::indexFromElevationAngle(double elevationAngle) 108 unsigned HRTFDatabase::indexFromElevationAngle(double elevationAngle)
107 { 109 {
108 // Clamp to allowed range. 110 // Clamp to allowed range.
109 elevationAngle = std::max(static_cast<double>(MinElevation), elevationAngle) ; 111 elevationAngle = clampTo<double, double>(elevationAngle, MinElevation, MaxEl evation);
110 elevationAngle = std::min(static_cast<double>(MaxElevation), elevationAngle) ;
111 112
112 unsigned elevationIndex = static_cast<int>(InterpolationFactor * (elevationA ngle - MinElevation) / RawElevationAngleSpacing); 113 unsigned elevationIndex = static_cast<int>(InterpolationFactor * (elevationA ngle - MinElevation) / RawElevationAngleSpacing);
113 return elevationIndex; 114 return elevationIndex;
114 } 115 }
115 116
116 } // namespace blink 117 } // namespace blink
117 118
118 #endif // ENABLE(WEB_AUDIO) 119 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/audio/EqualPowerPanner.cpp ('k') | third_party/WebKit/Source/platform/audio/HRTFKernel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698