[Audio] IntelliGainComp

This commit is contained in:
maikirakiwi 2022-04-03 14:18:36 -07:00
parent 5432158108
commit a81aeb4da9
3 changed files with 493 additions and 457 deletions

View file

@ -10,6 +10,7 @@ const CiderAudio = {
llpw: null, llpw: null,
analogWarmth: null, analogWarmth: null,
recorderNode: null, recorderNode: null,
intelliGainComp: null,
}, },
ccON: false, ccON: false,
mediaRecorder: null, mediaRecorder: null,
@ -37,7 +38,9 @@ const CiderAudio = {
audioBands: null, audioBands: null,
vibrantbassNode: null, vibrantbassNode: null,
llpw: null, llpw: null,
analogWarmth: null analogWarmth: null,
recorderNode: null,
intelliGainComp: null,
} }
} catch (e) { } } catch (e) { }
CiderAudio.source.connect(CiderAudio.context.destination); CiderAudio.source.connect(CiderAudio.context.destination);
@ -51,7 +54,9 @@ const CiderAudio = {
CiderAudio.source = CiderAudio.context.createMediaElementSource(mediaElem); CiderAudio.source = CiderAudio.context.createMediaElementSource(mediaElem);
} else { try { CiderAudio.source.disconnect(CiderAudio.context.destination) } catch (e) { } } } else { try { CiderAudio.source.disconnect(CiderAudio.context.destination) } catch (e) { } }
CiderAudio.audioNodes.gainNode = CiderAudio.context.createGain() CiderAudio.audioNodes.gainNode = CiderAudio.context.createGain()
CiderAudio.source.connect(CiderAudio.audioNodes.gainNode); CiderAudio.audioNodes.intelliGainComp = CiderAudio.context.createGain();
CiderAudio.source.connect(CiderAudio.audioNodes.intelliGainComp);
CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.gainNode);
if (app.cfg.audio.normalization) { if (app.cfg.audio.normalization) {
CiderAudio.normalizerOn() CiderAudio.normalizerOn()
} }
@ -137,6 +142,48 @@ const CiderAudio = {
spatialOff: function () { spatialOff: function () {
CiderAudio.hierarchical_loading(); CiderAudio.hierarchical_loading();
}, },
intelliGainComp_h0_0: function () {
let filters = []; const precisionHz = 12;
if (CiderAudio.audioNodes.audioBands !== null) {filters = filters.concat(CiderAudio.audioNodes.audioBands)}
if (CiderAudio.audioNodes.vibrantbassNode !== null) {filters = filters.concat(CiderAudio.audioNodes.vibrantbassNode)}
if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw.length > 1) {filters = filters.concat(CiderAudio.audioNodes.llpw);}
if (!filters || filters.length === 0) {CiderAudio.audioNodes.intelliGainComp.gain.value = 1; return}
filters.shift();
let steps = Math.ceil(96000 / precisionHz);
// Generate input array for getFrequencyResponse method
let frequencies = new Float32Array(steps);
for (let i = 0; i < steps; i++) {
frequencies[i] = (i + 1) * precisionHz;
}
// Here we will store combined amplitude response
let totalAmplitudeResp = new Float32Array(steps);
for (let i = 0; i < steps; i++) {
totalAmplitudeResp[i] = 1;
}
// Temporary container for every filter response
let amplitudeResp = new Float32Array(steps), phaseResp = new Float32Array(steps);
for (let i = filters.length - 1; i >= 0; i--) {
let filter = filters[i];
// Get filter response and convolve it with existing response
filter.getFrequencyResponse(frequencies, amplitudeResp, phaseResp);
for (let j = 0; j < steps; j++) {
totalAmplitudeResp[j] *= amplitudeResp[j];
}
}
// Find max gain
let maxGain = -120;
for (let i = 0; i < steps; i++) {
let gain = totalAmplitudeResp[i];
if (gain > maxGain)
maxGain = gain;
}
if (maxGain == -120) {maxGain = 1}
if (CiderAudio.audioNodes.llpw !== null && CiderAudio.audioNodes.llpw[0].buffer !== null) {maxGain = maxGain * 0.9440608762859234}
if (app.cfg.audio.maikiwiAudio.spatial === true) {maxGain = maxGain * 0.5956621435290105}
maxGain = Math.pow(10, (-1 * (20 * Math.log10(maxGain))) / 20).toFixed(4);
maxGain > 1.0 ? CiderAudio.audioNodes.intelliGainComp.gain.value = 1 : CiderAudio.audioNodes.intelliGainComp.gain.value = maxGain;
console.debug(`[Cider][Audio] IntelliGainComp: ${maxGain > 1.0 ? 0 : (20 * Math.log10(maxGain)).toFixed(2)} dB (${maxGain > 1.0 ? 1 : maxGain})`);
},
sendAudio: function () { sendAudio: function () {
if (!CiderAudio.ccON) { if (!CiderAudio.ccON) {
CiderAudio.ccON = true CiderAudio.ccON = true
@ -146,6 +193,7 @@ const CiderAudio = {
// mimeType: 'audio/webm; codecs=opus' // mimeType: 'audio/webm; codecs=opus'
// }; // };
// var destnode = CiderAudio.context.createMediaStreamDestination(); // var destnode = CiderAudio.context.createMediaStreamDestination();
// CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.gainNode);
// CiderAudio.audioNodes.gainNode.connect(destnode) // CiderAudio.audioNodes.gainNode.connect(destnode)
// CiderAudio.mediaRecorder = new MediaRecorder(destnode.stream, options); // CiderAudio.mediaRecorder = new MediaRecorder(destnode.stream, options);
// CiderAudio.mediaRecorder.start(1); // CiderAudio.mediaRecorder.start(1);
@ -517,6 +565,7 @@ const CiderAudio = {
hierarchical_unloading: function () { hierarchical_unloading: function () {
try { CiderAudio.audioNodes.spatialNode.output.disconnect(); } catch (e) { } try { CiderAudio.audioNodes.spatialNode.output.disconnect(); } catch (e) { }
try { CiderAudio.audioNodes.spatialNode.disconnect(); } catch (e) { } try { CiderAudio.audioNodes.spatialNode.disconnect(); } catch (e) { }
try {CiderAudio.audioNodes.intelliGainComp.disconnect();} catch (e) { }
try { CiderAudio.audioNodes.gainNode.disconnect(); } catch (e) { } try { CiderAudio.audioNodes.gainNode.disconnect(); } catch (e) { }
try { for (var i of CiderAudio.audioNodes.analogWarmth) { i.disconnect(); } CiderAudio.audioNodes.analogWarmth = null } catch (e) { } try { for (var i of CiderAudio.audioNodes.analogWarmth) { i.disconnect(); } CiderAudio.audioNodes.analogWarmth = null } catch (e) { }
try { for (var i of CiderAudio.audioNodes.llpw) { i.disconnect(); } CiderAudio.audioNodes.llpw = null } catch (e) { } try { for (var i of CiderAudio.audioNodes.llpw) { i.disconnect(); } CiderAudio.audioNodes.llpw = null } catch (e) { }
@ -528,6 +577,7 @@ const CiderAudio = {
}, },
hierarchical_loading: function () { hierarchical_loading: function () {
CiderAudio.hierarchical_unloading(); CiderAudio.hierarchical_unloading();
CiderAudio.audioNodes.intelliGainComp.connect(CiderAudio.audioNodes.gainNode);
if (Math.max(...app.cfg.audio.equalizer.gain) != 0) { if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
CiderAudio.equalizer(true, 0); CiderAudio.equalizer(true, 0);
@ -903,6 +953,7 @@ const CiderAudio = {
} }
} }
} }
CiderAudio.intelliGainComp_h0_0();
console.debug("[Cider][Audio] Finished hierarchical loading"); console.debug("[Cider][Audio] Finished hierarchical loading");
}, },

View file

@ -773,8 +773,8 @@ const app = new Vue({
} }
numbers.shift() numbers.shift()
let peak = Math.max(numbers[6], numbers[7]) / 32768.0 let peak = Math.max(numbers[6], numbers[7]) / 32768.0
let gain = Math.pow(10, ((-7.63 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant let gain = Math.pow(10, ((-2 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant
console.debug(`[Cider][MaikiwiSoundCheck] Peak Gain: '${Math.log10(peak) * 20}' dB | Adjusting '${Math.log10(gain) * 20}' dB`) console.debug(`[Cider][MaikiwiSoundCheck] Peak Gain: '${(Math.log10(peak) * 20).toFixed(2)}' dB | Adjusting '${(Math.log10(gain) * 20).toFixed(2)}' dB`)
try { try {
//CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak))) //CiderAudio.audioNodes.gainNode.gain.value = (Math.min(Math.pow(10, (replaygain.gain / 20)), (1 / replaygain.peak)))
CiderAudio.audioNodes.gainNode.gain.value = gain CiderAudio.audioNodes.gainNode.gain.value = gain
@ -3857,23 +3857,6 @@ const app = new Vue({
element.onclick = app.LastFMDeauthorize; element.onclick = app.LastFMDeauthorize;
}); });
}, },
/**
parseSCTagToRG: function (tag) {
let soundcheck = tag.split(" ")
let numbers = []
for (item of soundcheck) {
numbers.push(parseInt(item, 16))
}
numbers.shift()
//let gain = Math.log10((Math.max(numbers[0], numbers[1]) ?? 1000) / 1000.0) * -10
let peak = Math.max(numbers[6], numbers[7]) / 32768.0
let gain = Math.pow(10, ((-7.63 - (Math.log10(peak) * 20)) / 20))// EBU R 128 Compliant
return {
gain: gain,
peak: peak
}
},*/
fullscreen(flag) { fullscreen(flag) {
if (flag) { if (flag) {
ipcRenderer.send('setFullScreen', true); ipcRenderer.send('setFullScreen', true);

View file

@ -298,7 +298,7 @@
try { try {
for (var i = 0; i < 21; i++) { for (var i = 0; i < 21; i++) {
CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.maikiwiAudio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10); CiderAudio.audioNodes.vibrantbassNode[i].gain.value = app.cfg.audio.maikiwiAudio.vibrantBass.gain[i] * (app.cfg.audio.equalizer.vibrantBass / 10);
}} CiderAudio.intelliGainComp_h0_0();}}
catch(e) { catch(e) {
CiderAudio.hierarchical_loading(); CiderAudio.hierarchical_loading();
} }
@ -314,12 +314,14 @@
for (var i = 0; i < 10; i++) { for (var i = 0; i < 10; i++) {
CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
} }
CiderAudio.intelliGainComp_h0_0();
} catch(e) {CiderAudio.hierarchical_loading(); } } catch(e) {CiderAudio.hierarchical_loading(); }
} }
}, },
changeGain(i) { changeGain(i) {
if (Math.max(...app.cfg.audio.equalizer.gain) != 0) { if (Math.max(...app.cfg.audio.equalizer.gain) != 0) {
try {CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix} try {CiderAudio.audioNodes.audioBands[i].gain.value = app.cfg.audio.equalizer.gain[i] * app.cfg.audio.equalizer.mix
CiderAudio.intelliGainComp_h0_0();}
catch(e){CiderAudio.hierarchical_loading();} catch(e){CiderAudio.hierarchical_loading();}
} }
else { else {