third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp - Issue 1530723004: Use clampTo instead of chaining std::max(std::min(...))

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/platform/audio/Biquad.cpp ('k') | third_party/WebKit/Source/platform/audio/EqualPowerPanner.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

diff --git a/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp b/third_party/WebKit/Source/platform/audio/DynamicsCompressorKernel.cpp

index e0cc41a80b1b444167aabe7c293bc011b95655d4..3bbd761e7ec02095af8fa84beeca84b2799b2f60 100644

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

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

@@ -29,10 +29,11 @@

#include "platform/audio/DynamicsCompressorKernel.h"

#if ENABLE(WEB_AUDIO)

-#include <algorithm>

#include "platform/audio/AudioUtilities.h"

#include "platform/audio/DenormalDisabler.h"

#include "wtf/MathExtras.h"

+#include <algorithm>

+#include <cmath>

namespace blink {

@@ -318,8 +319,7 @@ void DynamicsCompressorKernel::process(const float* sourceChannels[],

// 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.