joachim/openwebrx-clone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

simplify

Browse Source
This commit is contained in:
Jakob Ketterl 2020-08-08 21:35:15 +02:00
parent 448e266097
commit 5a938b8c0b
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
htdocs/lib/AudioEngine.js
View File

@ -216,7 +216,7 @@ AudioEngine.prototype.getSampleRate = function() {
return this.audioContext.sampleRate; return this.audioContext.sampleRate;
}; };
AudioEngine.prototype.pushAudio = function(data) { AudioEngine.prototype.processAudio = function(data, resampler) {
if (!this.audioNode) return; if (!this.audioNode) return;
this.audioBytes.add(data.byteLength); this.audioBytes.add(data.byteLength);
var buffer; var buffer;
@ -226,7 +226,7 @@ AudioEngine.prototype.pushAudio = function(data) {
} else { } else {
buffer = new Int16Array(data); buffer = new Int16Array(data);
} }
buffer = this.resampler.process(buffer); buffer = resampler.process(buffer);
if (this.audioNode.port) { if (this.audioNode.port) {
// AudioWorklets supported // AudioWorklets supported
this.audioNode.port.postMessage(buffer); this.audioNode.port.postMessage(buffer);
@ -236,28 +236,14 @@ AudioEngine.prototype.pushAudio = function(data) {
this.audioBuffers.push(buffer); this.audioBuffers.push(buffer);
} }
} }
}
AudioEngine.prototype.pushAudio = function(data) {
this.processAudio(data, this.resampler);
}; };
AudioEngine.prototype.pushHdAudio = function(data) { AudioEngine.prototype.pushHdAudio = function(data) {
if (!this.audioNode) return; this.processAudio(data, this.hdResampler);
this.audioBytes.add(data.byteLength);
var buffer;
if (this.compression === "adpcm") {
//resampling & ADPCM
buffer = this.audioCodec.decode(new Uint8Array(data));
} else {
buffer = new Int16Array(data);
}
buffer = this.hdResampler.process(buffer);
if (this.audioNode.port) {
// AudioWorklets supported
this.audioNode.port.postMessage(buffer);
} else {
// silently drop excess samples
if (this.getBuffersize() + buffer.length <= this.maxBufferSize) {
this.audioBuffers.push(buffer);
}
}
} }
AudioEngine.prototype.setCompression = function(compression) { AudioEngine.prototype.setCompression = function(compression) {