crabapples
/
noVNC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linting and syntax errors ; will squash these commits before an actual PR

This commit is contained in:
tinyzimmer 2020-08-27 18:15:03 +03:00
parent 5a4e8d216e
commit c2b6e8e13d
2 changed files with 25 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/rfb.js
View File

@ -501,12 +501,12 @@ export default class RFB extends EventTargetMixin {
} }
enableAudio(sampleFormat, channels, frequency) { enableAudio(sampleFormat, channels, frequency) {
RFB.messages.SetQEMUExtendedAudioFormat(this._sock, sampleFormat, channels, frequency) RFB.messages.SetQEMUExtendedAudioFormat(this._sock, sampleFormat, channels, frequency);
RFB.messages.ToggleQEMUExtendedAudio(this._sock, true) RFB.messages.ToggleQEMUExtendedAudio(this._sock, true);
} }
disableAudio() { disableAudio() {
RFB.messages.ToggleQEMUExtendedAudio(this._sock, false) RFB.messages.ToggleQEMUExtendedAudio(this._sock, false);
} }
// ===== PRIVATE METHODS ===== // ===== PRIVATE METHODS =====
@ -2056,13 +2056,13 @@ export default class RFB extends EventTargetMixin {
const operation = this._sock.rQshift16(); const operation = this._sock.rQshift16();
if (operation === 1) { // stream is starting if (operation === 1) { // stream is starting
this._audioBuffer = new AudioBuffer('audio/webm; codecs="opus"') // TODO: This is obviously not the right value to use here this._audioBuffer = new AudioBuffer('audio/webm; codecs="opus"'); // TODO: This is obviously not the right value to use here
} else if (operation === 0) { // stream is stopping } else if (operation === 0) { // stream is stopping
this._audioBuffer.close() this._audioBuffer.close();
} else { // stream data } else { // stream data
const length = this._sock.rQshift32(); const length = this._sock.rQshift32();
const data = this._sock.rQshiftBytes(length); const data = this._sock.rQshiftBytes(length);
this._audioBuffer.queueAudio(data) this._audioBuffer.queueAudio(data);
} }
return true; return true;
@ -2589,7 +2589,7 @@ RFB.sampleFormats = {
S16: 3, S16: 3,
U32: 4, U32: 4,
S32: 5 S32: 5
} };
// Class Methods // Class Methods
RFB.messages = { RFB.messages = {
@ -2651,7 +2651,7 @@ RFB.messages = {
buff[offset + 9] = freq; buff[offset + 9] = freq;
sock._sQlen += 10; sock._sQlen += 10;
sock.flush() sock.flush();
}, },
QEMUExtendedKeyEvent(sock, keysym, down, keycode) { QEMUExtendedKeyEvent(sock, keysym, down, keycode) {

28
core/util/audio.js
View File

@ -15,26 +15,30 @@ export default class AudioBuffer {
// create a hidden audio element // create a hidden audio element
this._audio = document.createElement('audio'); this._audio = document.createElement('audio');
this._audio.src = window.URL.createObjectURL(mediaSource); this._audio.src = window.URL.createObjectURL(this._mediaSource);
// when data is queued, start playing // when data is queued, start playing
this._mediaSource.addEventListener('sourceopen', function(e) { this._mediaSource.addEventListener('sourceopen', this._onSourceOpen, false);
this._audio.play(); }
this._audioBuffer = mediaSource.addSourceBuffer(codec)
this._audioBuffer.addEventListener('update', function() { _onSourceOpen(e) {
if (this._audioQ.length > 0 && !this._audioBuffer.updating) { this._audio.play();
this._audioBuffer.appendBuffer(this._audioQ.shift()) this._audioBuffer = this._mediaSource.addSourceBuffer(codec);
} this._audioBuffer.addEventListener('update', this._onUpdateBuffer);
}) }
}, false)
_onUpdateBuffer() {
if (this._audioQ.length > 0 && !this._audioBuffer.updating) {
this._audioBuffer.appendBuffer(this._audioQ.shift());
}
} }
queueAudio(data) { queueAudio(data) {
if (this._audioBuffer !== null) { if (this._audioBuffer !== null) {
if (this._audioBuffer.updating || this._audioQ.length > 0) { if (this._audioBuffer.updating || this._audioQ.length > 0) {
this._audioQ.push(data) this._audioQ.push(data);
} else { } else {
this._audioBuffer.appendBuffer(data) this._audioBuffer.appendBuffer(data);
} }
} }
} }