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

Don't attempt height:auto compensation if style height compensation is active

Browse Source
This commit is contained in:
Tamius Han 2021-03-31 00:10:18 +02:00
parent 2a4a3f7192
commit 0a3627c7fe
2 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/ext/lib/video-transform/Resizer.ts
View File

@ -518,14 +518,13 @@ class Resizer {
* @param realVideoHeight real video height * @param realVideoHeight real video height
* @param playerWidth player width * @param playerWidth player width
* @param playerHeight player height * @param playerHeight player height
* @param mode whether to
*/ */
computeAutoHeightCompensationFactor(realVideoWidth: number, realVideoHeight: number, playerWidth: number, playerHeight: number): number { computeAutoHeightCompensationFactor(realVideoWidth: number, realVideoHeight: number, playerWidth: number, playerHeight: number, mode: 'height' | 'width'): number {
const widthFactor = playerWidth / realVideoWidth; const widthFactor = playerWidth / realVideoWidth;
const heightFactor = playerHeight / realVideoHeight; const heightFactor = playerHeight / realVideoHeight;
console.warn('wf:', widthFactor, 'hf:', heightFactor); return mode === 'height' ? heightFactor : widthFactor;
return widthFactor < heightFactor ? widthFactor : heightFactor;
} }
computeOffsets(stretchFactors: VideoDimensions){ computeOffsets(stretchFactors: VideoDimensions){
@ -535,10 +534,14 @@ class Resizer {
// correct any remaining element size discrepencies (applicable only to certain crop strategies!) // correct any remaining element size discrepencies (applicable only to certain crop strategies!)
// NOTE: it's possible that we might also need to apply a similar measure for CropPillarbox strategy // NOTE: it's possible that we might also need to apply a similar measure for CropPillarbox strategy
// (but we'll wait for bug reports before doing so) // (but we'll wait for bug reports before doing so).
// We also don't compensate for height:auto if height is provided via element style
let autoHeightCompensationFactor; let autoHeightCompensationFactor;
if (stretchFactors.cropStrategy === CropStrategy.CropLetterbox) { if (
autoHeightCompensationFactor = this.computeAutoHeightCompensationFactor(realVideoWidth, realVideoHeight, this.conf.player.dimensions.width, this.conf.player.dimensions.height); stretchFactors.cropStrategy === CropStrategy.CropLetterbox
&& (!stretchFactors.styleHeightCompensationFactor || stretchFactors.styleHeightCompensationFactor === 1)
) {
autoHeightCompensationFactor = this.computeAutoHeightCompensationFactor(realVideoWidth, realVideoHeight, this.conf.player.dimensions.width, this.conf.player.dimensions.height, 'height');
stretchFactors.xFactor *= autoHeightCompensationFactor; stretchFactors.xFactor *= autoHeightCompensationFactor;
stretchFactors.yFactor *= autoHeightCompensationFactor; stretchFactors.yFactor *= autoHeightCompensationFactor;
} }
@ -585,7 +588,7 @@ class Resizer {
'\nplayer dimensions: ', {w: this.conf.player.dimensions.width, h: this.conf.player.dimensions.height}, '\nplayer dimensions: ', {w: this.conf.player.dimensions.width, h: this.conf.player.dimensions.height},
'\nvideo dimensions: ', {w: this.conf.video.offsetWidth, h: this.conf.video.offsetHeight}, '\nvideo dimensions: ', {w: this.conf.video.offsetWidth, h: this.conf.video.offsetHeight},
'\nreal video dimensions:', {w: realVideoWidth, h: realVideoHeight}, '\nreal video dimensions:', {w: realVideoWidth, h: realVideoHeight},
'\nauto compensation: ', autoHeightCompensationFactor, '\nauto compensation: ', 'x', autoHeightCompensationFactor,
'\nstretch factors: ', stretchFactors, '\nstretch factors: ', stretchFactors,
'\npan & zoom: ', this.pan, this.zoom.scale, '\npan & zoom: ', this.pan, this.zoom.scale,
'\nwdiff, hdiff: ', wdiff, 'x', hdiff, '\nwdiff, hdiff: ', wdiff, 'x', hdiff,

2
src/ext/lib/video-transform/Scaler.ts
View File

@ -26,6 +26,7 @@ export type VideoDimensions = {
yFactor?: number; yFactor?: number;
cropStrategy?: number; cropStrategy?: number;
arCorrectionFactor?: number; arCorrectionFactor?: number;
styleHeightCompensationFactor?: number;
actualWidth?: number; actualWidth?: number;
actualHeight?: number; actualHeight?: number;
} }
@ -182,6 +183,7 @@ class Scaler {
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, arCorrectionFactor: arCorrectionFactor,
styleHeightCompensationFactor: heightCompensationFactor
} }
this.calculateCropCore(videoDimensions, ar.ratio, streamAr, playerAr) this.calculateCropCore(videoDimensions, ar.ratio, streamAr, playerAr)