Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 18 additions & 2 deletions packages/p2p-media-loader-hlsjs/src/segment-mananger.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,8 @@ export class SegmentManager {
const { levels, audioTracks } = data;
// in the case of audio only stream it is stored in levels

for (const [index, level] of levels.entries()) {
const sortedLevels = this.stabilizeStreamOrder([...levels]);
for (const [index, level] of sortedLevels.entries()) {
const { url } = level;
this.core.addStreamIfNoneExists({
runtimeId: Array.isArray(url) ? (url as string[])[0] : url,
Expand All @@ -26,7 +27,8 @@ export class SegmentManager {
});
}

for (const [index, track] of audioTracks.entries()) {
const sortedAudioTracks = this.stabilizeStreamOrder([...audioTracks]);
for (const [index, track] of sortedAudioTracks.entries()) {
const { url } = track;
this.core.addStreamIfNoneExists({
runtimeId: Array.isArray(url) ? (url as string[])[0] : url,
Expand All @@ -36,6 +38,20 @@ export class SegmentManager {
}
}

private stabilizeStreamOrder<
T extends { bitrate: number; url: string | string[] },
>(items: T[]): T[] {
return items.sort((a, b) => {
const bitDiff = a.bitrate - b.bitrate;
if (bitDiff !== 0) return bitDiff;

const urlA = Array.isArray(a.url) ? a.url[0] : a.url;
const urlB = Array.isArray(b.url) ? b.url[0] : b.url;

return urlA.localeCompare(urlB);
});
}

updatePlaylist(data: LevelUpdatedData | AudioTrackLoadedData) {
const {
details: { url, fragments, live },
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,14 @@ export class ManifestParserDecorator implements shaka.extern.ManifestParser {

let videoCount = 0;
let audioCount = 0;
for (const variant of variants) {

const sortedVariants = [...variants].sort((a, b) => {
const bandDiff = a.bandwidth - b.bandwidth;
if (bandDiff !== 0) return bandDiff;

return a.id - b.id;
});
for (const variant of sortedVariants) {
const { video, audio } = variant;

if (video && !processedStreams.has(video.id)) {
Expand Down
Loading