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

Captions #1691

Closed
wants to merge 41 commits into from
Closed

Captions #1691

wants to merge 41 commits into from

Commits on Nov 11, 2014

  1. Support native captions in html5 tech.

    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.
    gkatsev committed Nov 11, 2014
    Configuration menu
    Copy the full SHA
    dd500b4 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    300161e View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2014

  1. Use custom tracks if no native textTracks support

    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.
    gkatsev committed Nov 13, 2014
    Configuration menu
    Copy the full SHA
    b98edfd View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2014

  1. Configuration menu
    Copy the full SHA
    f4976f7 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2014

  1. dispose of tracks properly

    gkatsev committed Nov 15, 2014
    Configuration menu
    Copy the full SHA
    85249f6 View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2014

  1. Configuration menu
    Copy the full SHA
    c16d96e View commit details
    Browse the repository at this point in the history
  2. Move as much as possible into techs.

    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.
    gkatsev committed Nov 17, 2014
    Configuration menu
    Copy the full SHA
    85955ae View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    15a932d View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    01096f1 View commit details
    Browse the repository at this point in the history
  5. Add tracks buttons async

    gkatsev committed Nov 17, 2014
    Configuration menu
    Copy the full SHA
    d3bd3d0 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    c315f07 View commit details
    Browse the repository at this point in the history
  7. Move addTextTrack fully into techs.

    Load up textTrackDisplay synchronously but have it do no work until the
    player is ready (see the previous commit).
    gkatsev committed Nov 17, 2014
    Configuration menu
    Copy the full SHA
    51a14c7 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    b72d7bb View commit details
    Browse the repository at this point in the history
  9. In Html5, support tech, support non native tracks

    Add a check that delegates to MediaTechController's methods if we're in
    Html5 but we are not using native tracks.
    gkatsev committed Nov 17, 2014
    Configuration menu
    Copy the full SHA
    f576e46 View commit details
    Browse the repository at this point in the history

Commits on Nov 18, 2014

  1. Configuration menu
    Copy the full SHA
    762fe71 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    04d18cc View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    712c579 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    72019bd View commit details
    Browse the repository at this point in the history
  5. A whole bunch of tests

    gkatsev committed Nov 18, 2014
    Configuration menu
    Copy the full SHA
    fde32ce View commit details
    Browse the repository at this point in the history
  6. Appease jshint.

    gkatsev committed Nov 18, 2014
    Configuration menu
    Copy the full SHA
    7117845 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    5599ded View commit details
    Browse the repository at this point in the history
  8. appease phantomjs

    gkatsev committed Nov 18, 2014
    Configuration menu
    Copy the full SHA
    db107f6 View commit details
    Browse the repository at this point in the history

Commits on Nov 19, 2014

  1. Extern/export addTextTrack

    gkatsev committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    d887506 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ed27d85 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    13bb2df View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    6a4b3fd View commit details
    Browse the repository at this point in the history
  5. Move textTracks_ into tech

    gkatsev committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    043c211 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    58ff9ae View commit details
    Browse the repository at this point in the history
  7. Update tests

    gkatsev committed Nov 19, 2014
    Configuration menu
    Copy the full SHA
    6529faa View commit details
    Browse the repository at this point in the history

Commits on Nov 25, 2014

  1. Rename volumeMenuButton's update to volumeUpdate

    MenuButton's new 'update' method conflicted with volumeMenuButton's
    update method which was used to update volume levels.
    gkatsev committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    ca3cffc View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    3ed3f26 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f39c0af View commit details
    Browse the repository at this point in the history
  4. Add a number mode to test

    gkatsev committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    0b2e856 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    f1ed990 View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    14f5748 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    dd911a5 View commit details
    Browse the repository at this point in the history
  8. Use vtt.js for track element emulation

    Remove video.js's track element emulation and pull in vtt.js to do that work instead. Add an option to force vtt.js-based captions to be used even if native caption support is present. Currently, vtt.js is loaded when the first TextTrack component is created. If vtt.js is not available when it's time to begin parsing cues, poll until it finishes downloading.
    dmlap authored and gkatsev committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    312eceb View commit details
    Browse the repository at this point in the history
  9. Finish moving lazy load

    vtt.js is now loaded at the first text track creation so don't load it in the media tech controller as well.
    dmlap authored and gkatsev committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    46625bf View commit details
    Browse the repository at this point in the history
  10. Fix styling.

    vtt.js handles captions styling so don't bother with text track styles in video-js.less anymore.
    dmlap authored and gkatsev committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    75b2b61 View commit details
    Browse the repository at this point in the history
  11. Remove obsolete cue parsing test

    Since vtt.js is parsing captions now, we don't need a unit test for captions parsing.
    dmlap authored and gkatsev committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    42a8c7a View commit details
    Browse the repository at this point in the history
  12. Allow overriding vtt.js URL

    Put the option to override the URL to vtt.js somewhere that it can be easily accessed.
    dmlap authored and gkatsev committed Nov 25, 2014
    Configuration menu
    Copy the full SHA
    2b36c26 View commit details
    Browse the repository at this point in the history