Skip to content

fix: Add WebKit FairPlay DRM fallback for AirPlay on newer OS versions #1277

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
cjpillsbury merged 14 commits into from
Feb 26, 2026
+724 −183
Merged

fix: Add WebKit FairPlay DRM fallback for AirPlay on newer OS versions #1277

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
8f7126b
Copied Webkit Fairplay module
spuppo-mux Feb 16, 2026
5ec8e7b
Renamed setupEmeNativeFairplayDRM and connected webkit fallback
spuppo-mux Feb 16, 2026
1116e06
Added comments with DRM setup steps
spuppo-mux Feb 16, 2026
e5d18c1
Added more comments and moved code to follow 'step' order
spuppo-mux Feb 16, 2026
7449d3d
(WIP) Fixing fallback function
spuppo-mux Feb 18, 2026
ccbbbaf
Switched fallback approach
spuppo-mux Feb 18, 2026
f66b8e7
Preparing setupEmeNativeFairplayDRM to move into anew file
spuppo-mux Feb 18, 2026
8a2edc6
Moved EME logic to it's own module
spuppo-mux Feb 18, 2026
6c2b6d3
Reorganized Webkit code and added comments
spuppo-mux Feb 19, 2026
1ecdec1
Moved teardown event setup inside DRM setup. Fixed more comments
spuppo-mux Feb 19, 2026
8a33f74
Lint fixes
spuppo-mux Feb 19, 2026
6992d12
Combined interfaces into a common one
spuppo-mux Feb 20, 2026
ce8699a
Comments and added a {once:true} option on webkit teardown for consit…
spuppo-mux Feb 24, 2026
a0c0c58
Moved listeners to be removed first and then close the session.
R-Delfino95 Feb 25, 2026
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
9 changes: 6 additions & 3 deletions packages/mux-audio/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import {
getStartDate,
getCurrentPdt,
getEnded,
getCoreReference,
toPlaybackIdParts,
} from '@mux/playback-core';
import type {
Expand Down Expand Up @@ -65,7 +66,6 @@ class MuxAudioElement extends CustomAudioElement implements Partial<MuxMediaProp
return [...AttributeNameValues, ...(CustomAudioElement.observedAttributes ?? [])];
}

#core?: PlaybackCore;
#loadRequested?: Promise<void> | null;
#defaultPlayerInitTime: number | undefined;
#metadata: Readonly<Metadata> = {};
Expand All @@ -77,6 +77,10 @@ class MuxAudioElement extends CustomAudioElement implements Partial<MuxMediaProp
this.#defaultPlayerInitTime = generatePlayerInitTime();
}

get #core(): PlaybackCore | undefined {
return getCoreReference(this.nativeEl);
}

get playerInitTime() {
if (!this.hasAttribute(Attributes.PLAYER_INIT_TIME)) return this.#defaultPlayerInitTime;
return +(this.getAttribute(Attributes.PLAYER_INIT_TIME) as string) as number;
Expand Down Expand Up @@ -464,12 +468,11 @@ class MuxAudioElement extends CustomAudioElement implements Partial<MuxMediaProp
}

load() {
this.#core = initialize(this as Partial<MuxMediaProps>, this.nativeEl, this.#core);
initialize(this as Partial<MuxMediaProps>, this.nativeEl, this.#core);
}

unload() {
teardown(this.nativeEl, this.#core);
this.#core = undefined;
}

attributeChangedCallback(attrName: string, oldValue: string | null, newValue: string | null) {
Expand Down
9 changes: 6 additions & 3 deletions packages/mux-video/src/base.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import {
getChapters,
toPlaybackIdFromSrc,
toPlaybackIdParts,
getCoreReference,
// isMuxVideoSrc,
} from '@mux/playback-core';
import type {
Expand Down Expand Up @@ -103,7 +104,6 @@ export class MuxVideoBaseElement extends CustomVideoElement implements IMuxVideo
return [...AttributeNameValues, ...(CustomVideoElement.observedAttributes ?? [])];
}

#core?: PlaybackCore;
#loadRequested?: Promise<void> | null;
#defaultPlayerInitTime: number | undefined;
#metadata: Metadata = {};
Expand Down Expand Up @@ -173,6 +173,10 @@ export class MuxVideoBaseElement extends CustomVideoElement implements IMuxVideo
});
}

get #core(): PlaybackCore | undefined {
return getCoreReference(this.nativeEl);
}

get preferCmcd() {
return (this.getAttribute(Attributes.PREFER_CMCD) as ValueOf<CmcdTypes>) ?? undefined;
}
Expand Down Expand Up @@ -796,12 +800,11 @@ export class MuxVideoBaseElement extends CustomVideoElement implements IMuxVideo
}

load() {
this.#core = initialize(this as Partial<MuxMediaProps>, this.nativeEl, this.#core);
initialize(this as Partial<MuxMediaProps>, this.nativeEl, this.#core);
}

unload() {
teardown(this.nativeEl, this.#core, this as Partial<MuxMediaProps>);
this.#core = undefined;
}

attributeChangedCallback(attrName: string, oldValue: string | null, newValue: string | null) {
Expand Down
Loading
Loading