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

Bump to new fork version #5

Merged
merged 2 commits into from
Mar 27, 2024
Merged

Bump to new fork version #5

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
368a972
fix: mitigate uncaught type error in media_source_engine (#5069)
martinstark Mar 14, 2023
dcdf351
Bump to new fork version
swac Mar 27, 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
17 changes: 16 additions & 1 deletion lib/media/media_source_engine.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,22 @@ shaka.media.MediaSourceEngine = class {
}
}
const type = mimeType + this.config_.sourceBufferExtraFeatures;
const sourceBuffer = this.mediaSource_.addSourceBuffer(type);

this.destroyer_.ensureNotDestroyed();

let sourceBuffer;

try {
sourceBuffer = this.mediaSource_.addSourceBuffer(type);
} catch (exception) {
throw new shaka.util.Error(
shaka.util.Error.Severity.CRITICAL,
shaka.util.Error.Category.MEDIA,
shaka.util.Error.Code.MEDIA_SOURCE_OPERATION_THREW,
exception,
'The mediaSource_ status was' + this.mediaSource_.readyState +
'expected \'open\'');
}

if (sequenceMode && !streamsByType.has(ContentType.TEXT)) {
// There's no text stream, so we can set sequence mode early instead
Expand Down
4 changes: 1 addition & 3 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "@loomhq/shaka-player",
"description": "DASH/EME video player library",
"version": "4.3.4-segments-17",
"version": "4.3.4-loomfork-20240327",
"homepage": "https://github.com/shaka-project/shaka-player",
"author": "Google",
"maintainers": [
Expand Down Expand Up @@ -47,8 +47,6 @@
"karma-spec-reporter": "^0.0.34",
"karma-webdriver-launcher": "^1.0.8",
"lcevc_dil.js": "^1.1.20",
"less": "https://gitpkg.now.sh/joeyparrish/less.js/packages/less?28c63a43",
"less-plugin-clean-css": "github:austingardner/less-plugin-clean-css#4e9e77bf",
Comment on lines -50 to -51
Copy link
Author

Choose a reason for hiding this comment

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

I'm hitting some weird EINTEGRITY issue with npm because of these. I don't think they're actually used by shaka, just in some demo code within this repo.

"material-design-lite": "^1.3.0",
"mux.js": "^6.2.0",
"open-sans-fonts": "^1.6.2",
Expand Down
Loading