scratchfoundation/scratch-audio
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-audio.git synced 2024-12-22 14:02:29 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #115 from LLK/bugfix/catch-adpcm-decode-error

Browse source 
Catch ADPCM decode error, and use an empty sound
This commit is contained in:
Eric Rosenbaum 2019-01-14 15:52:57 -05:00 committed by GitHub
commit f8fa66403d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/AudioEngine.js
View file

@ -156,7 +156,7 @@ class AudioEngine {
.catch(() => {
// If the file is empty, create an empty sound
if (sound.data.length === 0) {
return Promise.resolve(this.audioContext.createBuffer(1, 1, this.audioContext.sampleRate));
return this._emptySound();
}
// The audio context failed to parse the sound data
@ -165,7 +165,8 @@ class AudioEngine {
// First we need to create another copy of our original data
const bufferCopy2 = sound.data.buffer.slice(0);
// Try decoding as adpcm
return new ADPCMSoundDecoder(this.audioContext).decode(bufferCopy2);
return new ADPCMSoundDecoder(this.audioContext).decode(bufferCopy2)
.catch(() => this._emptySound());
})
.then(
buffer => ([soundId, buffer]),
@ -177,6 +178,14 @@ class AudioEngine {
return decoding;
}
/**
* An empty sound buffer, for use when we are unable to decode a sound file.
* @returns {AudioBuffer} - an empty audio buffer.
*/
_emptySound () {
return this.audioContext.createBuffer(1, 1, this.audioContext.sampleRate);
}
/**
* Decode a sound, decompressing it into audio samples.
*