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

Side by Side Diff: third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.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
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/audio/AudioResamplerKernel.cpp » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/AudioDelayDSPKernel.h" 25 #include "platform/audio/AudioDelayDSPKernel.h"
26 26
27 #if ENABLE(WEB_AUDIO) 27 #if ENABLE(WEB_AUDIO)
28 #include "platform/audio/AudioUtilities.h" 28 #include "platform/audio/AudioUtilities.h"
29 #include "wtf/MathExtras.h" 29 #include "wtf/MathExtras.h"
30 #include <algorithm> 30 #include <cmath>
31 31
32 namespace blink { 32 namespace blink {
33 33
34 const float SmoothingTimeConstant = 0.020f; // 20ms 34 const float SmoothingTimeConstant = 0.020f; // 20ms
35 35
36 AudioDelayDSPKernel::AudioDelayDSPKernel(AudioDSPKernelProcessor* processor, siz e_t processingSizeInFrames) 36 AudioDelayDSPKernel::AudioDelayDSPKernel(AudioDSPKernelProcessor* processor, siz e_t processingSizeInFrames)
37 : AudioDSPKernel(processor) 37 : AudioDSPKernel(processor)
38 , m_writeIndex(0) 38 , m_writeIndex(0)
39 , m_firstTime(true) 39 , m_firstTime(true)
40 , m_delayTimes(processingSizeInFrames) 40 , m_delayTimes(processingSizeInFrames)
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
103 double maxTime = maxDelayTime(); 103 double maxTime = maxDelayTime();
104 104
105 bool sampleAccurate = hasSampleAccurateValues(); 105 bool sampleAccurate = hasSampleAccurateValues();
106 106
107 if (sampleAccurate) { 107 if (sampleAccurate) {
108 calculateSampleAccurateValues(delayTimes, framesToProcess); 108 calculateSampleAccurateValues(delayTimes, framesToProcess);
109 } else { 109 } else {
110 delayTime = this->delayTime(sampleRate); 110 delayTime = this->delayTime(sampleRate);
111 111
112 // Make sure the delay time is in a valid range. 112 // Make sure the delay time is in a valid range.
113 delayTime = std::min(maxTime, delayTime); 113 delayTime = clampTo(delayTime, 0.0, maxTime);
114 delayTime = std::max(0.0, delayTime);
115 114
116 if (m_firstTime) { 115 if (m_firstTime) {
117 m_currentDelayTime = delayTime; 116 m_currentDelayTime = delayTime;
118 m_firstTime = false; 117 m_firstTime = false;
119 } 118 }
120 } 119 }
121 120
122 for (unsigned i = 0; i < framesToProcess; ++i) { 121 for (unsigned i = 0; i < framesToProcess; ++i) {
123 if (sampleAccurate) { 122 if (sampleAccurate) {
124 delayTime = delayTimes[i]; 123 delayTime = delayTimes[i];
125 delayTime = std::min(maxTime, delayTime); 124 delayTime = clampTo(delayTime, 0.0, maxTime);
126 delayTime = std::max(0.0, delayTime);
127 m_currentDelayTime = delayTime; 125 m_currentDelayTime = delayTime;
128 } else { 126 } else {
129 // Approach desired delay time. 127 // Approach desired delay time.
130 m_currentDelayTime += (delayTime - m_currentDelayTime) * m_smoothing Rate; 128 m_currentDelayTime += (delayTime - m_currentDelayTime) * m_smoothing Rate;
131 } 129 }
132 130
133 double desiredDelayFrames = m_currentDelayTime * sampleRate; 131 double desiredDelayFrames = m_currentDelayTime * sampleRate;
134 132
135 double readPosition = m_writeIndex + bufferLength - desiredDelayFrames; 133 double readPosition = m_writeIndex + bufferLength - desiredDelayFrames;
136 if (readPosition >= bufferLength) 134 if (readPosition >= bufferLength)
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
168 } 166 }
169 167
170 double AudioDelayDSPKernel::latencyTime() const 168 double AudioDelayDSPKernel::latencyTime() const
171 { 169 {
172 return 0; 170 return 0;
173 } 171 }
174 172
175 } // namespace blink 173 } // namespace blink
176 174
177 #endif // ENABLE(WEB_AUDIO) 175 #endif // ENABLE(WEB_AUDIO)
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/Source/platform/audio/AudioResamplerKernel.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698