Skip to content

Feature/get adaptation state #31

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.

Sign up for GitHub

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

Merged
joeyparrish merged 2 commits into from
Mar 11, 2015
Merged

Feature/get adaptation state #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b1c0c19
Add name to AUTHORS and CONTRIBUTORS files
Mar 11, 2015
34e3aba
Add getter for state of automatic adaptation
Mar 11, 2015
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
1 change: 1 addition & 0 deletions AUTHORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@
# Please keep the list sorted.

Google Inc. <*@google.com>
Sanborn Hilland <sanbornh@rogers.com>
1 change: 1 addition & 0 deletions CONTRIBUTORS
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,6 @@

Joey Parrish <joeyparrish@google.com>
Natalie Harris <natalieharris@google.com>
Sanborn Hilland <sanbornh@rogers.com>
Timothy Drews <tdrews@google.com>
Vasanth Polipelli <vasanthap@google.com>
9 changes: 9 additions & 0 deletions lib/player/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1008,6 +1008,15 @@ shaka.player.Player.prototype.enableAdaptation = function(enabled) {
};


/**
* @return {boolean} Return true if automatic bitrate adaptation enabled.
* @export
*/
shaka.player.Player.prototype.getAdaptationEnabled = function() {
return this.adaptationEnabled_;
};


/**
* @return {number} Current playback time in seconds.
* @export
Expand Down