ziplayer 0.3.10 → 0.3.12-dev.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/extensions/index.d.ts +1 -0
- package/dist/extensions/index.d.ts.map +1 -1
- package/dist/extensions/index.js +9 -1
- package/dist/extensions/index.js.map +1 -1
- package/dist/plugins/index.d.ts.map +1 -1
- package/dist/plugins/index.js +106 -61
- package/dist/plugins/index.js.map +1 -1
- package/dist/structures/FilterManager.d.ts +1 -0
- package/dist/structures/FilterManager.d.ts.map +1 -1
- package/dist/structures/FilterManager.js +76 -10
- package/dist/structures/FilterManager.js.map +1 -1
- package/dist/structures/Player.d.ts +1 -1
- package/dist/structures/Player.d.ts.map +1 -1
- package/dist/structures/Player.js +45 -20
- package/dist/structures/Player.js.map +1 -1
- package/dist/structures/PlayerManager.d.ts +12 -7
- package/dist/structures/PlayerManager.d.ts.map +1 -1
- package/dist/structures/PlayerManager.js +113 -79
- package/dist/structures/PlayerManager.js.map +1 -1
- package/dist/structures/PreloadManager.d.ts.map +1 -1
- package/dist/structures/PreloadManager.js +11 -8
- package/dist/structures/PreloadManager.js.map +1 -1
- package/dist/structures/Queue.js +2 -2
- package/dist/structures/Queue.js.map +1 -1
- package/dist/types/index.d.ts +4 -2
- package/dist/types/index.d.ts.map +1 -1
- package/dist/types/index.js.map +1 -1
- package/dist/utils/timeout.d.ts.map +1 -1
- package/dist/utils/timeout.js +8 -1
- package/dist/utils/timeout.js.map +1 -1
- package/package.json +1 -1
- package/src/extensions/index.ts +9 -1
- package/src/plugins/index.ts +1027 -975
- package/src/structures/FilterManager.ts +88 -12
- package/src/structures/Player.ts +58 -28
- package/src/structures/PlayerManager.ts +125 -84
- package/src/structures/PreloadManager.ts +12 -8
- package/src/structures/Queue.ts +2 -2
- package/src/types/index.ts +5 -2
- package/src/utils/timeout.ts +8 -1
|
@@ -217,15 +217,14 @@ class FilterManager {
|
|
|
217
217
|
async applyFiltersAndSeek(streamInfo, position = -1) {
|
|
218
218
|
const generation = ++this.ffmpegGeneration;
|
|
219
219
|
const filterString = this.getFilterString();
|
|
220
|
-
let sourceStream = streamInfo.stream;
|
|
220
|
+
let sourceStream = streamInfo.stream || streamInfo.url;
|
|
221
221
|
let wasRecreated = false;
|
|
222
222
|
if (position >= 0 && streamInfo.recreate) {
|
|
223
223
|
sourceStream = await streamInfo.recreate(position);
|
|
224
224
|
wasRecreated = true;
|
|
225
225
|
position = -1;
|
|
226
|
-
streamInfo.type = "arbitrary";
|
|
227
226
|
if (!filterString)
|
|
228
|
-
return { ...streamInfo, stream: sourceStream, wasRecreated };
|
|
227
|
+
return { ...streamInfo, type: "arbitrary", stream: sourceStream, wasRecreated };
|
|
229
228
|
}
|
|
230
229
|
this.debug(`Applying filters and seek — filters: ${filterString || "none"}, seek: ${position}ms`);
|
|
231
230
|
if (generation !== this.ffmpegGeneration) {
|
|
@@ -235,11 +234,21 @@ class FilterManager {
|
|
|
235
234
|
const abortController = new AbortController();
|
|
236
235
|
this.ffmpegAbortController = abortController;
|
|
237
236
|
// Nếu có vị trí seek, ưu tiên dùng spawnFFmpegInputSeek
|
|
238
|
-
if (position >= 0
|
|
237
|
+
if (position >= 0) {
|
|
238
|
+
if (!ffmpeg_static_1.default) {
|
|
239
|
+
this.debug("[FilterManager] ffmpeg-static path not found, seeking may fail");
|
|
240
|
+
// Fallback or throw based on preference, here we try to proceed or throw
|
|
241
|
+
throw new Error("FFmpeg binary not found. Seeking is unavailable.");
|
|
242
|
+
}
|
|
239
243
|
const stream = await this.spawnFFmpegInputSeek(sourceStream, position, filterString, abortController.signal, generation);
|
|
240
244
|
return { ...streamInfo, stream };
|
|
241
245
|
}
|
|
242
|
-
|
|
246
|
+
if (typeof sourceStream === "string") {
|
|
247
|
+
return {
|
|
248
|
+
...streamInfo,
|
|
249
|
+
stream: await this.createFFmpegFromUrl(sourceStream, filterString),
|
|
250
|
+
};
|
|
251
|
+
}
|
|
243
252
|
const args = [
|
|
244
253
|
"-analyzeduration",
|
|
245
254
|
"0",
|
|
@@ -260,7 +269,6 @@ class FilterManager {
|
|
|
260
269
|
args.splice(4, 0, "-af", filterString);
|
|
261
270
|
}
|
|
262
271
|
try {
|
|
263
|
-
// Sử dụng prism.FFmpeg cho trường hợp không seek
|
|
264
272
|
this.ffmpeg = sourceStream.pipe(new prism_media_1.default.FFmpeg({ args }));
|
|
265
273
|
return { ...streamInfo, stream: this.ffmpeg };
|
|
266
274
|
}
|
|
@@ -274,7 +282,10 @@ class FilterManager {
|
|
|
274
282
|
const seekSeconds = String((position / 1000).toFixed(3));
|
|
275
283
|
// Chuyển sang dùng s16le (Raw PCM) để Discord.js dễ xử lý nhất khi có filter
|
|
276
284
|
// NOTE: -ss MUST come BEFORE -i for proper seeking and timing
|
|
277
|
-
|
|
285
|
+
//if url is provided, we can let ffmpeg handle it directly without piping, which is more efficient and less error-prone
|
|
286
|
+
const args = typeof stream === "string" ?
|
|
287
|
+
["-ss", seekSeconds, "-i", stream, "-analyzeduration", "0", "-loglevel", "0"]
|
|
288
|
+
: ["-ss", seekSeconds, "-i", "pipe:0", "-analyzeduration", "0", "-loglevel", "0"];
|
|
278
289
|
if (filterString) {
|
|
279
290
|
args.push("-af", filterString);
|
|
280
291
|
}
|
|
@@ -295,7 +306,12 @@ class FilterManager {
|
|
|
295
306
|
const onAbort = () => {
|
|
296
307
|
signal.removeEventListener("abort", onAbort);
|
|
297
308
|
try {
|
|
298
|
-
stream
|
|
309
|
+
if (typeof stream === "string") {
|
|
310
|
+
// If stream is a URL, no need to unpipe
|
|
311
|
+
}
|
|
312
|
+
else {
|
|
313
|
+
stream.unpipe(proc.stdin);
|
|
314
|
+
}
|
|
299
315
|
}
|
|
300
316
|
catch { }
|
|
301
317
|
try {
|
|
@@ -315,10 +331,15 @@ class FilterManager {
|
|
|
315
331
|
onAbort();
|
|
316
332
|
}
|
|
317
333
|
else {
|
|
318
|
-
signal.addEventListener("abort", onAbort);
|
|
334
|
+
signal.addEventListener("abort", onAbort, { once: true });
|
|
319
335
|
}
|
|
320
336
|
// Pipe source → ffmpeg stdin
|
|
321
|
-
stream
|
|
337
|
+
if (typeof stream === "string") {
|
|
338
|
+
// If stream is a URL, no need to pipe
|
|
339
|
+
}
|
|
340
|
+
else {
|
|
341
|
+
stream.pipe(proc.stdin);
|
|
342
|
+
}
|
|
322
343
|
// Suppress EPIPE on stdin when the process exits early
|
|
323
344
|
proc.stdin.on("error", (err) => {
|
|
324
345
|
if (err.code !== "EPIPE") {
|
|
@@ -360,6 +381,51 @@ class FilterManager {
|
|
|
360
381
|
}
|
|
361
382
|
return proc.stdout;
|
|
362
383
|
}
|
|
384
|
+
createFFmpegFromUrl(url, filterString) {
|
|
385
|
+
const args = ["-analyzeduration", "0", "-loglevel", "0", "-i", url];
|
|
386
|
+
if (filterString) {
|
|
387
|
+
args.push("-af", filterString);
|
|
388
|
+
}
|
|
389
|
+
args.push("-acodec", "libopus", "-f", "opus", "-ar", "48000", "-ac", "2", "pipe:1");
|
|
390
|
+
const proc = (0, child_process_1.spawn)(ffmpeg_static_1.default, args, {
|
|
391
|
+
stdio: ["ignore", "pipe", "ignore"],
|
|
392
|
+
});
|
|
393
|
+
const oldProcess = this.ffmpegProcess;
|
|
394
|
+
this.ffmpegProcess = proc;
|
|
395
|
+
proc.on("close", (code) => {
|
|
396
|
+
this.debug(`FFmpeg URL process exited (code: ${code})`);
|
|
397
|
+
if (this.ffmpegProcess === proc) {
|
|
398
|
+
this.ffmpegProcess = null;
|
|
399
|
+
}
|
|
400
|
+
});
|
|
401
|
+
proc.on("error", (err) => {
|
|
402
|
+
this.debug(`FFmpeg URL process error: ${err.message}`);
|
|
403
|
+
if (this.ffmpegProcess === proc) {
|
|
404
|
+
this.ffmpegProcess = null;
|
|
405
|
+
}
|
|
406
|
+
});
|
|
407
|
+
// kill process cũ sau khi process mới đã sẵn sàng
|
|
408
|
+
if (oldProcess && oldProcess !== proc) {
|
|
409
|
+
try {
|
|
410
|
+
oldProcess.kill("SIGKILL");
|
|
411
|
+
}
|
|
412
|
+
catch { }
|
|
413
|
+
}
|
|
414
|
+
const output = proc.stdout;
|
|
415
|
+
output.once("close", () => {
|
|
416
|
+
try {
|
|
417
|
+
proc.kill("SIGKILL");
|
|
418
|
+
}
|
|
419
|
+
catch { }
|
|
420
|
+
});
|
|
421
|
+
output.once("end", () => {
|
|
422
|
+
try {
|
|
423
|
+
proc.kill("SIGKILL");
|
|
424
|
+
}
|
|
425
|
+
catch { }
|
|
426
|
+
});
|
|
427
|
+
return output;
|
|
428
|
+
}
|
|
363
429
|
}
|
|
364
430
|
exports.FilterManager = FilterManager;
|
|
365
431
|
//# sourceMappingURL=FilterManager.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"FilterManager.js","sourceRoot":"","sources":["../../src/structures/FilterManager.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"FilterManager.js","sourceRoot":"","sources":["../../src/structures/FilterManager.ts"],"names":[],"mappings":"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"}
|
|
@@ -256,7 +256,7 @@ export declare class Player extends EventEmitter {
|
|
|
256
256
|
* @example
|
|
257
257
|
* await player.connect(voiceChannel);
|
|
258
258
|
*/
|
|
259
|
-
connect(channel: VoiceChannel, options
|
|
259
|
+
connect(channel: VoiceChannel, options?: {
|
|
260
260
|
group: string;
|
|
261
261
|
selfDeaf: boolean;
|
|
262
262
|
selfMute: boolean;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../../src/structures/Player.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,QAAQ,CAAC;AACtC,OAAO,EAKN,eAAe,EACf,WAAW,IAAI,kBAAkB,EAIjC,aAAa,EAEb,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAElC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AACnD,OAAO,EACN,YAAY,EAEZ,KAAK,KAAK,EACV,KAAK,aAAa,EAClB,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,YAAY,EACjB,KAAK,kBAAkB,EACvB,KAAK,QAAQ,EAEb,KAAK,WAAW,EAChB,KAAK,YAAY,EACjB,KAAK,aAAa,EAMlB,mBAAmB,EACnB,MAAM,UAAU,CAAC;AAClB,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAErD,OAAO,EAAE,KAAK,EAAE,MAAM,SAAS,CAAC;AAChC,OAAO,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAC3C,OAAO,EAAE,gBAAgB,EAAE,MAAM,eAAe,CAAC;AACjD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAElD,MAAM,CAAC,OAAO,WAAW,MAAM;IAC9B,EAAE,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,QAAQ,EAAE,CAAC,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,KAAK,IAAI,GAAG,IAAI,CAAC;IAC/F,IAAI,CAAC,CAAC,SAAS,MAAM,YAAY,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,IAAI,EAAE,YAAY,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;CAChF;AAED;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAmCG;AACH,qBAAa,MAAO,SAAQ,YAAY;IACvC,SAAgB,OAAO,EAAE,MAAM,CAAC;IACzB,UAAU,EAAE,eAAe,GAAG,IAAI,CAAQ;IAC1C,WAAW,EAAE,kBAAkB,CAAC;IAChC,KAAK,EAAE,KAAK,CAAC;IACb,MAAM,EAAE,MAAM,CAAO;IACrB,OAAO,EAAE,aAAa,CAAC;IACvB,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,CAAC;IAC/B,aAAa,EAAE,MAAM,CAAc;IACnC,aAAa,UAAS;IACtB,eAAe,EAAE,aAAa,GAAG,IAAI,CAAQ;IAC7C,SAAS,EAAE,OAAO,CAAS;IAE3B,OAAO,EAAE,aAAa,CAAC;IACvB,aAAa,EAAE,aAAa,CAAC;IAC7B,gBAAgB,EAAE,gBAAgB,CAAC;IACnC,aAAa,EAAE,aAAa,CAAC;IAC7B,cAAc,EAAE,cAAc,CAAC;IAC/B,MAAM,EAAG,aAAa,CAAC;IAEvB,YAAY,eAAuB;IAEnC,gBAAgB,cAAqB;IACrC,aAAa,EAAE,MAAM,GAAG,IAAI,CAAQ;IAE3C,OAAO,CAAC,YAAY,CAA+B;IACnD,OAAO,CAAC,cAAc,CAA+B;IACrD,OAAO,CAAC,UAAU,CAA+B;IAEjD,OAAO,CAAC,QAAQ,CAAS;IACzB,OAAO,CAAC,WAAW,CAAS;IAC5B,OAAO,CAAC,cAAc,CAAS;IAC/B,OAAO,CAAC,YAAY,CAAuB;IAE3C,OAAO,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"Player.d.ts","sourceRoot":"","sources":["../../src/structures/Player.ts"],"names":[],"mappings":"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"}
|
|
@@ -79,6 +79,7 @@ class Player extends events_1.EventEmitter {
|
|
|
79
79
|
resource: null,
|
|
80
80
|
track: null,
|
|
81
81
|
streamId: null,
|
|
82
|
+
processedStreamId: null,
|
|
82
83
|
abortController: null,
|
|
83
84
|
isValid: false,
|
|
84
85
|
isLoading: false,
|
|
@@ -265,7 +266,12 @@ class Player extends events_1.EventEmitter {
|
|
|
265
266
|
return;
|
|
266
267
|
const stream = this.currentResource?.metadata?.stream ?? this.currentResource?.stream;
|
|
267
268
|
if (stream && typeof stream.destroy === "function") {
|
|
268
|
-
|
|
269
|
+
try {
|
|
270
|
+
stream.destroy();
|
|
271
|
+
}
|
|
272
|
+
catch (e) {
|
|
273
|
+
this.debug("Stream destroy error:", e);
|
|
274
|
+
}
|
|
269
275
|
}
|
|
270
276
|
this.currentResource = null;
|
|
271
277
|
}
|
|
@@ -375,14 +381,21 @@ class Player extends events_1.EventEmitter {
|
|
|
375
381
|
const lastTrack = this.queue.previousTracks[this.queue.previousTracks.length - 1] ?? this.queue.currentTrack;
|
|
376
382
|
if (!lastTrack)
|
|
377
383
|
return;
|
|
378
|
-
|
|
384
|
+
let related = await this.pluginManager.getRelatedTracks(lastTrack);
|
|
379
385
|
if (!related || related.length === 0)
|
|
380
386
|
return;
|
|
381
|
-
|
|
387
|
+
// Lọc bỏ các bài đã có trong hàng đợi sắp tới
|
|
388
|
+
const upcomingUrls = new Set(this.queue.getTracks().map((t) => t.url));
|
|
389
|
+
related = related.filter((t) => !upcomingUrls.has(t.url));
|
|
390
|
+
if (related.length === 0)
|
|
391
|
+
return;
|
|
392
|
+
// Ưu tiên chọn trong top 5 để đảm bảo chất lượng cao nhất
|
|
393
|
+
const poolSize = Math.min(5, related.length);
|
|
394
|
+
const randomchoice = Math.floor(Math.random() * poolSize);
|
|
382
395
|
const nextTrack = this.queue.nextTrack ? this.queue.nextTrack : related[randomchoice];
|
|
383
396
|
this.queue.willNextTrack(nextTrack);
|
|
384
397
|
this.queue.relatedTracks(related);
|
|
385
|
-
this.debug(`[Player] Will next track if autoplay: ${nextTrack?.title}
|
|
398
|
+
this.debug(`[Player] Will next track if autoplay: ${nextTrack?.title}`);
|
|
386
399
|
this.emit("willPlay", nextTrack, related);
|
|
387
400
|
}
|
|
388
401
|
//#endregion
|
|
@@ -776,7 +789,7 @@ class Player extends events_1.EventEmitter {
|
|
|
776
789
|
const seekArg = position > 0 ? position : -1;
|
|
777
790
|
if (filterString || position > 0) {
|
|
778
791
|
const processedStream = await this.filter.applyFiltersAndSeek(streamInfo, seekArg);
|
|
779
|
-
const resource = (0, voice_1.createAudioResource)(processedStream.stream, {
|
|
792
|
+
const resource = (0, voice_1.createAudioResource)(processedStream.stream || processedStream.url, {
|
|
780
793
|
metadata: track,
|
|
781
794
|
inputType: processedStream.wasRecreated && !filterString ? voice_1.StreamType.Arbitrary
|
|
782
795
|
: position > 0 ? voice_1.StreamType.Raw
|
|
@@ -785,7 +798,7 @@ class Player extends events_1.EventEmitter {
|
|
|
785
798
|
});
|
|
786
799
|
return { resource, processedStream: processedStream.stream };
|
|
787
800
|
}
|
|
788
|
-
const resource = (0, voice_1.createAudioResource)(streamInfo.stream, {
|
|
801
|
+
const resource = (0, voice_1.createAudioResource)(streamInfo.stream || streamInfo.url, {
|
|
789
802
|
metadata: track,
|
|
790
803
|
inputType: streamInfo.type === "webm/opus" ? voice_1.StreamType.WebmOpus
|
|
791
804
|
: streamInfo.type === "ogg/opus" ? voice_1.StreamType.OggOpus
|
|
@@ -965,16 +978,18 @@ class Player extends events_1.EventEmitter {
|
|
|
965
978
|
if (streamInfo?.remote && streamInfo.handle) {
|
|
966
979
|
return await this.playRemote(track, streamInfo);
|
|
967
980
|
}
|
|
968
|
-
if (!streamInfo?.stream) {
|
|
981
|
+
if (!streamInfo?.stream && !streamInfo?.url) {
|
|
969
982
|
throw new Error(`No stream available`);
|
|
970
983
|
}
|
|
971
984
|
// Register the RAW source stream — this is what we can reuse on seek
|
|
972
|
-
const rawStreamId =
|
|
973
|
-
|
|
974
|
-
|
|
975
|
-
|
|
976
|
-
|
|
977
|
-
|
|
985
|
+
const rawStreamId = streamInfo.stream ?
|
|
986
|
+
this.streamManager.registerStream(streamInfo.stream, track, {
|
|
987
|
+
source: track.source || "stream",
|
|
988
|
+
isPreload: false,
|
|
989
|
+
isRemote: !!streamInfo?.remote,
|
|
990
|
+
priority: 10,
|
|
991
|
+
})
|
|
992
|
+
: null;
|
|
978
993
|
// createResource now returns both the AudioResource
|
|
979
994
|
// AND the processedStream (ffmpeg stdout) when filters/seek are involved.
|
|
980
995
|
const { resource, processedStream } = await this.createResource(streamInfo, track, 0);
|
|
@@ -1253,7 +1268,7 @@ class Player extends events_1.EventEmitter {
|
|
|
1253
1268
|
* @example
|
|
1254
1269
|
* await player.connect(voiceChannel);
|
|
1255
1270
|
*/
|
|
1256
|
-
async connect(channel, options) {
|
|
1271
|
+
async connect(channel, options = {}) {
|
|
1257
1272
|
try {
|
|
1258
1273
|
this.debug(`[Player] Connecting to voice channel: ${channel.id}`);
|
|
1259
1274
|
const connection = (0, voice_1.joinVoiceChannel)({
|
|
@@ -2231,19 +2246,29 @@ class Player extends events_1.EventEmitter {
|
|
|
2231
2246
|
this.extensionManager.clearCache("stream");
|
|
2232
2247
|
this.debug(`[Player] Fetching fresh stream${!isForwardSeek ? " (backward seek)" : " (reuse failed)"}`);
|
|
2233
2248
|
streaminfo = await this.getStream(track);
|
|
2249
|
+
if (this.destroyed) {
|
|
2250
|
+
this.debug(`[Player] refreshPlayerResource: Player destroyed during stream fetch`);
|
|
2251
|
+
return false;
|
|
2252
|
+
}
|
|
2253
|
+
if (!applyToCurrent || !this.queue.currentTrack || !(this.isPlaying || this.isPaused)) {
|
|
2254
|
+
this.debug(`[Player] refreshPlayerResource: Player state changed during stream fetch, aborting`);
|
|
2255
|
+
return false;
|
|
2256
|
+
}
|
|
2234
2257
|
}
|
|
2235
|
-
if (!streaminfo?.stream) {
|
|
2258
|
+
if (!streaminfo?.stream && !streaminfo?.url) {
|
|
2236
2259
|
this.debug(`[Player] No stream available for refresh`);
|
|
2237
2260
|
return false;
|
|
2238
2261
|
}
|
|
2239
2262
|
const createPosition = reuseStream ? -1 : currentPosition;
|
|
2240
2263
|
const { resource, processedStream } = await this.createResource(streaminfo, track, createPosition);
|
|
2241
2264
|
// Register raw source stream
|
|
2242
|
-
const newStreamId =
|
|
2243
|
-
|
|
2244
|
-
|
|
2245
|
-
|
|
2246
|
-
|
|
2265
|
+
const newStreamId = streaminfo.stream ?
|
|
2266
|
+
this.streamManager.registerStream(streaminfo.stream, track, {
|
|
2267
|
+
source: track.source || "stream",
|
|
2268
|
+
isPreload: false,
|
|
2269
|
+
priority: 10,
|
|
2270
|
+
})
|
|
2271
|
+
: null;
|
|
2247
2272
|
let newProcessedStreamId = null;
|
|
2248
2273
|
if (processedStream && processedStream !== streaminfo.stream) {
|
|
2249
2274
|
newProcessedStreamId = this.streamManager.registerStream(processedStream, track, {
|