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.

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: Prefer SimpleTextDisplayer on iOS #7569

Merged
merged 5 commits into from
Nov 13, 2024
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
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
12 changes: 10 additions & 2 deletions demo/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -1347,8 +1347,16 @@ shakaDemo.Main = class {
} else {
this.controls_.setEnabledShakaControls(true);
this.controls_.setEnabledNativeControls(false);
// This will force the player to use UITextDisplayer.
this.player_.setVideoContainer(this.container_);
// On devices where the Fullscreen API is not available we prefer
// SimpleTextDisplayer because it works with the Fullscreen API
// of the video element itself.
if (document.fullscreenEnabled) {
// This will force the player to use UITextDisplayer.
this.player_.setVideoContainer(this.container_);
} else {
// This will force the player to use SimpleTextDisplayer.
this.player_.setVideoContainer(null);
}
}

await this.drmConfiguration_(asset);
Expand Down
7 changes: 7 additions & 0 deletions lib/text/ui_text_displayer.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ goog.provide('shaka.text.UITextDisplayer');

goog.require('goog.asserts');
goog.require('shaka.Deprecate');
goog.require('shaka.log');
goog.require('shaka.text.Cue');
goog.require('shaka.text.CueRegion');
goog.require('shaka.text.Utils');
Expand All @@ -35,6 +36,12 @@ shaka.text.UITextDisplayer = class {
constructor(video, videoContainer, config) {
goog.asserts.assert(videoContainer, 'videoContainer should be valid.');

if (!document.fullscreenEnabled) {
joeyparrish marked this conversation as resolved.
Show resolved Hide resolved
shaka.log.alwaysWarn('Using UITextDisplayer in a browser without ' +
'Fullscreen API support causes subtitles to not be rendered in ' +
'fullscreen');
}

/** @private {boolean} */
this.isTextVisible_ = false;

Expand Down
Loading