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

Unified 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: Handling that minimumThumbLength > trackLen. 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 side-by-side diff with in-line comments
Download patch
Index: third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
diff --git a/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp b/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
index 861ac9b7d3ad3ab6b05b045350b824ba86d99a67..12aed4828581fccbd7b3bab4f5bf41f427d8ec31 100644
--- a/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
+++ b/third_party/WebKit/Source/platform/audio/AudioDelayDSPKernel.cpp
@@ -30,7 +30,7 @@
#include "platform/audio/AudioUtilities.h"
#include "wtf/MathExtras.h"
-#include <algorithm>
+#include <cmath>
namespace blink {
@@ -113,8 +113,7 @@ void AudioDelayDSPKernel::process(const float* source, float* destination, size_
delayTime = this->delayTime(sampleRate);
// Make sure the delay time is in a valid range.
- delayTime = std::min(maxTime, delayTime);
- delayTime = std::max(0.0, delayTime);
+ delayTime = clampTo(delayTime, 0.0, maxTime);
if (m_firstTime) {
m_currentDelayTime = delayTime;
@@ -125,8 +124,7 @@ void AudioDelayDSPKernel::process(const float* source, float* destination, size_
for (unsigned i = 0; i < framesToProcess; ++i) {
if (sampleAccurate) {
delayTime = delayTimes[i];
- delayTime = std::min(maxTime, delayTime);
- delayTime = std::max(0.0, delayTime);
+ delayTime = clampTo(delayTime, 0.0, maxTime);
m_currentDelayTime = delayTime;
} else {
// Approach desired delay time.

Powered by Google App Engine
This is Rietveld 408576698