LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Revert "Revert "Fix original and livestream quality switch behavior""

Browse source 
This reverts commit 7effcd69e8.
This commit is contained in:
Rafael 2022-04-26 18:55:44 -03:00 committed by Thomas Zarebczan
parent 7effcd69e8
commit 3ac57776e9
1 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
ui/component/viewers/videoViewer/internal/plugins/videojs-hls-quality-selector/plugin.js
View file

@ -186,7 +186,8 @@ class HlsQualitySelectorPlugin {
selected: defaultQuality ? currentHeight === defaultQuality : undefined, selected: defaultQuality ? currentHeight === defaultQuality : undefined,
}); });
const isLiveOriginal = defaultQuality && defaultQuality === QUALITY_OPTIONS.ORIGINAL && player.isLivestream; // Stop at index 0 since the list starts from max quality
const isLiveOriginal = defaultQuality === QUALITY_OPTIONS.ORIGINAL && player.isLivestream && i === 0;
const shouldCheckHeight = const shouldCheckHeight =
defaultQuality && !nextLowestQualityItem && (currentHeight <= defaultQuality || isLiveOriginal); defaultQuality && !nextLowestQualityItem && (currentHeight <= defaultQuality || isLiveOriginal);
@ -197,6 +198,7 @@ class HlsQualitySelectorPlugin {
value: currentHeight, value: currentHeight,
selected: true, selected: true,
}; };
this.setQuality(currentHeight);
} }
levelItems.push(levelItem); levelItems.push(levelItem);
@ -207,7 +209,6 @@ class HlsQualitySelectorPlugin {
levelItems = levelItems.map((item) => levelItems = levelItems.map((item) =>
item === nextLowestQualityItem ? this.getQualityMenuItem.call(this, nextLowestQualityItemObj) : item item === nextLowestQualityItem ? this.getQualityMenuItem.call(this, nextLowestQualityItemObj) : item
); );
this._currentQuality = nextLowestQualityItemObj.value;
} }
levelItems.sort((current, next) => { levelItems.sort((current, next) => {
@ -224,6 +225,9 @@ class HlsQualitySelectorPlugin {
}); });
if (!player.isLivestream) { if (!player.isLivestream) {
const videoEl = document.querySelector('.vjs-tech');
const didSwitch = videoEl.getAttribute('switched-from-default');
levelItems.push( levelItems.push(
this.getQualityMenuItem.call(this, { this.getQualityMenuItem.call(this, {
label: this.resolveOriginalQualityLabel(false, true), label: this.resolveOriginalQualityLabel(false, true),
@ -231,6 +235,12 @@ class HlsQualitySelectorPlugin {
selected: defaultQuality ? defaultQuality === QUALITY_OPTIONS.ORIGINAL : false, selected: defaultQuality ? defaultQuality === QUALITY_OPTIONS.ORIGINAL : false,
}) })
); );
if (defaultQuality === QUALITY_OPTIONS.ORIGINAL && !didSwitch) {
this.swapSrcTo(QUALITY_OPTIONS.ORIGINAL);
// Add this attribute to the video player so later it can be checked and avoid switching again
// Since this is only for initial load, based on the default quality setting
videoEl.setAttribute('switched-from-default', true);
}
} }
levelItems.push( levelItems.push(