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

Unified Diff: third_party/WebKit/LayoutTests/webaudio/resources/panner-formulas.js

Issue 2859143004: Correctly clamp in distance formulas (Closed)
Patch Set: Address review comments. Created 3 years, 7 months 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/LayoutTests/webaudio/resources/panner-formulas.js
diff --git a/third_party/WebKit/LayoutTests/webaudio/resources/panner-formulas.js b/third_party/WebKit/LayoutTests/webaudio/resources/panner-formulas.js
index 688bbd10dc87be076f54b059e26a6789d1a16aff..ff28c97f29ef5e369c8fcc647ae2985720bb3db9 100644
--- a/third_party/WebKit/LayoutTests/webaudio/resources/panner-formulas.js
+++ b/third_party/WebKit/LayoutTests/webaudio/resources/panner-formulas.js
@@ -5,25 +5,30 @@
function linearDistance(panner, x, y, z) {
var distance = Math.sqrt(x * x + y * y + z * z);
- distance = Math.min(distance, panner.maxDistance);
- var rolloff = panner.rolloffFactor;
- var gain = (1 - rolloff * (distance - panner.refDistance) / (panner.maxDistance - panner.refDistance));
+ var dref = Math.min(panner.refDistance, panner.maxDistance);
+ var dmax = Math.max(panner.refDistance, panner.maxDistance);
+ distance = Math.max(Math.min(distance, dmax), dref);
+ var rolloff = Math.max(Math.min(panner.rolloffFactor, 1), 0);
+ if (dref === dmax)
+ return 1 - rolloff;
+
+ var gain = (1 - rolloff * (distance - dref) / (dmax - dref));
return gain;
}
function inverseDistance(panner, x, y, z) {
var distance = Math.sqrt(x * x + y * y + z * z);
- distance = Math.min(distance, panner.maxDistance);
+ distance = Math.max(distance, panner.refDistance);
var rolloff = panner.rolloffFactor;
- var gain = panner.refDistance / (panner.refDistance + rolloff * (distance - panner.refDistance));
+ var gain = panner.refDistance / (panner.refDistance + rolloff * (Math.max(distance, panner.refDistance) - panner.refDistance));
return gain;
}
function exponentialDistance(panner, x, y, z) {
var distance = Math.sqrt(x * x + y * y + z * z);
- distance = Math.min(distance, panner.maxDistance);
+ distance = Math.max(distance, panner.refDistance);
var rolloff = panner.rolloffFactor;
var gain = Math.pow(distance / panner.refDistance, -rolloff);

Powered by Google App Engine
This is Rietveld 408576698