Mirrors/webamp
1
0
Fork 0
mirror of https://github.com/captbaritone/webamp.git synced 2026-07-23 10:07:35 +00:00
Code Issues Projects Releases Wiki Activity

Fix bug where we were continually destroying analysers that had already been destroyed

Browse source
This commit is contained in:
Jordan Eldredge 2018-04-10 20:24:42 -07:00
parent 00eafd6b47
commit d2bfe64a44
1 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

25
js/media/detectChannels.js
View file

@ -25,20 +25,28 @@ function createAnalysers(source) {
return { left: leftAnalyser, right: rightAnalyser, destroy };
}
const MAX_CALLS = 1000;
const POLL_INTERVAL = 20;
const MAX_CALLS = 100;
export default async function detectChannels(source) {
return new Promise((resolve, reject) => {
const { left, right, destroy } = createAnalysers(source);
const analysers = createAnalysers(source);
const dataArray = new Uint8Array(left.frequencyBinCount);
const dataArray = new Uint8Array(analysers.left.frequencyBinCount);
let maxLeft = 0;
let maxRight = 0;
let calls = 0;
const unsubscribe = () => {
// eslint-disable-next-line no-use-before-define
clearInterval(intervalHandle);
analysers.destroy();
};
const intervalHandle = setInterval(() => {
left.getByteFrequencyData(dataArray);
analysers.left.getByteFrequencyData(dataArray);
maxLeft = Math.max(maxLeft, max(dataArray));
right.getByteFrequencyData(dataArray);
analysers.right.getByteFrequencyData(dataArray);
maxRight = Math.max(maxRight, max(dataArray));
if (maxLeft > 0) {
@ -47,16 +55,15 @@ export default async function detectChannels(source) {
} else {
resolve(1);
}
destroy();
clearInterval(intervalHandle);
unsubscribe();
}
if (calls >= MAX_CALLS) {
reject();
destroy();
unsubscribe();
}
calls++;
}, 20);
}, POLL_INTERVAL);
});
}