Skip to content

Initialise before setting protection data in MSE Strategy #390

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

Merged
jlks merged 13 commits into from
Jun 3, 2025
Merged

Initialise before setting protection data in MSE Strategy #390

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
7663d4e
use full dashjs entrypoint
jlks Apr 14, 2025
cd3a001
add media sources current protection data, correct dashjs test import
jlks Apr 16, 2025
660d972
use referenced index vs package.json main entrypoint
jlks Apr 22, 2025
4f919f7
Merge remote-tracking branch 'origin' into use-full-build-protection-…
jlks Apr 23, 2025
218f8c5
add a happy path test for protectionData usage
jlks Apr 23, 2025
487b473
move protectionData to be added post initialize
jlks Apr 30, 2025
3a40638
dispatch and on-screen log protection events
jlks May 1, 2025
2f0b3eb
Merge branch 'master' into post-initialize-prot-data
Luke-Chatburn May 13, 2025
3c2e3ca
revert merge setting protection data twice
jlks May 29, 2025
ec6b9c9
Merge remote-tracking branch 'origin' into post-initialize-prot-data
jlks May 29, 2025
53a974c
move log level back to 2
jlks May 29, 2025
19a6cd9
indexOf usage > includes
jlks May 29, 2025
46aa3f6
add dashjs messages to debug by default
jlks Jun 3, 2025
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
10 changes: 7 additions & 3 deletions src/playbackstrategy/msestrategy.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ function MSEStrategy(
{
debug: {
logLevel: 2,
dispatchEvent: true,
},
streaming: {
blacklistExpiryTime: mediaSources.failoverResetTime(),
Expand Down Expand Up @@ -506,7 +507,11 @@ function MSEStrategy(
}

function onDebugLog(event) {
DebugTool.debug(event.message)

@eirikbjornr eirikbjornr Jun 3, 2025

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we retain this with an if-else? So we've got Dash.js logs on DebugTool.debug

if (event.message.includes("[Protection")) {
DebugTool.info(event.message)
} else {
DebugTool.debug(event.message)
}
}

function onFragmentContentLengthMismatch(event) {
Expand Down Expand Up @@ -601,13 +606,12 @@ function MSEStrategy(

mediaPlayer = MediaPlayer().create()
mediaPlayer.updateSettings(dashSettings)
mediaPlayer.initialize(mediaElement, null)

if (protectionData) {
mediaPlayer.setProtectionData(protectionData)
}

mediaPlayer.initialize(mediaElement, null)

if (embeddedSubs) {
setUpSubtitleElement(playbackElement)
mediaPlayer.attachTTMLRenderingDiv(subtitleElement)
Expand Down