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

fix: playlists wrongfully excluded on iOS when using ManagedMediaSource #1555

Merged
merged 3 commits into from
Nov 27, 2024
Merged

fix: playlists wrongfully excluded on iOS when using ManagedMediaSource #1555

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c66fa3e
make sure we pass mms value to browserSupportsCodec
alex-barstow Nov 26, 2024
af5e3e2
add flag to indicate whether mms is being used
alex-barstow Nov 27, 2024
c47941b
Merge branch 'main' into fix/mms-on-ios
alex-barstow Nov 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
8 changes: 5 additions & 3 deletions src/playlist-controller.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ export class PlaylistController extends videojs.EventTarget {
this.playlistExclusionDuration = playlistExclusionDuration;
this.maxPlaylistRetries = maxPlaylistRetries;
this.enableLowInitialPlaylist = enableLowInitialPlaylist;
this.usingManagedMediaSource_ = false;

if (this.useCueTags_) {
this.cueTagsTrack_ = this.tech_.addTextTrack(
Expand All @@ -221,6 +222,7 @@ export class PlaylistController extends videojs.EventTarget {
// Airplay source not yet implemented. Remote playback must be disabled.
this.tech_.el_.disableRemotePlayback = true;
this.mediaSource = new window.ManagedMediaSource();
this.usingManagedMediaSource_ = true;

videojs.log('Using ManagedMediaSource');
} else if (window.MediaSource) {
Expand Down Expand Up @@ -1997,7 +1999,7 @@ export class PlaylistController extends videojs.EventTarget {
}

// fmp4 relies on browser support, while ts relies on muxer support
const supportFunction = (isFmp4, codec) => (isFmp4 ? browserSupportsCodec(codec) : muxerSupportsCodec(codec));
const supportFunction = (isFmp4, codec) => (isFmp4 ? browserSupportsCodec(codec, this.usingManagedMediaSource_) : muxerSupportsCodec(codec));
const unsupportedCodecs = {};
let unsupportedAudio;

Expand Down Expand Up @@ -2139,11 +2141,11 @@ export class PlaylistController extends videojs.EventTarget {
const codecs = codecsForPlaylist(this.main, variant);
const unsupported = [];

if (codecs.audio && !muxerSupportsCodec(codecs.audio) && !browserSupportsCodec(codecs.audio)) {
if (codecs.audio && !muxerSupportsCodec(codecs.audio) && !browserSupportsCodec(codecs.audio, this.usingManagedMediaSource_)) {
unsupported.push(`audio codec ${codecs.audio}`);
}

if (codecs.video && !muxerSupportsCodec(codecs.video) && !browserSupportsCodec(codecs.video)) {
if (codecs.video && !muxerSupportsCodec(codecs.video) && !browserSupportsCodec(codecs.video, this.usingManagedMediaSource_)) {
unsupported.push(`video codec ${codecs.video}`);
}

Expand Down