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 microphone support, using new WebKit Audio API. #37

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Add microphone support, using new WebKit Audio API. #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4f90ac0
Add microphone support, using new WebKit Audio API.
endel Dec 9, 2012
9f53976
Remove deprecated/testing code.
endel Dec 9, 2012
18035b8
Lint free.
endel Jan 3, 2013
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
11 changes: 7 additions & 4 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,16 +28,19 @@ Dancer Instance Methods
// Using an audio object
var a = new Audio();
a.src = 'somesong.mp3';
dancer.load( a );
dancer.load({ audio: a });

// Using an audio element on the page
dancer.load( document.getElementsByTagName('audio')[0] );
dancer.load({ audio: document.getElementsByTagName('audio')[0] });

// Using a config object and you only have one encoding
dancer.load({ src: 'somesong.mp3' });

// Using a config object, and you have an ogg and mp3 version
dancer.load({ src: 'somesong', codecs: [ 'ogg', 'mp3' ]});

// Using microphone input (webkit only)
dancer.load({ microphone: true });
```

### Controls
Expand All @@ -54,7 +57,7 @@ All controls return `this`. If provided an audio element as the source, one can
* `getTime()` returns the current time.
* `getProgress()` returns the downloading progress as a float from 0 to 1.
* `getWaveform()` returns the waveform data array (Float32Array(1024))
* `getSpectrum()` returns the frequency data array (Float32Array(512)).
* `getSpectrum()` returns the frequency data array (Float32Array(512)).
* `getFrequency( freq [, endFreq ] )` returns the magnitude of a frequency or average over a range of frequencies.
* `isLoaded()` returns a boolean value for the dancer instance's song load state.
* `isPlaying()` returns a boolean value indicating whether the dancer instance's song is currently playing or not.
Expand Down Expand Up @@ -176,7 +179,7 @@ Dependencies
Extending/Plugins
---

You can extend the Dancer prototype by calling the static method `addPlugin( name, fn )`, which extends the Dancer prototype. A Dancer instance then can call the function provided in its context and subscribe to a preexisting event like `update`, or make your own. Look in the `plugins/` directory for examples.
You can extend the Dancer prototype by calling the static method `addPlugin( name, fn )`, which extends the Dancer prototype. A Dancer instance then can call the function provided in its context and subscribe to a preexisting event like `update`, or make your own. Look in the `plugins/` directory for examples.

Development
---
Expand Down
82 changes: 53 additions & 29 deletions dancer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,24 +20,36 @@
var path;

// Loading an Audio element
if ( source instanceof HTMLElement ) {
this.source = source;
if (source.audio) {
this.source = source.audio;
if ( Dancer.isSupported() === 'flash' ) {
this.source = { src: Dancer._getMP3SrcFromAudio( source ) };
this.source = { src: Dancer._getMP3SrcFromAudio( source.audio ) };
}

this.loadAudioAdapter(this.source);

// Loading an object with src, [codecs]
} else {
this.source = window.Audio ? new Audio() : {};
this.source.src = Dancer._makeSupportedPath( source.src, source.codecs );
} else if (source.src) {
this.source = window.Audio ? new Audio() : {};
this.source.src = Dancer._makeSupportedPath( source.src, source.codecs );
this.loadAudioAdapter(this.source);

// Request user audio
} else if (source.microphone) {
navigator.getUserMedia({audio: true}, this._userMediaCallback, function(e) {
console.log("Unsupported.")
});
this.source = source;
}

this.audio = this.audioAdapter.load( this.source );
return this;
},

/* Controls */
loadAudioAdapter: function(source) {
this.audio = this.audioAdapter.load( source );
},

/* Controls */
play : function () {
this.audioAdapter.play();
return this;
Expand Down Expand Up @@ -195,7 +207,11 @@
window.Dancer = Dancer;
})();


(function ( Dancer ) {
// Avoid browser-specific prefixes.
window.AudioContext = window.AudioContext || window.webkitAudioContext;
navigator.getUserMedia = navigator.getUserMedia || navigator.webkitGetUserMedia;

var CODECS = {
'mp3' : 'audio/mpeg;',
Expand All @@ -206,7 +222,6 @@
audioEl = document.createElement( 'audio' );

Dancer.options = {};

Dancer.setOptions = function ( o ) {
for ( var option in o ) {
if ( o.hasOwnProperty( option ) ) {
Expand Down Expand Up @@ -256,6 +271,7 @@
};

Dancer._getAdapter = function ( instance ) {
Dancer.instance = instance;
switch ( Dancer.isSupported() ) {
case 'webaudio':
return new Dancer.adapters.webkit( instance );
Expand All @@ -277,6 +293,13 @@
return null;
};

Dancer.prototype._userMediaCallback = function(stream) {
var context = Dancer.instance.audioAdapter.context;
input = context.createMediaStreamSource(stream);
input.connect(context.destination);
Dancer.instance.loadAudioAdapter(input);
}

// Browser detection is lame, but Safari 6 has Web Audio API,
// but does not support processing audio from a Media Element Source
// https://gist.github.com/3265344
Expand All @@ -290,6 +313,7 @@

})( window.Dancer );


(function ( undefined ) {
var Kick = function ( dancer, o ) {
o = o || {};
Expand All @@ -309,7 +333,7 @@
};

Kick.prototype = {
on : function () {
on : function () {
this.isOn = true;
return this;
},
Expand Down Expand Up @@ -732,9 +756,9 @@

})();

/*
/*
* DSP.js - a comprehensive digital signal processing library for javascript
*
*
* Created by Corban Brook <corbanbrook@gmail.com> on 2010-01-01.
* Copyright 2010 Corban Brook. All rights reserved.
*
Expand Down Expand Up @@ -770,7 +794,7 @@ function FourierTransform(bufferSize, sampleRate) {
imag = this.imag,
bSi = 2 / this.bufferSize,
sqrt = Math.sqrt,
rval,
rval,
ival,
mag;

Expand Down Expand Up @@ -800,7 +824,7 @@ function FourierTransform(bufferSize, sampleRate) {
*/
function FFT(bufferSize, sampleRate) {
FourierTransform.call(this, bufferSize, sampleRate);

this.reverseTable = new Uint32Array(bufferSize);

var limit = 1;
Expand Down Expand Up @@ -870,7 +894,7 @@ FFT.prototype.forward = function(buffer) {
//phaseShiftStepImag = Math.sin(-Math.PI/halfSize);
phaseShiftStepReal = cosTable[halfSize];
phaseShiftStepImag = sinTable[halfSize];

currentPhaseShiftReal = 1;
currentPhaseShiftImag = 0;

Expand Down Expand Up @@ -941,7 +965,7 @@ var FlashDetect = new function(){
];
/**
* Extract the ActiveX version of the plugin.
*
*
* @param {Object} The flash ActiveX object.
* @type String
*/
Expand All @@ -954,7 +978,7 @@ var FlashDetect = new function(){
};
/**
* Try and retrieve an ActiveX object having a specified name.
*
*
* @param {String} name The ActiveX object name lookup.
* @return One of ActiveX object or a simple object having an attribute of activeXError with a value of true.
* @type Object
Expand All @@ -970,8 +994,8 @@ var FlashDetect = new function(){
};
/**
* Parse an ActiveX $version string into an object.
*
* @param {String} str The ActiveX Object GetVariable($version) return value.
*
* @param {String} str The ActiveX Object GetVariable($version) return value.
* @return An object having raw, major, minor, revision and revisionStr attributes.
* @type Object
*/
Expand All @@ -987,7 +1011,7 @@ var FlashDetect = new function(){
};
/**
* Parse a standard enabledPlugin.description into an object.
*
*
* @param {String} str The enabledPlugin.description value.
* @return An object having raw, major, minor, revision and revisionStr attributes.
* @type Object
Expand All @@ -999,14 +1023,14 @@ var FlashDetect = new function(){
return {
"raw":str,
"major":parseInt(majorMinor[0], 10),
"minor":parseInt(majorMinor[1], 10),
"minor":parseInt(majorMinor[1], 10),
"revisionStr":revisionStr,
"revision":parseRevisionStrToInt(revisionStr)
};
};
/**
* Parse the plugin revision string into an integer.
*
*
* @param {String} The revision in string format.
* @type Number
*/
Expand All @@ -1015,7 +1039,7 @@ var FlashDetect = new function(){
};
/**
* Is the major version greater than or equal to a specified version.
*
*
* @param {Number} version The minimum required major version.
* @type Boolean
*/
Expand All @@ -1024,7 +1048,7 @@ var FlashDetect = new function(){
};
/**
* Is the minor version greater than or equal to a specified version.
*
*
* @param {Number} version The minimum required minor version.
* @type Boolean
*/
Expand All @@ -1033,7 +1057,7 @@ var FlashDetect = new function(){
};
/**
* Is the revision version greater than or equal to a specified version.
*
*
* @param {Number} version The minimum required revision version.
* @type Boolean
*/
Expand All @@ -1042,7 +1066,7 @@ var FlashDetect = new function(){
};
/**
* Is the version greater than or equal to a specified major, minor and revision.
*
*
* @param {Number} major The minimum required major version.
* @param {Number} (Optional) minor The minimum required minor version.
* @param {Number} (Optional) revision The minimum required revision version.
Expand Down Expand Up @@ -1075,7 +1099,7 @@ var FlashDetect = new function(){
var versionObj = parseStandardVersion(version);
self.raw = versionObj.raw;
self.major = versionObj.major;
self.minor = versionObj.minor;
self.minor = versionObj.minor;
self.revisionStr = versionObj.revisionStr;
self.revision = versionObj.revision;
self.installed = true;
Expand All @@ -1091,7 +1115,7 @@ var FlashDetect = new function(){
var versionObj = parseActiveXVersion(version);
self.raw = versionObj.raw;
self.major = versionObj.major;
self.minor = versionObj.minor;
self.minor = versionObj.minor;
self.revision = versionObj.revision;
self.revisionStr = versionObj.revisionStr;
}
Expand All @@ -1100,4 +1124,4 @@ var FlashDetect = new function(){
}
}();
};
FlashDetect.JS_RELEASE = "1.0.4";
FlashDetect.JS_RELEASE = "1.0.4";
2 changes: 1 addition & 1 deletion examples/audio_element/js/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
}).on();

dancer
.load( audio )
.load( {audio: audio} )
.waveform( waveform, { strokeStyle: '#666', strokeWidth: 2 });

Dancer.isSupported() || loaded();
Expand Down
Binary file added examples/fft-microphone/css/League_Gothic-webfont.eot
View file
Open in desktop
Binary file not shown.
Loading