tamius-han/ultrawidify
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix some issues related to panning

Browse Source
This commit is contained in:
Tamius Han 2020-10-21 19:48:56 +02:00
parent c7d133ba3d
commit 7093236237
1 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/ext/lib/video-transform/Resizer.js
View File

@ -239,29 +239,29 @@ class Resizer {
this.conf.destroy(); this.conf.destroy();
} }
// pause AR on basic stretch, unpause when using other modes // pause AR on:
// for sine reason unpause doesn't unpause. investigate that later // * ar.type NOT automatic
try { // * ar.type is auto, but stretch is set to basic basic stretch
if (this.stretcher.mode === Stretch.Basic) { //
this.conf.arDetector.pause(); // unpause when using other modes
} else { if (ar.type !== AspectRatio.Automatic || this.stretcher.mode === Stretch.Basic) {
if (this.lastAr.type === AspectRatio.Automatic) { this.conf?.arDetector?.pause();
this.conf.arDetector.unpause(); } else {
} if (this.lastAr.type === AspectRatio.Automatic) {
this.conf?.arDetector?.unpause();
} }
} catch (e) { // resizer starts before arDetector. this will do nothing but fail if arDetector isn't setup
} }
// do stretch thingy // do stretch thingy
if (this.stretcher.mode === Stretch.NoStretch if (this.stretcher.mode === Stretch.NoStretch
|| this.stretcher.mode === Stretch.Conditional || this.stretcher.mode === Stretch.Conditional
|| this.stretcher.mode === Stretch.FixedSource){ || this.stretcher.mode === Stretch.FixedSource){
var stretchFactors = this.scaler.calculateCrop(ar); var stretchFactors = this.scaler.calculateCrop(ar);
this.logger.log('error', 'debug', `[Resizer::setAr] <rid:${this.resizerId}> failed to set AR due to problem with calculating crop. Error:`, stretchFactors && stretchFactors.error);
if(! stretchFactors || stretchFactors.error){ if(! stretchFactors || stretchFactors.error){
this.logger.log('error', 'debug', `[Resizer::setAr] <rid:${this.resizerId}> failed to set AR due to problem with calculating crop. Error:`, stretchFactors?.error);
if (stretchFactors?.error === 'no_video'){ if (stretchFactors?.error === 'no_video'){
this.conf.destroy(); this.conf.destroy();
return; return;
@ -309,8 +309,13 @@ class Resizer {
} }
toFixedAr() { toFixedAr() {
this.lastAr.type = AspectRatio.Fixed; // converting to fixed AR means we also turn off autoAR
this.setAr({
ar: this.lastAr.ar,
type: AspectRatio.Fixed
});
} }
resetLastAr() { resetLastAr() {
@ -339,7 +344,9 @@ class Resizer {
this.videoAlignment = VideoAlignment.Center; this.videoAlignment = VideoAlignment.Center;
// because non-fixed aspect ratios reset panning: // because non-fixed aspect ratios reset panning:
this.toFixedAr(); if (this.lastAr.type !== AspectRatio.Fixed) {
this.toFixedAr();
}
const player = this.conf.player.element; const player = this.conf.player.element;