Skip to content

feat: implementation of demux support for live mix #274

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Sgtfishtank wants to merge 18 commits into
base: master
Choose a base branch
from
Draft

feat: implementation of demux support for live mix #274

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
18 commits
Select commit Hold shift + click to select a range
a03a976
feat: implematation of demux support for live mix
Jun 28, 2023
7bcfcdb
bug fixes, preroll implementation, function in session.js
Aug 11, 2023
b1bbe6c
use audio in hls-v2l reload
Aug 14, 2023
0753ee0
console loges for debugging will be removed when done
Aug 14, 2023
d56e7dd
fixed bug when merging preroll
Aug 15, 2023
d816f1c
working on fixing issue with extra audio langs getting added and
Aug 16, 2023
4a0d7b9
fix video freeze and long reloads
Aug 17, 2023
0beaf3c
worked on fixing miss match in audio langs
Aug 20, 2023
323c106
cleaned up code and clarified tests, fixed undefiend bug
Aug 22, 2023
b7e4280
latest release of hls-v2l
Sep 15, 2023
883bab3
used for testing purposes should be reverted when done
Sep 15, 2023
88d1226
chore: refactor demux - add cmaf support - add sync fix
Nfrederiksen Oct 3, 2023
e5e8720
chore: refactor demux - add cmaf support - add sync fix
Nfrederiksen Oct 3, 2023
3461bd3
Merge branch 'support-for-demuxed-audio-in-live' of https://github.co…
Nfrederiksen Oct 3, 2023
4aab8bb
fix: put back the disc-tag text adder
Nfrederiksen Oct 4, 2023
e457946
chore: clean up, test assets, log req time
Nfrederiksen Aug 22, 2024
2c617c8
fix log line
Nfrederiksen Aug 22, 2024
dd988b6
fix: clean up duplicate log lines
Nfrederiksen Aug 22, 2024
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
40 changes: 30 additions & 10 deletions engine/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -433,7 +433,7 @@ export class ChannelEngine {
try {
await Promise.all(channels.map(channel => getSwitchStatusAndPerformSwitch(channel)));
} catch (err) {
debug('Problem occured when updating streamSwitchers');
debug('Problem occurred when updating streamSwitchers');
throw new Error (err);
}

Expand Down Expand Up @@ -474,13 +474,15 @@ export class ChannelEngine {
useDemuxedAudio: options.useDemuxedAudio,
dummySubtitleEndpoint: this.dummySubtitleEndpoint,
subtitleSliceEndpoint: this.subtitleSliceEndpoint,
useVTTSubtitles: this.useVTTSubtitles,
useVTTSubtitles: false,
cloudWatchMetrics: this.logCloudWatchMetrics,
profile: channel.profile,
audioTracks: channel.audioTracks
}, this.sessionLiveStore);

sessionSwitchers[channel.id] = new StreamSwitcher({
sessionId: channel.id,
useDemuxedAudio: options.useDemuxedAudio,
streamSwitchManager: this.streamSwitchManager ? this.streamSwitchManager : null
});

Expand Down Expand Up @@ -751,15 +753,31 @@ export class ChannelEngine {
}

async _handleAudioManifest(req, res, next) {
debug(`req.url=${req.url}`);
debug(`x-playback-session-id=${req.headers["x-playback-session-id"]} req.url=${req.url}`);
debug(req.params);
const session = sessions[req.params[2]];
if (session) {
const sessionLive = sessionsLive[req.params[2]];
if (session && sessionLive) {
try {
const body = await session.getCurrentAudioManifestAsync(
req.params[0],
req.params[1],
req.headers["x-playback-session-id"]
);
let body = null;
if (!this.streamSwitchManager) {
debug(`[${req.params[1]}]: Responding with VOD2Live manifest`);
body = await session.getCurrentAudioManifestAsync(req.params[0], req.params[1], req.headers["x-playback-session-id"]);
} else {
while (switcherStatus[req.params[2]] === null || switcherStatus[req.params[2]] === undefined) {
debug(`[${req.params[1]}]: (${switcherStatus[req.params[1]]}) Waiting for streamSwitcher to respond`);
await timer(500);
}
debug(`switcherStatus[${req.params[1]}]=[${switcherStatus[req.params[2]]}]`);
if (switcherStatus[req.params[2]]) {
debug(`[${req.params[2]}]: Responding with Live-stream manifest`);
body = await sessionLive.getCurrentAudioManifestAsync(req.params[0], req.params[1]);
} else {
debug(`[${req.params[2]}]: Responding with VOD2Live manifest`);
body = await session.getCurrentAudioManifestAsync(req.params[0], req.params[1], req.headers["x-playback-session-id"]);
}
}

res.sendRaw(200, Buffer.from(body, 'utf8'), {
"Content-Type": "application/vnd.apple.mpegurl",
"Access-Control-Allow-Origin": "*",
Expand All @@ -771,7 +789,7 @@ export class ChannelEngine {
next(this._gracefulErrorHandler(err));
}
} else {
const err = new errs.NotFoundError('Invalid session');
const err = new errs.NotFoundError('Invalid session(s)');
next(err);
}
}
Expand Down Expand Up @@ -852,13 +870,15 @@ export class ChannelEngine {
await timer(500);
}
debug(`switcherStatus[${req.params[1]}]=[${switcherStatus[req.params[1]]}]`);
let ts1 = Date.now();
if (switcherStatus[req.params[1]]) {
debug(`[${req.params[1]}]: Responding with Live-stream manifest`);
body = await sessionLive.getCurrentMediaManifestAsync(req.params[0]);
} else {
debug(`[${req.params[1]}]: Responding with VOD2Live manifest`);
body = await session.getCurrentMediaManifestAsync(req.params[0], req.headers["x-playback-session-id"]);
}
debug(`[${req.params[1]}]: Manifest Request Took (${Date.now() - ts1})ms`);
}

//verbose(`[${session.sessionId}] body=`);
Expand Down
Loading