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

Anti-recursing measures

Browse Source
This commit is contained in:
Tamius Han 2021-01-31 17:44:24 +01:00
parent 78c04523c0
commit f3a9c06f92
2 changed files with 36 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
src/ext/lib/video-transform/Scaler.js
View File

@ -117,7 +117,7 @@ class Scaler {
} }
if (ar.type === AspectRatio.Reset){ if (ar.type === AspectRatio.Reset){
return {xFactor: arCorrectionFactor, yFactor: arCorrectionFactor} return {xFactor: arCorrectionFactor, yFactor: arCorrectionFactor, arCorrectionFactor: arCorrectionFactor}
} }
// handle fuckie-wuckies // handle fuckie-wuckies
@ -151,13 +151,28 @@ class Scaler {
yFactor: 1, yFactor: 1,
actualWidth: 0, // width of the video (excluding pillarbox) when <video> tag height is equal to width actualWidth: 0, // width of the video (excluding pillarbox) when <video> tag height is equal to width
actualHeight: 0, // height of the video (excluding letterbox) when <video> tag height is equal to height actualHeight: 0, // height of the video (excluding letterbox) when <video> tag height is equal to height
arCorrectionFactor: arCorrectionFactor,
} }
this.calculateCropCore(videoDimensions, ar.ratio, streamAr, playerAr)
return videoDimensions;
}
/**
* The act of calculating aspect ratio is separated due to resue elsewhere in the extension.
* We are doing that to avoid surprise recursions.
* @param {*} videoDimensions
* @param {*} ar
* @param {*} streamAr
* @param {*} playerAr
*/
calculateCropCore(videoDimensions, ar, streamAr, playerAr) {
if (streamAr < playerAr) { if (streamAr < playerAr) {
if (streamAr < ar.ratio){ if (streamAr < ar){
// in this situation we have to crop letterbox on top/bottom of the player // in this situation we have to crop letterbox on top/bottom of the player
// we cut it, but never more than the player // we cut it, but never more than the player
videoDimensions.xFactor = Math.min(ar.ratio, playerAr) / streamAr; videoDimensions.xFactor = Math.min(ar, playerAr) / streamAr;
videoDimensions.yFactor = videoDimensions.xFactor; videoDimensions.yFactor = videoDimensions.xFactor;
} else { } else {
// in this situation, we would be cutting pillarbox. Inside horizontal player. // in this situation, we would be cutting pillarbox. Inside horizontal player.
@ -166,7 +181,7 @@ class Scaler {
videoDimensions.yFactor = 1; videoDimensions.yFactor = 1;
} }
} else { } else {
if (streamAr < ar.ratio || playerAr < ar.ratio){ if (streamAr < ar || playerAr < ar){
// in this situation, we need to add extra letterbox on top of our letterbox // in this situation, we need to add extra letterbox on top of our letterbox
// this means we simply don't crop anything _at all_ // this means we simply don't crop anything _at all_
videoDimensions.xFactor = 1; videoDimensions.xFactor = 1;
@ -182,35 +197,11 @@ class Scaler {
this.logger.log('info', 'scaler', "[Scaler::calculateCrop] Crop factor calculated — ", videoDimensions.xFactor); this.logger.log('info', 'scaler', "[Scaler::calculateCrop] Crop factor calculated — ", videoDimensions.xFactor);
// Workaround for Chrome/Edge issue where zooming too much results in video being stretched incorrectly // correct the scale factor
/** if (videoDimensions.arCorrectionFactor) {
* Bug description — if the following are true: videoDimensions.xFactor *= videoDimensions.arCorrectionFactor;
* * user is using Chrome or Edge (but surprisingly not Opera) videoDimensions.yFactor *= videoDimensions.arCorrectionFactor;
* * user is using hardware acceleration
* * user is using a noVideo card
* * user is in full screen mode
* Then the video will do Stretch.Basic no matter what you put in `transform: scale(x,y)`.
*
* Because this issue happens regardless of how you upscale the video (doesn't matter if you use transform:scale
* or width+height or anything else), the aspect ratio needs to be limited _before_ applying arCorrectionFactor
* (note that arCorrectionFactor is usually <= 1, as it conpensates for zooming that height=[>100%] on <video>
* style attribute does).
*
* This method is also repeated in calculate stretch method.
*/
if (BrowserDetect.anyChromium && this.conf.player?.isFullScreen && this.conf.player?.dimensions?.fullscreen) {
const maxSafeAr = (window.innerWidth * 0.995) / window.innerHeight;
videoDimensions.xFactor = Math.min(videoDimensions.xFactor, maxSafeAr);
videoDimensions.yFactor = Math.min(videoDimensions.yFactor, maxSafeAr);
} }
// correct the factors
videoDimensions.xFactor *= arCorrectionFactor;
videoDimensions.yFactor *= arCorrectionFactor;
return videoDimensions;
} }
} }

16
src/ext/lib/video-transform/Stretcher.js
View File

@ -271,15 +271,21 @@ squeezeFactor: ${squeezeFactor}`, '\nvideo', this.conf.video);
return; return;
} }
const maxSafeStretchFactor = this.conf.resizer.scaler.calculateCrop({type: AspectRatio.Fixed, ratio: maxSafeAr}).xFactor; const maxSafeStretchFactor = this.conf.resizer.scaler.calculateCropCore(
{
xFactor: 1,
yFactor: 1,
arCorrectionFactor: stretchFactors.arCorrectionFactor
},
maxSafeAr,
streamAr,
playerAr
).xFactor;
console.info('Stretch factors before:', stretchFactors.xFactor, stretchFactors.yFactor, "max safe:", maxSafeStretchFactor, "max safe ar:", maxSafeAr); // console.info('Stretch factors before:', stretchFactors.xFactor, stretchFactors.yFactor, "max safe:", maxSafeStretchFactor, "max safe ar:", maxSafeAr);
stretchFactors.xFactor = Math.min(stretchFactors.xFactor, maxSafeStretchFactor); stretchFactors.xFactor = Math.min(stretchFactors.xFactor, maxSafeStretchFactor);
stretchFactors.yFactor = Math.min(stretchFactors.yFactor, maxSafeStretchFactor); stretchFactors.yFactor = Math.min(stretchFactors.yFactor, maxSafeStretchFactor);
console.info('Stretch factors after:', stretchFactors.xFactor, stretchFactors.yFactor);
} }
} }
} }