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(FEC-11126): upgrade shaka to 3.0.10 #139

Merged
merged 4 commits into from
Apr 12, 2021

Conversation

RoyBregman
Copy link
Contributor

@RoyBregman RoyBregman commented Apr 11, 2021

Description of the Changes

SMPTE-TT Subtitles fix

  • updated shaka to 3.0.10
  • moved useShakaTextTrackDisplay from playback.options.playback.options.html5.dash to text
  • added useShakaTextTrackDisplay in _getParsedTextTracks when creating TextTrack and kind is an empty string

depends on kaltura/kaltura-player-js#432
solves FEC-11126

CheckLists

  • changes have been done against master branch, and PR does not conflict
  • new unit / functional tests have been added (whenever applicable)
  • test are passing in local environment
  • Travis tests are passing (or test results are not worse than on master branch :))
  • Docs have been updated

dan-ziv
dan-ziv previously approved these changes Apr 12, 2021
OrenMe
OrenMe previously requested changes Apr 12, 2021
src/dash-adapter.js Outdated Show resolved Hide resolved
@@ -856,8 +858,10 @@ export default class DashAdapter extends BaseMediaSourceAdapter {
let parsedTracks = [];
if (textTracks) {
for (let i = 0; i < textTracks.length; i++) {
let kind = textTracks[i].kind ? textTracks[i].kind + 's' : '';
kind = kind === '' && this._config.useShakaTextTrackDisplay ? 'smtpe-tt-captions' : kind;
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
kind = kind === '' && this._config.useShakaTextTrackDisplay ? 'smtpe-tt-captions' : kind;
kind = kind === '' && this._config.useShakaTextTrackDisplay ? 'smpte-tt-captions' : kind;

this._shaka &&
textTrack instanceof TextTrack &&
!textTrack.active &&
(textTrack.kind === 'subtitles' || textTrack.kind === 'captions' || textTrack.kind === 'smtpe-tt-captions')
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
(textTrack.kind === 'subtitles' || textTrack.kind === 'captions' || textTrack.kind === 'smtpe-tt-captions')
(textTrack.kind === 'subtitles' || textTrack.kind === 'captions' || textTrack.kind === 'smpte-tt-captions')

Copy link
Contributor

@dan-ziv dan-ziv Apr 12, 2021

Choose a reason for hiding this comment

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

['subtitles', 'captions', 'smpte-tt-captions'].includes(textTrack.kind)

@RoyBregman RoyBregman merged commit f6268a6 into master Apr 12, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Development

Successfully merging this pull request may close these issues.

4 participants