Use clampTo instead of chaining std::max(std::min(...))

third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp

 /*
  * Copyright (C) 2011 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
  *     notice, this list of conditions and the following disclaimer.
  * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 14 matching lines @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 
 #if ENABLE(WEB_AUDIO)
 
 #include "platform/audio/DynamicsCompressorKernel.h"
 
-#include <algorithm>
 #include "platform/audio/AudioUtilities.h"
 #include "platform/audio/DenormalDisabler.h"
 #include "wtf/MathExtras.h"
+#include <algorithm>
+#include <cmath>

[Raymond Toy, 2015/12/17 19:45:55]

Are both of these needed?  Previously, you replaced algorithm with cmath.

[Daniel Bratell, 2015/12/17 22:56:16]

DynamicsCompressorKernel::process uses std::max() so <algorithm> is still
needed. <cmath> is needed for std::isinf() and std::isnan() used in that same
method. I'm not sure where it gets it today, but it should include what it uses
(though I as most people rely on compilation errors to tell me when I forgot
something).

 
 namespace blink {
 
 using namespace AudioUtilities;
 
 // Metering hits peaks instantly, but releases this fast (in seconds).
 const float meteringReleaseTimeConstant = 0.325f;
 
 const float uninitializedValue = -1;
 
@@ skipping 265 matching lines @@
             // Fix gremlins.
             if (std::isnan(compressionDiffDb))
                 compressionDiffDb = -1;
             if (std::isinf(compressionDiffDb))
                 compressionDiffDb = -1;
 
             // Adaptive release - higher compression (lower compressionDiffDb)  releases faster.
 
             // Contain within range: -12 -> 0 then scale to go from 0 -> 3
             float x = compressionDiffDb;
-            x = std::max(-12.0f, x);
-            x = std::min(0.0f, x);
+            x = clampTo(x, -12.0f, 0.0f);
             x = 0.25f * (x + 12);
 
             // Compute adaptive release curve using 4th order polynomial.
             // Normal values for the polynomial coefficients would create a monotonically increasing function.
             float x2 = x * x;
             float x3 = x2 * x;
             float x4 = x2 * x2;
             float releaseFrames = kA + kB * x + kC * x2 + kD * x3 + kE * x4;
 
 #define kSpacingDb 5
@@ skipping 132 matching lines @@
 
     m_preDelayReadIndex = 0;
     m_preDelayWriteIndex = DefaultPreDelayFrames;
 
     m_maxAttackCompressionDiffDb = -1; // uninitialized state
 }
 
 } // namespace blink
 
 #endif // ENABLE(WEB_AUDIO)