Skip to content
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

Jump to bottom

fix: Fix waiting for empty init datas #6292

Merged
merged 6 commits into from Feb 27, 2024
Merged

fix: Fix waiting for empty init datas #6292

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e75fb00
fix: Fix waiting for empty init datas
theodab Feb 24, 2024
6bd69ce
Change to using areAllSessionsLoaded_.
theodab Feb 26, 2024
3a144cc
Added a test.
theodab Feb 27, 2024
33f36b4
Added timeout to jasmine externs.
theodab Feb 27, 2024
5b0335d
Made timeout less aggressive.
theodab Feb 27, 2024
699c576
Merge remote-tracking branch 'upstream/main' into offlineFailingSilen…
joeyparrish Feb 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 6 additions & 2 deletions lib/media/drm_engine.js
View file
Open in desktop
Expand Up @@ -695,14 +695,18 @@ shaka.media.DrmEngine = class {
// Create sessions.
const initDatas =
(this.currentDrmInfo_ ? this.currentDrmInfo_.initData : []) || [];
for (const initDataOverride of initDatas) {
// All initDatas with initData with a size of 0 will get ignored by the
theodab marked this conversation as resolved.
Show resolved Hide resolved
// newInitData method. Filter them out now, so that we don't hang forever
// waiting for them to finish.
const validInitDatas = initDatas.filter((id) => id.initData.length > 0);
for (const initDataOverride of validInitDatas) {
this.newInitData(
initDataOverride.initDataType, initDataOverride.initData);
}

// If we have no sessions, we need to resolve the promise right now or else
// it will never get resolved.
if (!initDatas.length) {
if (!validInitDatas.length) {
this.allSessionsLoaded_.resolve();
}

Expand Down