Skip to content

Feature/restrictions #36

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 14 commits into from
Mar 17, 2015
Merged

Feature/restrictions #36

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
d1995d3
Add max and min bandwidth properties to restrictions
Mar 12, 2015
07a7824
Add check for min and max Bandwidth in setRestrictions
Mar 12, 2015
a7fa082
Pass restrictions object into emeManager
Mar 12, 2015
ce9ee3a
Declare restrictions object on player
Mar 12, 2015
2d47d3d
Correct contstructor documentation
Mar 12, 2015
7e84509
Add getter and setter for restrictions
Mar 12, 2015
dca4474
Refactor getRestrictions to use clone method
Mar 12, 2015
c1f6ed8
Refactor player.setRestrictions()
Mar 13, 2015
56cb4a2
Refactor emeManager to accept player as arg
Mar 13, 2015
97715f7
Remove restrictions arg from eme instantiation
Mar 13, 2015
b9f921a
Correct emeManager argument order
Mar 16, 2015
f3d76e8
Call setRestrictions() from player reference
Mar 16, 2015
3c33313
Modify restrictions clone() method to replace @struct on Restrictions
Mar 16, 2015
5672cae
Change setRestrictions to throw TypeError
Mar 17, 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
Prev Previous commit
Next Next commit
Declare restrictions object on player
  • Loading branch information
Sanborn Hilland committed Mar 12, 2015
commit ce9ee3a06cfa93b54b1f8c2ba645c956030c7b27
7 changes: 6 additions & 1 deletion lib/player/player.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,9 @@ shaka.player.Player = function(video) {

/** @private {boolean} */
this.adaptationEnabled_ = true;

/** @private {!shaka.player.DrmSchemeInfo.Restrictions} */
this.restrictions_ = new shaka.player.DrmSchemeInfo.Restrictions();
};
goog.inherits(shaka.player.Player, shaka.util.FakeEventTarget);

Expand Down Expand Up @@ -276,8 +279,10 @@ shaka.player.Player.prototype.load = function(videoSource) {
).then(shaka.util.TypedBind(this,
function() {
this.videoSource_ = videoSource;
this.videoSource_.setRestrictions(this.restrictions_);
this.emeManager_ =
new shaka.media.EmeManager(this, this.video_, this.videoSource_);
new shaka.media.EmeManager(
this, this.video_, this.videoSource_, this.restrictions_);
return this.emeManager_.initialize();
})
).then(shaka.util.TypedBind(this,
Expand Down