Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: mangui/video-js-swf
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: pivotshare/video-js-swf
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 17 commits
  • 15 files changed
  • 2 contributors

Commits on Jul 27, 2015

  1. Upgrade FlasHLS to v0.4.1.2

    @hparra
    hparra committed Jul 27, 2015
    Configuration menu
    Copy the full SHA
    cb9ad59 View commit details
    Browse the repository at this point in the history

Commits on Jul 30, 2015

  1. Always use StageVideo instead of Video 

    Reasoning based on Adobe's [Best Practices for High Performing and Efficient Flash Video](http://blogs.adobe.com/flashplayer/2015/04/best-practices-for-high-performing-and-efficient-flash-video.html).
    @hparra
    hparra committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    137cec3 View commit details
    Browse the repository at this point in the history

  2. Map HLS.currentLevel as level 

    This saves us from having to change IProvider interface with possibly needless currentLevel and nextLevel bindings. This also lowers the boundry for implementing this interface for HTML5 tech.
    @hparra
    hparra committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    da09f30 View commit details
    Browse the repository at this point in the history

  3. Add getter for HLS levels 

    Array of HLS provider levels, which contain all possible bitrates, and may also include names and height/width, if these were specified in the manifest.
    @hparra
    hparra committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    6fc4c3d View commit details
    Browse the repository at this point in the history

  4. Update SWF with pivotshare/video-js-swf#feature-accelerated

    @hparra
    hparra committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    d5f65c5 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'feature-accelerated' 

    This includes StageVideo accelerated playback and necessary interfaces to enable HLS stream selection.
    @hparra
    hparra committed Jul 30, 2015
    Configuration menu
    Copy the full SHA
    8203c81 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2015

  1. Add pivotshare/flashls as submodule

    @hparra
    hparra committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    7111619 View commit details
    Browse the repository at this point in the history

  2. Modify Gruntfile to build using FlasHLS submodule. 

    Read `debug` of SWF to determine which version nof FlasHLS to use. Resulting SWF build not included.
    @hparra
    hparra committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    73a9b5e View commit details
    Browse the repository at this point in the history

  3. Update SWF to FlasHLS dev branch 

    Now at pivotshare/flashls#b6fa7878a9475aa688a44aa774f4a78c9a120c17
    @hparra
    hparra committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    39d2c0d View commit details
    Browse the repository at this point in the history

  4. Gruntfile: Build FlasHLS submodule as part of VideoJS build task 

    Places resulting SWC in location of previous static build. Building from here does NOT modify FlasHLS repo. Respects VideoJS's debug flag.
    @hparra
    hparra committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    455770b View commit details
    Browse the repository at this point in the history

  5. Add watch task to Gruntfile 

    Also added `npm start` and `npm run build`.
    @hparra
    hparra committed Aug 20, 2015
    Configuration menu
    Copy the full SHA
    7aa4221 View commit details
    Browse the repository at this point in the history

Commits on Aug 22, 2015

  1. Enable debug build using VIDEO_JS_SWF_DEBUG env var

    @hparra
    hparra committed Aug 22, 2015
    Configuration menu
    Copy the full SHA
    110aa87 View commit details
    Browse the repository at this point in the history

Commits on Sep 1, 2015

  1. Update pivothshare/flashls 

    Uses latest FragmentLoader
    @hparra
    hparra committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    9aa3d1e View commit details
    Browse the repository at this point in the history

  2. [VideoJS] Remove Copyright from contextMenu

    @hparra
    hparra committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    6af8525 View commit details
    Browse the repository at this point in the history

  3. [Gruntfile] Refactor to eliminate needless mxmlc.options 

    None of this information was being forwarded to build!
    @hparra
    hparra committed Sep 1, 2015
    Configuration menu
    Copy the full SHA
    63179df View commit details
    Browse the repository at this point in the history

Commits on Sep 10, 2015

  1. [Build] With pivotshare/flashls#rework-fragmentloader

    @hparra
    hparra committed Sep 10, 2015
    Configuration menu
    Copy the full SHA
    6e65a93 View commit details
    Browse the repository at this point in the history

Commits on Sep 12, 2015

  1. [Build] Fix edge case with Fragment fixing 

    See pivotshare/flashls#rework-fragmentloader
    @hparra
    hparra committed Sep 12, 2015
    Configuration menu
    Copy the full SHA
    98d0f1d View commit details
    Browse the repository at this point in the history
Loading