Fix problem with video sometimes being offset to the side
This commit is contained in:
parent
f028af8b98
commit
c88247df25
@ -136,9 +136,7 @@ class PlayerData {
|
|||||||
|
|
||||||
doPeriodicPlayerElementChangeCheck() {
|
doPeriodicPlayerElementChangeCheck() {
|
||||||
if (this.periodicallyRefreshPlayerElement) {
|
if (this.periodicallyRefreshPlayerElement) {
|
||||||
if (this.forceDetectPlayerElementChange()) {
|
this.forceDetectPlayerElementChange();
|
||||||
this.videoData.resizer.restore();
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -208,11 +206,22 @@ class PlayerData {
|
|||||||
updatePlayerDimensions(element) {
|
updatePlayerDimensions(element) {
|
||||||
const isFullScreen = PlayerData.isFullScreen();
|
const isFullScreen = PlayerData.isFullScreen();
|
||||||
|
|
||||||
this.dimensions = {
|
if (element.offsetWidth !== this.dimensions?.width
|
||||||
width: element.offsetWidth,
|
|| element.offsetHeight !== this.dimensions?.height
|
||||||
height: element.offsetHeight,
|
|| isFullScreen !== this.dimensions?.fullscreen) {
|
||||||
fullscreen: isFullScreen
|
|
||||||
};
|
// update dimensions only if they've changed, _before_ we do a restore (not after)
|
||||||
|
this.dimensions = {
|
||||||
|
width: element.offsetWidth,
|
||||||
|
height: element.offsetHeight,
|
||||||
|
fullscreen: isFullScreen
|
||||||
|
};
|
||||||
|
|
||||||
|
// actually re-calculate zoom when player size changes, but only if videoData.resizer
|
||||||
|
// is defined. Since resizer needs a PlayerData object to exist, videoData.resizer will
|
||||||
|
// be undefined the first time this function will run.
|
||||||
|
this.videoData.resizer?.restore();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
getPlayer() {
|
getPlayer() {
|
||||||
@ -373,17 +382,11 @@ class PlayerData {
|
|||||||
}
|
}
|
||||||
|
|
||||||
forceDetectPlayerElementChange() {
|
forceDetectPlayerElementChange() {
|
||||||
// save current dimensions before refreshing the player object
|
// Player dimension changes get calculated every time updatePlayerDimensions is called (which happens
|
||||||
const oldDimensions = this.dimensions;
|
// every time getPlayer() detects an element). If updatePlayerDimension detects dimensions were changed,
|
||||||
|
// it will always re-apply current crop, rendering this function little more than a fancy alias for
|
||||||
|
// getPlayer().
|
||||||
this.getPlayer();
|
this.getPlayer();
|
||||||
|
|
||||||
// compare new player object dimensions with the old dimensions
|
|
||||||
// don't fucking trigger changes if nothing changed
|
|
||||||
if (this.dimensions.width === this.dimensions.width && this.dimensions.height === this.dimensions.height) {
|
|
||||||
return false;
|
|
||||||
} else {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
forceRefreshPlayerElement() {
|
forceRefreshPlayerElement() {
|
||||||
|
@ -28,13 +28,15 @@ class VideoData {
|
|||||||
|
|
||||||
|
|
||||||
// POZOR: VRSTNI RED JE POMEMBEN (arDetect mora bit zadnji)
|
// POZOR: VRSTNI RED JE POMEMBEN (arDetect mora bit zadnji)
|
||||||
// NOTE: ORDERING OF OBJ INITIALIZATIONS IS IMPORTANT (arDetect needs to go last)
|
// NOTE: ORDERING OF OBJ INITIALIZATIONS IS IMPORTANT (arDetect needs to go last)
|
||||||
this.player = new PlayerData(this);
|
this.player = new PlayerData(this);
|
||||||
if (this.player.invalid) {
|
if (this.player.invalid) {
|
||||||
this.invalid = true;
|
this.invalid = true;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
this.resizer = new Resizer(this);
|
||||||
|
|
||||||
const ths = this;
|
const ths = this;
|
||||||
this.observer = new MutationObserver( (m, o) => this.onVideoDimensionsChanged(m, o, ths));
|
this.observer = new MutationObserver( (m, o) => this.onVideoDimensionsChanged(m, o, ths));
|
||||||
this.observer.observe(video, observerConf);
|
this.observer.observe(video, observerConf);
|
||||||
@ -44,7 +46,6 @@ class VideoData {
|
|||||||
height: this.video.offsetHeight,
|
height: this.video.offsetHeight,
|
||||||
};
|
};
|
||||||
|
|
||||||
this.resizer = new Resizer(this);
|
|
||||||
|
|
||||||
this.arDetector = new ArDetector(this); // this starts Ar detection. needs optional parameter that prevets ardetdctor from starting
|
this.arDetector = new ArDetector(this); // this starts Ar detection. needs optional parameter that prevets ardetdctor from starting
|
||||||
// player dimensions need to be in:
|
// player dimensions need to be in:
|
||||||
@ -158,12 +159,7 @@ class VideoData {
|
|||||||
&& this.isWithin(vh, (ph - (translateY * 2)), 2)
|
&& this.isWithin(vh, (ph - (translateY * 2)), 2)
|
||||||
&& this.isWithin(vw, (pw - (translateX * 2)), 2)) {
|
&& this.isWithin(vw, (pw - (translateX * 2)), 2)) {
|
||||||
} else {
|
} else {
|
||||||
if (this.player.forceDetectPlayerElementChange()) {
|
this.player.forceDetectPlayerElementChange();
|
||||||
this.logger.log('info', 'debug', "Video dimensions changed. Triggering restoreAr()");
|
|
||||||
this.restoreAr();
|
|
||||||
} else {
|
|
||||||
this.logger.log('info', 'playerRescan', "Video dimensions didn't change.");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
} catch(e) {
|
} catch(e) {
|
||||||
|
Loading…
Reference in New Issue
Block a user