Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add HTML5 waveform parsing #39

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add HTML5 waveform parsing #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
215 changes: 198 additions & 17 deletions script/soundmanager2.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1454,6 +1454,22 @@ function SoundManager(smURL, smID) {

var s = this, resetProperties, add_html5_events, remove_html5_events, stop_html5_timer, start_html5_timer, attachOnPosition, onplay_called = false, onPositionItems = [], onPositionFired = 0, detachOnPosition, applyFromTo, lastURL = null, lastHTML5State, urlOmitted;

//HTML5 audio sampling properties
this._useAdvancedHTML5 = false;
this._useMoz = false;
this._fftLeft;
this._fftRight;
this._fftRightO; //For when we set right = left but want to preserve the original
this._waveformLeft;
this._waveformRight;
this._audioContext;
this._processingNode;
this._sourceNode;
this._fbLength;
this._sample_size;
this._sample_rate;


lastHTML5State = {
// tracks duration + position (time)
duration: null,
Expand Down Expand Up @@ -1726,6 +1742,10 @@ function SoundManager(smURL, smID) {
} else {

stop_html5_timer();

if(s._useAdvancedHTML5 && !s._useMoz){
this._destroy_WebAudio_Waveform_Parser();
}

if (s._a) {
s._a.pause();
Expand Down Expand Up @@ -2767,6 +2787,87 @@ function SoundManager(smURL, smID) {

resetProperties();

var audioProcessEvent = function ( e ) {
if(s.paused) return;
//When we're processing some data through the HTML WebAudio API
var buffers = [];
var channels, resolution;
channels = s._channels = e.inputBuffer.numberOfChannels;

s._waveformLeft = e.inputBuffer.getChannelData(0);
if(s.instanceOptions.useEQData){
s._fftLeft.forward(s._waveformLeft);
}

if(channels > 1){
s._waveformRight = e.inputBuffer.getChannelData(1);
if(s.instanceOptions.useEQData){
s._fftRight = s._fftRightO;
s._fftRight.forward(s._waveformRight);
}
} else {
s._waveformRight = s._waveformLeft;
s._fftRight = s._fftLeft;
}

s._onTimer(true);
};

this._create_WebAudio_Waveform_Parser = function(){
//Initialisation for Google Chrome/Web Audio compatible browsers

s._sample_rate = 44100;
s._sample_size = 2048;
if(s.instanceOptions.useWaveformData || s.instanceOptions.useEQData || s.instanceOptions.usePeakData){
var context = s._audioContext;

var source = s._sourceNode = context.createMediaElementSource( s._a );

var proc = s._processingNode = context.createJavaScriptNode( s._sample_size / 2, 1, 1 );

source.connect( proc );

proc.connect( context.destination );

source.connect( context.destination );

proc.onaudioprocess = audioProcessEvent;

s._fftLeft = new FFT( s._sample_size / 2, s._sample_rate );
s._fftRight = s._fftRightO = new FFT( s._sample_size / 2, s._sample_rate );
}

};

this._destroy_WebAudio_Waveform_Parser = function(){
if(s._sourceNode)
s._sourceNode.disconnect(0);

if(s._processingNode)
s._processingNode.disconnect(0);
};

this._create_Mozilla_Waveform_Parser = function(){
//Initialisation for Mozilla Firefox

s._fbLength = s._a.mozFrameBufferLength;
s._channels = s._a.mozChannels;
s._sample_rate = s._a.mozSampleRate;

if(s.instanceOptions.useWaveformData || s.instanceOptions.useEQData || s.instanceOptions.usePeakData){
s._waveformLeft = new Float32Array( s._fbLength / s._channels );
s._waveformRight = new Float32Array( s._fbLength / s._channels );
}

if(s.instanceOptions.useEQData || s.instanceOptions.usePeakData){
s._fftLeft = new FFT( s._fbLength / s._channels, s._sample_rate );
s._fftRight = s._fftLeft;
if(s._channels > 1){
s._fftRight = new FFT( s._fbLength / s._channels, s._sample_rate );
}
}
};

/**
* Pseudo-private SMSound internals
* --------------------------------
Expand All @@ -2781,6 +2882,10 @@ function SoundManager(smURL, smID) {
*/

var duration, isNew = false, time, x = {};
var peakData = x;
var waveformLeft = x;
var waveformRight = x;
var eqData = x;

if (s._hasTimer || bForce) {

Expand Down Expand Up @@ -2812,7 +2917,18 @@ function SoundManager(smURL, smID) {

if (isNew || bForce) {

s._whileplaying(time,x,x,x,x);
if(s._useAdvancedHTML5){
if(s.instanceOptions.useWaveformData){
waveformLeft = s._waveformLeft;
waveformRight = s._waveformRight;
}
if(s.instanceOptions.useEQData){
eqData = {leftEQ: s._fftLeft.spectrum,
rightEQ: s._fftRight.spectrum};
}
}

s._whileplaying(time, peakData, waveformLeft, waveformRight, eqData);

}

Expand Down Expand Up @@ -2946,7 +3062,7 @@ function SoundManager(smURL, smID) {
a = s._a;

a._called_load = false;

if (useGlobalHTML5Audio) {

globalHTML5Audio = a;
Expand All @@ -2956,6 +3072,21 @@ function SoundManager(smURL, smID) {
}

s.isHTML5 = true;

if(FFT && Float32Array){
//Use html5 for spectrum/waveform (dsp.js must be available)
if(window.AudioProcessingEvent && (window.AudioContext || window.webkitAudioContext)){
//Webkit and WebAudio API
s._useAdvancedHTML5 = true;
s._audioContext = new (window.AudioContext || window.webkitAudioContext)();
sm2._wD(s.id + ': Using HTML5 Audio for eqData and waveform');
} else if(a.mozSetup) {
//Mozilla Firefox
sm2._wD(s.id + ': Using Mozilla Audio for eqData and waveform');
s._useAdvancedHTML5 = true;
s._useMoz = true;
}
}

// store a ref on the track
s._a = a;
Expand Down Expand Up @@ -3212,7 +3343,7 @@ function SoundManager(smURL, smID) {
this._whileplaying = function(nPosition, oPeakData, oWaveformDataLeft, oWaveformDataRight, oEQData) {

var instanceOptions = s._iO,
eqLeft;
eqLeft, eqRight;

if (isNaN(nPosition) || nPosition === null) {
// flash safety net
Expand All @@ -3224,7 +3355,7 @@ function SoundManager(smURL, smID) {

s._processOnPosition();

if (!s.isHTML5 && fV > 8) {
if (!s.isHTML5 && fV > 8 || s._useAdvancedHTML5) {

if (instanceOptions.usePeakData && oPeakData !== _undefined && oPeakData) {
s.peakData = {
Expand All @@ -3234,21 +3365,41 @@ function SoundManager(smURL, smID) {
}

if (instanceOptions.useWaveformData && oWaveformDataLeft !== _undefined && oWaveformDataLeft) {
s.waveformData = {
left: oWaveformDataLeft.split(','),
right: oWaveformDataRight.split(',')
};
if(typeof(oWaveformDataLeft) == 'string'){
s.waveformData = {
left: oWaveformDataLeft.split(','),
right: oWaveformDataRight.split(',')
};
} else {
s.waveformData = {
left: oWaveformDataLeft,
right: oWaveformDataRight
};
}
}

if (instanceOptions.useEQData) {

if (oEQData !== _undefined && oEQData && oEQData.leftEQ) {
eqLeft = oEQData.leftEQ.split(',');
s.eqData = eqLeft;
s.eqData.left = eqLeft;
if (oEQData.rightEQ !== _undefined && oEQData.rightEQ) {
s.eqData.right = oEQData.rightEQ.split(',');
if(typeof(oEQData.leftEQ) == 'string'){
eqLeft = oEQData.leftEQ.split(',');
} else {
eqLeft = oEQData.leftEQ;
eqRight = eqLeft;
}
}

if (oEQData.rightEQ !== _undefined && oEQData.rightEQ) {
if(typeof(oEQData.rightEQ) == 'string'){
eqRight = oEQData.rightEQ.split(',');
} else {
eqRight = oEQData.rightEQ;
}
}

s.eqData = {};
s.eqData.left = eqLeft;
s.eqData.right= eqRight;
}

}
Expand Down Expand Up @@ -3687,10 +3838,9 @@ function SoundManager(smURL, smID) {
// wrap html5 event handlers so we don't call them on destroyed and/or unloaded sounds

return function(e) {

var s = this._s,
result;

if (!s || !s._a) {
// <d>
if (s && s.id) {
Expand Down Expand Up @@ -3722,7 +3872,7 @@ function SoundManager(smURL, smID) {

// enough has loaded to play

canplay: html5_event(function() {
canplay: html5_event(function(e) {

var s = this._s,
position1K;
Expand Down Expand Up @@ -3754,6 +3904,14 @@ function SoundManager(smURL, smID) {
s._iO._oncanplay();
}

if(s._useAdvancedHTML5){
if(s._useMoz){
s._create_Mozilla_Waveform_Parser();
} else {
s._create_WebAudio_Waveform_Parser();
}
}

}),

canplaythrough: html5_event(function() {
Expand Down Expand Up @@ -3938,6 +4096,8 @@ function SoundManager(smURL, smID) {

timeupdate: html5_event(function() {

var s = this._s;
if(s._useAdvancedHTML5) return;
this._s._onTimer();

}),
Expand All @@ -3952,6 +4112,27 @@ function SoundManager(smURL, smID) {
// playback faster than download rate, etc.
s._onbufferchange(1);

}),

// only for firefox
MozAudioAvailable: html5_event(function(e) {
var s = this._s;
if(!s._useAdvancedHTML5 || !s._useMoz) return;
if(s._channels < 2){
s._waveformLeft = e.frameBuffer;
s._waveformRight = e.frameBuffer;
} else {
var per_channel = s._fbLength / s._channels;
for ( var i = 0; i < per_channel; i++ ) {
s._waveformLeft[i] = e.frameBuffer[i * s._channels];
s._waveformRight[i] = e.frameBuffer[i * s._channels + 1];
}
}
s._fftLeft.forward( s._waveformLeft );
if(s._channels > 1){
s._fftRight.forward( s._waveformRight );
}
s._onTimer(true);
})

};
Expand Down Expand Up @@ -5938,4 +6119,4 @@ if (window.SM2_DEFER === undefined || !SM2_DEFER) {
window.SoundManager = SoundManager; // constructor
window.soundManager = soundManager; // public API, flash callbacks etc.

}(window));
}(window));