mozilla
/
pluotsorbet
зеркало из https://github.com/mozilla/pluotsorbet.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Implement audio capture api

This commit is contained in:
Pin Zhang 2014-11-19 10:55:19 +08:00
Родитель 3fc1edf5ed
Коммит 137be70042
3 изменённых файлов: 339 добавлений и 2 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

95
index.js
Просмотреть файл

@ -264,3 +264,98 @@ DumbPipe.registerOpener("socket", function(message, sender) {
}
};
});
DumbPipe.registerOpener("audiorecorder", function(message, sender) {
var mediaRecorder = null;
function startRecording(localStream) {
mediaRecorder = new MediaRecorder(localStream, {
mimeType: message.mimeType // 'audio/3gpp' // need to be certified app.
});
mediaRecorder.ondataavailable = function(e) {
if (e.data.size == 0) {
return;
}
var fileReader = new FileReader();
fileReader.onload = function() {
// Turn the buffer into a regular Array to traverse the mozbrowser boundary.
var array = Array.prototype.slice.call(new Uint8Array(fileReader.result));
array.constructor = Array;
sender({ type: "data", data: array });
};
fileReader.readAsArrayBuffer(e.data);
};
mediaRecorder.onstop = function(e) {
// Do nothing here, just relay the event.
//
// We can't close the pipe here, one reason is |onstop| is fired before |ondataavailable|,
// if close pipe here, there is no chance to deliever the recorded voice. Another reason is
// the recording might be stopped and started back and forth. So let's do the pipe
// closing on the other side instead, i.e. DirectRecord::nClose.
sender({ type: "stop" });
};
mediaRecorder.onerror = function(e) {
sender({ type: "error" });
};
mediaRecorder.onpause = function(e) {
sender({ type: "pause" });
};
mediaRecorder.onstart = function(e) {
sender({ type: "start" });
};
}
navigator.mozGetUserMedia({
audio: true
}, function(localStream) {
sender({ type: "start" });
startRecording(localStream);
}, function(e) {
sender({ type: "error", error: e });
});
return function(message) {
switch(message.type) {
case "start":
try {
if (mediaRecorder.state == "paused") {
mediaRecorder.resume();
} else {
mediaRecorder.start();
}
} catch (e) {
sender({ type: "error", error: e });
}
break;
case "requestData":
try {
// An InvalidState error might be thrown.
mediaRecorder.requestData();
} catch (e) {
sender({ type: "error", error: e });
}
break;
case "pause":
try {
mediaRecorder.pause();
} catch (e) {
sender({ type: "error", error: e });
}
break;
case "stop":
try {
mediaRecorder.stop();
} catch (e) {
sender({ type: "error", error: e });
}
break;
}
};
});

234
midp/media.js
Просмотреть файл

@ -10,6 +10,7 @@ Media.ContentTypes = {
],
file: [
"audio/ogg",
"audio/x-wav",
"audio/mpeg",
"image/jpeg",
@ -68,6 +69,7 @@ Media.extToFormat = new Map([
]);
Media.contentTypeToFormat = new Map([
["audio/ogg", "ogg"],
["audio/amr", "amr"],
["audio/x-wav", "wav"],
["audio/mpeg", "MPEG_layer_3"],
@ -75,7 +77,7 @@ Media.contentTypeToFormat = new Map([
["image/png", "PNG"],
]);
Media.supportedAudioFormats = ["MPEG_layer_3", "wav", "amr"];
Media.supportedAudioFormats = ["MPEG_layer_3", "wav", "amr", "ogg"];
Media.supportedImageFormats = ["JPEG", "PNG"];
Native.create("com/sun/mmedia/DefaultConfiguration.nListContentTypesOpen.(Ljava/lang/String;)I", function(jProtocol) {
@ -406,7 +408,25 @@ function PlayerContainer(url) {
// default buffer size 1 MB
PlayerContainer.DEFAULT_BUFFER_SIZE = 1024 * 1024;
PlayerContainer.prototype.isAudioCapture = function() {
return !!(this.url && this.url.startsWith("capture://audio"));
};
PlayerContainer.prototype.guessFormatFromURL = function() {
if (this.isAudioCapture()) {
var encoding = "audio/ogg"; // Same as system property |audio.encodings|
var idx = this.url.indexOf("encoding=");
if (idx > 0) {
var encodingKeyPair = this.url.substring(idx).split("&")[0].split("=");
encoding = encodingKeyPair.length == 2 ? encodingKeyPair[1] : encoding;
}
var format = Media.contentTypeToFormat.get(encoding);
return format || "UNKNOWN";
}
return Media.extToFormat.get(this.url.substr(this.url.lastIndexOf(".") + 1)) || "UNKNOWN";
}
@ -424,6 +444,9 @@ PlayerContainer.prototype.realize = function(contentType) {
if (Media.supportedAudioFormats.indexOf(this.mediaFormat) !== -1) {
this.player = new AudioPlayer(this);
if (this.isAudioCapture()) {
this.audioRecorder = new AudioRecorder();
}
this.player.realize().then(resolve);
} else if (Media.supportedImageFormats.indexOf(this.mediaFormat) !== -1) {
this.player = new ImagePlayer(this);
@ -476,6 +499,11 @@ PlayerContainer.prototype.getMediaFormat = function() {
return "mid";
}
// https://wiki.xiph.org/Ogg#Detecting_Ogg_files_and_extracting_information
if (headerString.indexOf("OggS") === 0) {
return "ogg";
}
return this.mediaFormat;
};
@ -553,6 +581,155 @@ PlayerContainer.prototype.setVisible = function(visible) {
this.player.setVisible(visible);
}
PlayerContainer.prototype.getRecordedSize = function() {
return this.audioRecorder.data.byteLength;
};
PlayerContainer.prototype.getRecordedData = function(offset, size, buffer) {
var toRead = (size < this.audioRecorder.data.length) ? size : this.audioRecorder.data.byteLength;
buffer.set(this.audioRecorder.data.subarray(0, toRead), offset);
this.audioRecorder.data = new Uint8Array(this.audioRecorder.data.buffer.slice(toRead));
};
var AudioRecorder = function(aMimeType) {
this.mimeType = aMimeType || "audio/ogg";
this.eventListeners = {};
this.data = new Uint8Array();
this.sender = DumbPipe.open("audiorecorder", {
mimeType: this.mimeType
}, this.recipient.bind(this));
};
AudioRecorder.prototype.recipient = function(message) {
var callback = this["on" + message.type];
if (typeof callback === "function") {
callback(message);
}
if (this.eventListeners[message.type]) {
this.eventListeners[message.type].forEach(function(listener) {
if (typeof listener === "function") {
listener(message);
}
});
}
};
AudioRecorder.prototype.addEventListener = function(name, callback) {
if (!callback || !name) {
return;
}
if (!this.eventListeners[name]) {
this.eventListeners[name] = [];
}
this.eventListeners[name].push(callback);
};
AudioRecorder.prototype.removeEventListener = function(name, callback) {
if (!name || !callback || !this.eventListeners[name]) {
return;
}
var newArray = [];
this.eventListeners[name].forEach(function(listener) {
if (callback != listener) {
newArray.push(listener);
}
});
this.eventListeners[name] = newArray;
};
AudioRecorder.prototype.start = function() {
return new Promise(function(resolve, reject) {
this.onstart = function() {
this.onstart = null;
resolve(1);
}.bind(this);
this.onerror = function() {
this.onerror = null;
resolve(0);
}.bind(this);
this.sender({ type: "start" });
}.bind(this));
};
AudioRecorder.prototype.stop = function() {
return new Promise(function(resolve, reject) {
// To make sure the Player in Java can fetch data immediately, we
// need to return after data is back.
this.ondata = function ondata(message) {
_cleanEventListeners();
// The audio data we received are encoded with a proper format, it doesn't
// make sense to concatenate them like the socket, so let just override
// the buffered data here.
this.data = new Uint8Array(message.data.length);
this.data.set(message.data);
resolve(1);
}.bind(this);
var _onerror = function() {
_cleanEventListeners();
resolve(0);
}.bind(this);
var _cleanEventListeners = function() {
this.ondata = null;
this.removeEventListener("error", _onerror);
}.bind(this);
this.addEventListener("error", _onerror);
this.sender({ type: "stop" });
}.bind(this));
};
AudioRecorder.prototype.pause = function() {
return new Promise(function(resolve, reject) {
// In Java, |stopRecord| might be called before |commit|, which triggers
// the calling sequence:
// nPause -> nGetRecordedSize -> nGetRecordedData -> nClose
//
// to make sure the Player in Java can fetch data in such a case, we
// need to request data immediately.
//
this.ondata = function ondata(message) {
this.ondata = null;
// The audio data we received are encoded with a proper format, it doesn't
// make sense to concatenate them like the socket, so let just override
// the buffered data here.
this.data = new Uint8Array(message.data.length);
this.data.set(message.data);
resolve(1);
}.bind(this);
// Have to request data first before pausing.
this.requestData();
this.sender({ type: "pause" });
}.bind(this));
};
AudioRecorder.prototype.requestData = function() {
this.sender({ type: "requestData" });
};
AudioRecorder.prototype.close = function() {
if (this._closed) {
return new Promise(function(resolve) { resolve(1); });
}
// Make sure recording is stopped on the other side.
return this.stop().then(function() {
DumbPipe.close(this.sender);
this._closed = true;
}.bind(this));
};
Native.create("com/sun/mmedia/PlayerImpl.nInit.(IILjava/lang/String;)I", function(appId, pId, jURI) {
var url = util.fromJavaString(jURI);
var id = pId + (appId << 32);
@ -593,7 +770,6 @@ Native.create("com/sun/mmedia/PlayerImpl.nRealize.(ILjava/lang/String;)Z", funct
return player.realize(mime);
}, true);
Native.create("com/sun/mmedia/MediaDownload.nGetJavaBufferSize.(I)I", function(handle) {
var player = Media.PlayerCache[handle];
return player.getBufferSize();
@ -746,6 +922,60 @@ Native.create("com/sun/mmedia/DirectPlayer.nSetVisible.(IZ)Z", function(handle,
return true;
});
Native.create("com/sun/mmedia/DirectPlayer.nIsRecordControlSupported.(I)Z", function(handle) {
return !!(Media.PlayerCache[handle] && Media.PlayerCache[handle].audioRecorder);
});
Native.create("com/sun/mmedia/DirectRecord.nSetLocator.(ILjava/lang/String;)I", function(handle, locator) {
console.warn("com/sun/mmedia/DirectRecord.nSetLocator.(I)I not implemented.");
return -1;
});
Native.create("com/sun/mmedia/DirectRecord.nGetRecordedSize.(I)I", function(handle) {
return Media.PlayerCache[handle].getRecordedSize();
});
Native.create("com/sun/mmedia/DirectRecord.nGetRecordedData.(III[B)I", function(handle, offset, size, buffer) {
Media.PlayerCache[handle].getRecordedData(offset, size, buffer);
return 1;
});
Native.create("com/sun/mmedia/DirectRecord.nCommit.(I)I", function(handle) {
// In DirectRecord.java, before nCommit, nPause or nStop is called,
// which means all the recorded data has been fetched, so do nothing here.
return 1;
});
Native.create("com/sun/mmedia/DirectRecord.nPause.(I)I", function(handle) {
return Media.PlayerCache[handle].audioRecorder.pause();
}, true);
Native.create("com/sun/mmedia/DirectRecord.nStop.(I)I", function(handle) {
return Media.PlayerCache[handle].audioRecorder.stop();
}, true);
Native.create("com/sun/mmedia/DirectRecord.nClose.(I)I", function(handle) {
var player = Media.PlayerCache[handle];
if (!player || !player.audioRecorder) {
// We need to check if |audioRecorder| is still available, because |nClose|
// might be called twice in DirectRecord.java, and only IOException is
// handled in DirectRecord.java, let use IOException instead of IllegalStateException.
throw new JavaException("java/io/IOException");
}
return player.audioRecorder.close().then(function(result) {
delete player.audioRecorder;
return result;
});
}, true);
Native.create("com/sun/mmedia/DirectRecord.nStart.(I)I", function(handle) {
// In DirectRecord.java, nStart plays two roles: real start and resume.
// Let's handle this on the other side of the DumbPipe.
return Media.PlayerCache[handle].audioRecorder.start();
}, true);
/**
* @return the volume level between 0 and 100 if succeeded. Otherwise -1.
*/

12
native.js
Просмотреть файл

@ -76,6 +76,9 @@ Native.create("java/lang/System.getProperty0.(Ljava/lang/String;)Ljava/lang/Stri
case "microedition.amms.version":
value = "1.1";
break;
case "microedition.media.version":
value = '1.2';
break;
case "mmapi-configuration":
value = null;
break;
@ -170,6 +173,15 @@ Native.create("java/lang/System.getProperty0.(Ljava/lang/String;)Ljava/lang/Stri
case "classpathext":
value = null;
break;
case "supports.audio.capture":
value = "true";
break;
case "supports.recording":
value = "true";
break;
case "audio.encodings":
value = "audio/ogg";
break;
default:
console.warn("UNKNOWN PROPERTY (java/lang/System): " + util.fromJavaString(key));
value = null;