third_party/WebKit/Source/platform/audio/HRTFDatabase.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/HRTFDatabase.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/EqualPowerPanner.cpp ('k') | third_party/WebKit/Source/platform/audio/HRTFKernel.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 3231aa892a02b60ef29db46a48c46d58a084ed86..1615f3343799f6c862f17fe0324c3e69fcd1aeb4 100644

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

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

@@ -30,6 +30,8 @@

#if ENABLE(WEB_AUDIO)

+#include "wtf/MathExtras.h"

namespace blink {

const int HRTFDatabase::MinElevation = -45;

@@ -106,8 +108,7 @@ void HRTFDatabase::getKernelsFromAzimuthElevation(double azimuthBlend, unsigned

unsigned HRTFDatabase::indexFromElevationAngle(double elevationAngle)

{

// Clamp to allowed range.

- elevationAngle = std::max(static_cast<double>(MinElevation), elevationAngle);

- elevationAngle = std::min(static_cast<double>(MaxElevation), elevationAngle);

+ elevationAngle = clampTo<double, double>(elevationAngle, MinElevation, MaxElevation);

unsigned elevationIndex = static_cast<int>(InterpolationFactor * (elevationAngle - MinElevation) / RawElevationAngleSpacing);

return elevationIndex;