Compare commits

..

2 Commits

6 changed files with 51 additions and 81 deletions

30
app.js
View File

@ -13,40 +13,40 @@ try {
} }
const mediasoup = require('mediasoup'); const mediasoup = require('mediasoup');
let worker let worker;
/** /**
* *
* videoCalls - Dictionary of Object(s) * videoCalls - Dictionary of Object(s)
* '<callId>': { * '<callId>': {
* router: Router, router * router: Router,
* initiatorAudioProducer: Producer, * initiatorAudioProducer: Producer,
* initiatorVideoProducer: Producer, * initiatorVideoProducer: Producer,
* receiverVideoProducer: Producer, producerVideo * receiverVideoProducer: Producer,
* receiverAudioProducer: Producer, producerAudio * receiverAudioProducer: Producer,
* initiatorProducerTransport: Producer Transport, * initiatorProducerTransport: Producer Transport,
* receiverProducerTransport: Producer Transport, producerTransport * receiverProducerTransport: Producer Transport,
* initiatorConsumerVideo: Consumer, consumerVideo * initiatorConsumerVideo: Consumer,
* initiatorConsumerAudio: Consumer, consumerAudio * initiatorConsumerAudio: Consumer,
* initiatorConsumerTransport: Consumer Transport consumerTransport * initiatorConsumerTransport: Consumer Transport
* initiatorSockerId * initiatorSockerId
* receiverSocketId * receiverSocketId
* } * }
* *
**/ **/
let videoCalls = {} let videoCalls = {};
let socketDetails = {} let socketDetails = {};
app.get('/', (_req, res) => { app.get('/', (_req, res) => {
res.send('Hello from mediasoup app!') res.send('Hello from mediasoup app!')
}) });
app.use('/sfu', express.static(path.join(__dirname, 'public'))) app.use('/sfu', express.static(path.join(__dirname, 'public')));
// SSL cert for HTTPS access // SSL cert for HTTPS access
const options = { const options = {
key: fs.readFileSync(process.env.SERVER_KEY, 'utf-8'), key: fs.readFileSync(process.env.SERVER_KEY, 'utf-8'),
cert: fs.readFileSync(process.env.SERVER_CERT, 'utf-8'), cert: fs.readFileSync(process.env.SERVER_CERT, 'utf-8'),
} };
const httpsServer = https.createServer(options, app); const httpsServer = https.createServer(options, app);
@ -225,7 +225,6 @@ peers.on('connection', async socket => {
*/ */
socket.on('createWebRtcTransport', async ({ sender }, callback) => { socket.on('createWebRtcTransport', async ({ sender }, callback) => {
try { try {
console.log('🟥', socket.id, JSON.stringify(sender));
const callId = socketDetails[socket.id]; const callId = socketDetails[socket.id];
console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`); console.log(`[createWebRtcTransport] socket ${socket.id} | sender ${sender} | callId ${callId}`);
if (sender) { if (sender) {
@ -429,7 +428,6 @@ peers.on('connection', async socket => {
} else if (!canConsumeVideo && canConsumeAudio) { } else if (!canConsumeVideo && canConsumeAudio) {
const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities) const audioParams = await consumeAudio(callId, socket.id, rtpCapabilities)
const data = { videoParams: null, audioParams }; const data = { videoParams: null, audioParams };
console.log('-----------======= data', data);
callback(data); callback(data);
} else { } else {
console.log(`[consume] Can't consume | callId ${callId}`); console.log(`[consume] Can't consume | callId ${callId}`);
@ -459,8 +457,6 @@ peers.on('connection', async socket => {
(videoCalls[callId].receiverConsumerVideo) && await videoCalls[callId].receiverConsumerVideo.resume(); (videoCalls[callId].receiverConsumerVideo) && await videoCalls[callId].receiverConsumerVideo.resume();
(videoCalls[callId].receiverConsumerVideo) && await videoCalls[callId].receiverConsumerAudio.resume(); (videoCalls[callId].receiverConsumerVideo) && await videoCalls[callId].receiverConsumerAudio.resume();
} }
// await videoCalls[callId].consumerVideo.resume();
// await videoCalls[callId].consumerAudio.resume();
} catch (error) { } catch (error) {
console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`); console.log(`ERROR | consumer-resume | callId ${socketDetails[socket.id]} | ${error.message}`);
} }

View File

@ -20811,28 +20811,15 @@ const connectRecvTransport = async () => {
if (audioParams) { if (audioParams) {
console.log('❗ Have AUDIO stream to consume'); console.log('❗ Have AUDIO stream to consume');
let audioTrack = await getAudioTrask(audioParams) let audioTrack = await getAudioTrask(audioParams)
console.log('audioTrack', audioTrack);
stream.addTrack(audioTrack) stream.addTrack(audioTrack)
} else { } else {
console.log('❗ Don\'t have AUDIO stream to consume'); console.log('❗ Don\'t have AUDIO stream to consume');
} }
console.log('----------stream', stream);
console.log('stream.getAudioTracks()', stream.getAudioTracks());
socket.emit('consumer-resume') socket.emit('consumer-resume')
remoteVideo.srcObject = stream remoteVideo.srcObject = stream
// remoteVideo.autoplay = true remoteVideo.setAttribute('autoplay', true)
remoteVideo.controls = true;
remoteVideo.muted = true;
remoteVideo.loop = true;
remoteVideo.setAttribute('playsinline', '');
remoteVideo.src = stream;
remoteVideo.volume = 1.0;
// window.localStream = stream; // A
// window.localAudio.srcObject = stream; // B
// window.localAudio.autoplay = true; // C
remoteVideo.play() remoteVideo.play()
.then(() => { .then(() => {
@ -20873,24 +20860,24 @@ const getAudioTrask = async (audioParams) => {
const audioTrack = consumerAudio.track const audioTrack = consumerAudio.track
// audioTrack.applyConstraints({ audioTrack.applyConstraints({
// audio: { audio: {
// advanced: [ advanced: [
// { {
// echoCancellation: {exact: true} echoCancellation: {exact: true}
// }, },
// { {
// autoGainControl: {exact: true} autoGainControl: {exact: true}
// }, },
// { {
// noiseSuppression: {exact: true} noiseSuppression: {exact: true}
// }, },
// { {
// highpassFilter: {exact: true} highpassFilter: {exact: true}
// } }
// ] ]
// } }
// }) })
return audioTrack return audioTrack
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 493 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 418 B

View File

@ -453,28 +453,15 @@ const connectRecvTransport = async () => {
if (audioParams) { if (audioParams) {
console.log('❗ Have AUDIO stream to consume'); console.log('❗ Have AUDIO stream to consume');
let audioTrack = await getAudioTrask(audioParams) let audioTrack = await getAudioTrask(audioParams)
console.log('audioTrack', audioTrack);
stream.addTrack(audioTrack) stream.addTrack(audioTrack)
} else { } else {
console.log('❗ Don\'t have AUDIO stream to consume'); console.log('❗ Don\'t have AUDIO stream to consume');
} }
console.log('----------stream', stream);
console.log('stream.getAudioTracks()', stream.getAudioTracks());
socket.emit('consumer-resume') socket.emit('consumer-resume')
remoteVideo.srcObject = stream remoteVideo.srcObject = stream
// remoteVideo.autoplay = true remoteVideo.setAttribute('autoplay', true)
remoteVideo.controls = true;
remoteVideo.muted = true;
remoteVideo.loop = true;
remoteVideo.setAttribute('playsinline', '');
remoteVideo.src = stream;
remoteVideo.volume = 1.0;
// window.localStream = stream; // A
// window.localAudio.srcObject = stream; // B
// window.localAudio.autoplay = true; // C
remoteVideo.play() remoteVideo.play()
.then(() => { .then(() => {
@ -515,24 +502,24 @@ const getAudioTrask = async (audioParams) => {
const audioTrack = consumerAudio.track const audioTrack = consumerAudio.track
// audioTrack.applyConstraints({ audioTrack.applyConstraints({
// audio: { audio: {
// advanced: [ advanced: [
// { {
// echoCancellation: {exact: true} echoCancellation: {exact: true}
// }, },
// { {
// autoGainControl: {exact: true} autoGainControl: {exact: true}
// }, },
// { {
// noiseSuppression: {exact: true} noiseSuppression: {exact: true}
// }, },
// { {
// highpassFilter: {exact: true} highpassFilter: {exact: true}
// } }
// ] ]
// } }
// }) })
return audioTrack return audioTrack
} }