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

Fix to hark. Handle consumer close.

master
Håvar Aambø Fosstveit 2019-06-04 09:42:07 +02:00
parent f1f6a9ddc3
commit 38627e485d
1 changed files with 31 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
app/src/RoomClient.js
View File

@ -163,6 +163,9 @@ export default class RoomClient
// Local mic mediasoup Producer. // Local mic mediasoup Producer.
this._micProducer = null; this._micProducer = null;
// Local mic hark
this._hark = null;
// Local webcam mediasoup Producer. // Local webcam mediasoup Producer.
this._webcamProducer = null; this._webcamProducer = null;
@ -826,6 +829,8 @@ export default class RoomClient
await this._micProducer.replaceTrack({ track }); await this._micProducer.replaceTrack({ track });
this._micProducer.volume = 0;
const harkStream = new MediaStream(); const harkStream = new MediaStream();
harkStream.addTrack(track); harkStream.addTrack(track);
@ -833,13 +838,13 @@ export default class RoomClient
if (!harkStream.getAudioTracks()[0]) if (!harkStream.getAudioTracks()[0])
throw new Error('changeAudioDevice(): given stream has no audio track'); throw new Error('changeAudioDevice(): given stream has no audio track');
if (this._micProducer.hark != null) if (this._hark != null)
this._micProducer.hark.stop(); this._hark.stop();
this._micProducer.hark = hark(harkStream, { play: false }); this._hark = hark(harkStream, { play: false });
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
this._micProducer.hark.on('volume_change', (dBs, threshold) => this._hark.on('volume_change', (dBs, threshold) =>
{ {
// The exact formula to convert from dBs (-100..0) to linear (0..1) is: // The exact formula to convert from dBs (-100..0) to linear (0..1) is:
// Math.pow(10, dBs / 20) // Math.pow(10, dBs / 20)
@ -850,10 +855,13 @@ export default class RoomClient
if (volume === 1) if (volume === 1)
volume = 0; volume = 0;
volume = Math.round(volume); volume = Math.round(volume);
if (volume !== this._micProducer.volume)
if (this._micProducer && volume !== this._micProducer.volume)
{ {
this._micProducer.volume = volume; this._micProducer.volume = volume;
store.dispatch(stateActions.setPeerVolume(this._peerId, volume)); store.dispatch(stateActions.setPeerVolume(this._peerId, volume));
} }
}); });
@ -1258,9 +1266,12 @@ export default class RoomClient
if (kind === 'audio') if (kind === 'audio')
{ {
consumer.volume = 0;
const stream = new MediaStream(); const stream = new MediaStream();
stream.addTrack(consumer.track); stream.addTrack(consumer.track);
if (!stream.getAudioTracks()[0]) if (!stream.getAudioTracks()[0])
throw new Error('request.newConsumer | given stream has no audio track'); throw new Error('request.newConsumer | given stream has no audio track');
@ -1281,7 +1292,7 @@ export default class RoomClient
volume = Math.round(volume); volume = Math.round(volume);
if (volume !== consumer.volume) if (consumer && volume !== consumer.volume)
{ {
consumer.volume = volume; consumer.volume = volume;
@ -1493,6 +1504,10 @@ export default class RoomClient
break; break;
consumer.close(); consumer.close();
if (consumer.hark != null)
consumer.hark.stop();
this._consumers.delete(consumerId); this._consumers.delete(consumerId);
const { peerId } = consumer.appData; const { peerId } = consumer.appData;
@ -1886,6 +1901,8 @@ export default class RoomClient
.catch(() => {}); .catch(() => {});
}); });
this._micProducer.volume = 0;
const harkStream = new MediaStream(); const harkStream = new MediaStream();
harkStream.addTrack(track); harkStream.addTrack(track);
@ -1893,10 +1910,13 @@ export default class RoomClient
if (!harkStream.getAudioTracks()[0]) if (!harkStream.getAudioTracks()[0])
throw new Error('enableMic(): given stream has no audio track'); throw new Error('enableMic(): given stream has no audio track');
this._micProducer.hark = hark(harkStream, { play: false }); if (this._hark != null)
this._hark.stop();
this._hark = hark(harkStream, { play: false });
// eslint-disable-next-line no-unused-vars // eslint-disable-next-line no-unused-vars
this._micProducer.hark.on('volume_change', (dBs, threshold) => this._hark.on('volume_change', (dBs, threshold) =>
{ {
// The exact formula to convert from dBs (-100..0) to linear (0..1) is: // The exact formula to convert from dBs (-100..0) to linear (0..1) is:
// Math.pow(10, dBs / 20) // Math.pow(10, dBs / 20)
@ -1907,10 +1927,13 @@ export default class RoomClient
if (volume === 1) if (volume === 1)
volume = 0; volume = 0;
volume = Math.round(volume); volume = Math.round(volume);
if (this._micProducer && volume !== this._micProducer.volume) if (this._micProducer && volume !== this._micProducer.volume)
{ {
this._micProducer.volume = volume; this._micProducer.volume = volume;
store.dispatch(stateActions.setPeerVolume(this._peerId, volume)); store.dispatch(stateActions.setPeerVolume(this._peerId, volume));
} }
}); });