Skip to content
This repository has been archived by the owner on Jan 12, 2019. It is now read-only.

Use getComputedStyle instead of player.width #326

Merged
merged 1 commit into from
Jun 26, 2015
Merged

Use getComputedStyle instead of player.width #326

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 10 additions & 5 deletions src/videojs-hls.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,7 +486,9 @@ videojs.Hls.prototype.selectPlaylist = function () {
oldvariant,
bandwidthBestVariant,
resolutionPlusOne,
resolutionBestVariant;
resolutionBestVariant,
playerWidth,
playerHeight;

sortedPlaylists.sort(videojs.Hls.comparePlaylistBandwidth);

Expand Down Expand Up @@ -522,6 +524,9 @@ videojs.Hls.prototype.selectPlaylist = function () {
// (this could be the lowest bitrate rendition as we go through all of them above)
variant = null;

playerWidth = parseInt(getComputedStyle(player.el()).width, 10);
playerHeight = parseInt(getComputedStyle(player.el()).height, 10);

// iterate through the bandwidth-filtered playlists and find
// best rendition by player dimension
while (i--) {
Expand All @@ -539,14 +544,14 @@ videojs.Hls.prototype.selectPlaylist = function () {

// since the playlists are sorted, the first variant that has
// dimensions less than or equal to the player size is the best
if (variant.attributes.RESOLUTION.width === player.width() &&
variant.attributes.RESOLUTION.height === player.height()) {
if (variant.attributes.RESOLUTION.width === playerWidth &&
variant.attributes.RESOLUTION.height === playerHeight) {
// if we have the exact resolution as the player use it
resolutionPlusOne = null;
resolutionBestVariant = variant;
break;
} else if (variant.attributes.RESOLUTION.width < player.width() &&
variant.attributes.RESOLUTION.height < player.height()) {
} else if (variant.attributes.RESOLUTION.width < playerWidth &&
variant.attributes.RESOLUTION.height < playerHeight) {
// if we don't have an exact match, see if we have a good higher quality variant to use
if (oldvariant && oldvariant.attributes && oldvariant.attributes.RESOLUTION &&
oldvariant.attributes.RESOLUTION.width && oldvariant.attributes.RESOLUTION.height) {
Expand Down