ghaymah_dev/codepill-sfu
2
0
نسخ 0
الشفرة المشكلات طلبات السحب Actions Packages المشاريع الإصدارات الويكي النشاط

[mirotalksfu] - update dep.

تصفح المصدر
هذا الالتزام موجود في:
Miroslav Pejic
2022-12-11 23:29:34 +01:00
الأصل c32baa5405
التزام a37230452b
3 ملفات معدلة مع 30 إضافات و29 حذوفات
تنزيل ملف التصحيح تنزيل ملف الاختلاف توسيع جميع الملفات طي جميع الملفات

7
public/js/RoomClient.js
عرض الملف

@@ -1339,7 +1339,7 @@ class RoomClient {
console.log('Update whiteboard canvas to the participants in the room');
wbCanvasToJson();
}
this.getConsumeStream(producer_id).then(
this.getConsumeStream(producer_id, peer_info.peer_id, type).then(
function ({ consumer, stream, kind }) {
console.log('CONSUMER', consumer);
@@ -1370,21 +1370,24 @@ class RoomClient {
);
}
async getConsumeStream(producerId) {
async getConsumeStream(producerId, peer_id, type) {
const { rtpCapabilities } = this.device;
const data = await this.socket.request('consume', {
rtpCapabilities,
consumerTransportId: this.consumerTransport.id,
producerId,
});
console.log('DATA', data);
const { id, kind, rtpParameters } = data;
const codecOptions = {};
const streamId = peer_id + (type == mediaType.screen ? '-screensharing' : '-mic-webcam');
const consumer = await this.consumerTransport.consume({
id,
producerId,
kind,
rtpParameters,
codecOptions,
streamId,
});
const stream = new MediaStream();
stream.addTrack(consumer.track);

50
public/sfu/MediasoupClient.js
عرض الملف

@@ -4432,7 +4432,7 @@
/**
* Create a Consumer to consume a remote Producer.
*/
async consume({ id, producerId, kind, rtpParameters, appData = {} }) {
async consume({ id, producerId, kind, rtpParameters, streamId, appData = {} }) {
logger.debug('consume()');
rtpParameters = utils.clone(rtpParameters, undefined);
if (this._closed) throw new errors_1.InvalidStateError('closed');
@@ -4453,6 +4453,7 @@
producerId,
kind,
rtpParameters,
streamId,
appData,
});
// Store the Consumer creation task.
@@ -4586,11 +4587,12 @@
// Fill options list.
const optionsList = [];
for (const task of pendingConsumerTasks) {
const { id, kind, rtpParameters } = task.consumerOptions;
const { id, kind, rtpParameters, streamId } = task.consumerOptions;
optionsList.push({
trackId: id,
kind: kind,
rtpParameters,
streamId,
});
}
try {
@@ -5342,15 +5344,14 @@
this._assertRecvDirection();
const results = [];
for (const options of optionsList) {
const { trackId, kind, rtpParameters } = options;
const { trackId, kind, rtpParameters, streamId } = options;
logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
const mid = kind;
const streamId = rtpParameters.rtcp.cname;
this._remoteSdp.receive({
mid,
kind,
offerRtpParameters: rtpParameters,
streamId,
streamId: streamId || rtpParameters.rtcp.cname,
trackId,
});
}
@@ -5384,7 +5385,7 @@
const { kind, trackId, rtpParameters } = options;
const mid = kind;
const localId = trackId;
const streamId = rtpParameters.rtcp.cname;
const streamId = options.streamId || rtpParameters.rtcp.cname;
const stream = this._pc.getRemoteStreams().find((s) => s.id === streamId);
const track = stream.getTrackById(localId);
if (!track) throw new Error('remote track not found');
@@ -5941,22 +5942,19 @@
};
return { dataChannel, sctpStreamParameters };
}
async receive(
// eslint-disable-next-line @typescript-eslint/no-unused-vars
optionsList,
) {
async receive(optionsList) {
var _a;
this._assertRecvDirection();
const results = [];
for (const options of optionsList) {
const { trackId, kind, rtpParameters } = options;
const { trackId, kind, rtpParameters, streamId } = options;
logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
const mid = kind;
this._remoteSdp.receive({
mid,
kind,
offerRtpParameters: rtpParameters,
streamId: rtpParameters.rtcp.cname,
streamId: streamId || rtpParameters.rtcp.cname,
trackId,
});
}
@@ -6577,7 +6575,7 @@
const results = [];
const mapLocalId = new Map();
for (const options of optionsList) {
const { trackId, kind, rtpParameters } = options;
const { trackId, kind, rtpParameters, streamId } = options;
logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
const localId = rtpParameters.mid || String(this._mapMidTransceiver.size);
mapLocalId.set(trackId, localId);
@@ -6585,7 +6583,7 @@
mid: localId,
kind,
offerRtpParameters: rtpParameters,
streamId: rtpParameters.rtcp.cname,
streamId: streamId || rtpParameters.rtcp.cname,
trackId,
});
}
@@ -7216,7 +7214,7 @@
const results = [];
const mapLocalId = new Map();
for (const options of optionsList) {
const { trackId, kind, rtpParameters } = options;
const { trackId, kind, rtpParameters, streamId } = options;
logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
const localId = rtpParameters.mid || String(this._mapMidTransceiver.size);
mapLocalId.set(trackId, localId);
@@ -7224,7 +7222,7 @@
mid: localId,
kind,
offerRtpParameters: rtpParameters,
streamId: rtpParameters.rtcp.cname,
streamId: streamId || rtpParameters.rtcp.cname,
trackId,
});
}
@@ -8341,7 +8339,7 @@
const results = [];
const mapLocalId = new Map();
for (const options of optionsList) {
const { trackId, kind, rtpParameters } = options;
const { trackId, kind, rtpParameters, streamId } = options;
logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
const localId = rtpParameters.mid || String(this._mapMidTransceiver.size);
mapLocalId.set(trackId, localId);
@@ -8349,7 +8347,7 @@
mid: localId,
kind,
offerRtpParameters: rtpParameters,
streamId: rtpParameters.rtcp.cname,
streamId: streamId || rtpParameters.rtcp.cname,
trackId,
});
}
@@ -8956,7 +8954,7 @@
const { trackId, kind, rtpParameters } = options;
logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
const mid = kind;
let streamId = rtpParameters.rtcp.cname;
let streamId = options.streamId || rtpParameters.rtcp.cname;
// NOTE: In React-Native we cannot reuse the same remote MediaStream for new
// remote tracks. This is because react-native-webrtc does not react on new
// tracks generated within already existing streams, so force the streamId
@@ -9601,7 +9599,7 @@
const results = [];
const mapLocalId = new Map();
for (const options of optionsList) {
const { trackId, kind, rtpParameters } = options;
const { trackId, kind, rtpParameters, streamId } = options;
logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
const localId = rtpParameters.mid || String(this._mapMidTransceiver.size);
mapLocalId.set(trackId, localId);
@@ -9609,7 +9607,7 @@
mid: localId,
kind,
offerRtpParameters: rtpParameters,
streamId: rtpParameters.rtcp.cname,
streamId: streamId || rtpParameters.rtcp.cname,
trackId,
});
}
@@ -10228,14 +10226,14 @@
this._assertRecvDirection();
const results = [];
for (const options of optionsList) {
const { trackId, kind, rtpParameters } = options;
const { trackId, kind, rtpParameters, streamId } = options;
logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
const mid = kind;
this._remoteSdp.receive({
mid,
kind,
offerRtpParameters: rtpParameters,
streamId: rtpParameters.rtcp.cname,
streamId: streamId || rtpParameters.rtcp.cname,
trackId,
});
}
@@ -10837,7 +10835,7 @@
const results = [];
const mapLocalId = new Map();
for (const options of optionsList) {
const { trackId, kind, rtpParameters } = options;
const { trackId, kind, rtpParameters, streamId } = options;
logger.debug('receive() [trackId:%s, kind:%s]', trackId, kind);
const localId = rtpParameters.mid || String(this._mapMidTransceiver.size);
mapLocalId.set(trackId, localId);
@@ -10845,7 +10843,7 @@
mid: localId,
kind,
offerRtpParameters: rtpParameters,
streamId: rtpParameters.rtcp.cname,
streamId: streamId || rtpParameters.rtcp.cname,
trackId,
});
}
@@ -12545,7 +12543,7 @@
/**
* Expose mediasoup-client version.
*/
exports.version = '3.6.67';
exports.version = '3.6.68';
/**
* Expose parseScalabilityMode() function.
*/