Briq
/
multiparty-meeting
7
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Hark cleanup

auto_join_3.3
Håvar Aambø Fosstveit 2020-05-20 23:48:03 +02:00
parent 93cc50ace2
commit 425fd1a92b
1 changed files with 38 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
app/src/RoomClient.js
View File

@ -1033,30 +1033,33 @@ export default class RoomClient
disconnectLocalHark() disconnectLocalHark()
{ {
logger.debug('disconnectLocalHark() | Stopping harkStream.'); logger.debug('disconnectLocalHark()');
if (this._harkStream != null) if (this._harkStream != null)
{ {
this._harkStream.getAudioTracks()[0].stop(); let [ track ] = this._harkStream.getAudioTracks();
track.stop();
track = null;
this._harkStream = null; this._harkStream = null;
} }
if (this._hark != null) if (this._hark != null)
{
logger.debug('disconnectLocalHark() Stopping hark.');
this._hark.stop(); this._hark.stop();
}
} }
connectLocalHark(track) connectLocalHark(track)
{ {
logger.debug('connectLocalHark() | Track:%o', track); logger.debug('connectLocalHark() [track:"%o"]', track);
this._harkStream = new MediaStream(); this._harkStream = new MediaStream();
this._harkStream.addTrack(track.clone()); const newTrack = track.clone();
this._harkStream.getAudioTracks()[0].enabled = true;
if (!this._harkStream.getAudioTracks()[0]) this._harkStream.addTrack(newTrack);
throw new Error('getMicStream():something went wrong with hark');
newTrack.enabled = true;
this._hark = hark(this._harkStream, this._hark = hark(this._harkStream,
{ {
@ -1065,41 +1068,59 @@ export default class RoomClient
threshold : store.getState().settings.noiseThreshold, threshold : store.getState().settings.noiseThreshold,
history : 100 history : 100
}); });
this._hark.lastVolume = -100; this._hark.lastVolume = -100;
this._hark.on('volume_change', (volume) => this._hark.on('volume_change', (volume) =>
{ {
volume = Math.round(volume); volume = Math.round(volume);
if (this._micProducer && (volume !== Math.round(this._hark.lastVolume))) if (this._micProducer && (volume !== Math.round(this._hark.lastVolume)))
{ {
if (volume < this._hark.lastVolume) if (volume < this._hark.lastVolume)
{ {
volume = this._hark.lastVolume - Math.pow((volume - this._hark.lastVolume)/(100 + this._hark.lastVolume), 4)*2; volume =
this._hark.lastVolume -
Math.pow(
(volume - this._hark.lastVolume) /
(100 + this._hark.lastVolume)
, 4
) * 2;
} }
this._hark.lastVolume = volume; this._hark.lastVolume = volume;
store.dispatch(peerVolumeActions.setPeerVolume(this._peerId, volume)); store.dispatch(peerVolumeActions.setPeerVolume(this._peerId, volume));
} }
}); });
this._hark.on('speaking', () => this._hark.on('speaking', () =>
{ {
store.dispatch(meActions.setIsSpeaking(true)); store.dispatch(meActions.setIsSpeaking(true));
if ((store.getState().settings.voiceActivatedUnmute ||
if (
(store.getState().settings.voiceActivatedUnmute ||
store.getState().me.isAutoMuted) && store.getState().me.isAutoMuted) &&
this._micProducer && this._micProducer &&
this._micProducer.paused) this._micProducer.paused
{ )
this._micProducer.resume(); this._micProducer.resume();
}
store.dispatch(meActions.setAutoMuted(false)); // sanity action store.dispatch(meActions.setAutoMuted(false)); // sanity action
}); });
this._hark.on('stopped_speaking', () => this._hark.on('stopped_speaking', () =>
{ {
store.dispatch(meActions.setIsSpeaking(false)); store.dispatch(meActions.setIsSpeaking(false));
if (store.getState().settings.voiceActivatedUnmute &&
if (
store.getState().settings.voiceActivatedUnmute &&
this._micProducer && this._micProducer &&
!this._micProducer.paused) !this._micProducer.paused
)
{ {
this._micProducer.pause(); this._micProducer.pause();
store.dispatch(meActions.setAutoMuted(true)); store.dispatch(meActions.setAutoMuted(true));
} }
}); });