Captions #1749
Closed
Captions #1749
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Don't auto-add the textTrackDisplay component. Add a 'featuresNativeTrack'. Currently hardcoded to false for everything except the html5 tech. Add textTracks and addTextTrack methods to html5 tech. Proxy player level methods to tech if we're using native tracks. Fix up track menu items to work with spec tracks or vjs tracks.
Also, if text tracks are old and use numerical mode values, use custom tracks. If an html tech is using custom tracks, remove track elements so we don't accidentally show both custom and native captions. Clean up showTextTrack slightly.
textTracks is completely inside of techs but needs to be called manually because techGet requires the tech to be ready. addTextTrack, unfortunately, currently forks. If when called, it doesn't have a tech, it assumes that it's a custom implementation and does the same work that MediaTechController#addTextTrack does. Don't create a flash getter for textTracks.
Load up textTrackDisplay synchronously but have it do no work until the player is ready (see the previous commit).
Add a check that delegates to MediaTechController's methods if we're in Html5 but we are not using native tracks.
MenuButton's new 'update' method conflicted with volumeMenuButton's update method which was used to update volume levels.
Instead, default to langauge or "Unknown";
IE10 and below don't support pointer-events:none, so, we want to make sure that the big play button will be clickable.
| @@ -21,7 +21,8 @@ | |||
| }, | |||
| "main": "./dist/video-js/video.js", | |||
| "dependencies": { | |||
| "videojs-swf": "4.5.3" | |||
| "videojs-swf": "4.5.3", | |||
| "vtt.js": "git+https://github.com/gkatsev/vtt.js.git#shim-build" | |||
There was a problem hiding this comment.
Do the recent merges mean we can change this to the main lib yet?
There was a problem hiding this comment.
Unfortunately, not yet. All the IE8 changes went in but the shim build stuff still need to get tweaked first.
|
@gkatsev I'll work on some of the remaining cleanup tasks. I don't see a resolution to the last chapters related question. Were you able to figure that out? |
It may belong in text track display itself as opposed in Media tech controller
|
@heff pushed TODOs. Would you want me to merge master into this branch so it's easier to merge this back into master? |
|
Thanks for handling those! Yeah, if you have a minute to merge master you're in a better place to understand merge conflicts, but otherwise I can take care of it. |
Conflicts: src/js/media/html5.js src/js/player.js
|
@heff merged in. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR supercedes the other PRs (#1736)