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

Side by Side Diff: third_party/WebKit/Source/platform/audio/HRTFPanner.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 4 years, 12 months 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/HRTFPanner.h" 25 #include "platform/audio/HRTFPanner.h"
26 26
27 #if ENABLE(WEB_AUDIO) 27 #if ENABLE(WEB_AUDIO)
28 #include <algorithm>
29 #include "platform/audio/AudioBus.h" 28 #include "platform/audio/AudioBus.h"
30 #include "platform/audio/AudioUtilities.h" 29 #include "platform/audio/AudioUtilities.h"
31 #include "platform/audio/HRTFDatabase.h" 30 #include "platform/audio/HRTFDatabase.h"
32 #include "wtf/MathExtras.h" 31 #include "wtf/MathExtras.h"
33 #include "wtf/RefPtr.h" 32 #include "wtf/RefPtr.h"
34 33
35 namespace blink { 34 namespace blink {
36 35
37 // The value of 2 milliseconds is larger than the largest delay which exists in any HRTFKernel from the default HRTFDatabase (0.0136 seconds). 36 // The value of 2 milliseconds is larger than the largest delay which exists in any HRTFKernel from the default HRTFDatabase (0.0136 seconds).
38 // We ASSERT the delay values used in process() with this value. 37 // We ASSERT the delay values used in process() with this value.
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
109 int numberOfAzimuths = HRTFDatabase::numberOfAzimuths(); 108 int numberOfAzimuths = HRTFDatabase::numberOfAzimuths();
110 const double angleBetweenAzimuths = 360.0 / numberOfAzimuths; 109 const double angleBetweenAzimuths = 360.0 / numberOfAzimuths;
111 110
112 // Calculate the azimuth index and the blend (0 -> 1) for interpolation. 111 // Calculate the azimuth index and the blend (0 -> 1) for interpolation.
113 double desiredAzimuthIndexFloat = azimuth / angleBetweenAzimuths; 112 double desiredAzimuthIndexFloat = azimuth / angleBetweenAzimuths;
114 int desiredAzimuthIndex = static_cast<int>(desiredAzimuthIndexFloat); 113 int desiredAzimuthIndex = static_cast<int>(desiredAzimuthIndexFloat);
115 azimuthBlend = desiredAzimuthIndexFloat - static_cast<double>(desiredAzimuth Index); 114 azimuthBlend = desiredAzimuthIndexFloat - static_cast<double>(desiredAzimuth Index);
116 115
117 // We don't immediately start using this azimuth index, but instead approach this index from the last index we rendered at. 116 // We don't immediately start using this azimuth index, but instead approach this index from the last index we rendered at.
118 // This minimizes the clicks and graininess for moving sources which occur o therwise. 117 // This minimizes the clicks and graininess for moving sources which occur o therwise.
119 desiredAzimuthIndex = std::max(0, desiredAzimuthIndex); 118 desiredAzimuthIndex = clampTo(desiredAzimuthIndex, 0, numberOfAzimuths - 1);
120 desiredAzimuthIndex = std::min(numberOfAzimuths - 1, desiredAzimuthIndex);
121 return desiredAzimuthIndex; 119 return desiredAzimuthIndex;
122 } 120 }
123 121
124 void HRTFPanner::pan(double desiredAzimuth, double elevation, const AudioBus* in putBus, AudioBus* outputBus, size_t framesToProcess) 122 void HRTFPanner::pan(double desiredAzimuth, double elevation, const AudioBus* in putBus, AudioBus* outputBus, size_t framesToProcess)
125 { 123 {
126 unsigned numInputChannels = inputBus ? inputBus->numberOfChannels() : 0; 124 unsigned numInputChannels = inputBus ? inputBus->numberOfChannels() : 0;
127 125
128 bool isInputGood = inputBus && numInputChannels >= 1 && numInputChannels <= 2; 126 bool isInputGood = inputBus && numInputChannels >= 1 && numInputChannels <= 2;
129 ASSERT(isInputGood); 127 ASSERT(isInputGood);
130 128
(...skipping 176 matching lines...) Expand 10 before | Expand all | Expand 10 after
307 double HRTFPanner::latencyTime() const 305 double HRTFPanner::latencyTime() const
308 { 306 {
309 // The latency of a FFTConvolver is also fftSize() / 2, and is in addition t o its tailTime of the 307 // The latency of a FFTConvolver is also fftSize() / 2, and is in addition t o its tailTime of the
310 // same value. 308 // same value.
311 return (fftSize() / 2) / static_cast<double>(sampleRate()); 309 return (fftSize() / 2) / static_cast<double>(sampleRate());
312 } 310 }
313 311
314 } // namespace blink 312 } // namespace blink
315 313
316 #endif // ENABLE(WEB_AUDIO) 314 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « third_party/WebKit/Source/platform/audio/HRTFKernel.cpp ('k') | third_party/WebKit/Source/platform/audio/VectorMath.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698