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

Ensure videos get aligned even when aspect ratio is not defined

Browse Source
This commit is contained in:
Tamius Han 2024-06-10 00:08:49 +02:00
parent 1c860f74fb
commit 9d0ce25be7
1 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -178,6 +178,10 @@ class Resizer {
this.destroyed = true; this.destroyed = true;
} }
getFileAr() {
return this.videoData.video.videoWidth / this.videoData.video.videoHeight;
}
calculateRatioForLegacyOptions(ar){ calculateRatioForLegacyOptions(ar){
// also present as modeToAr in Scaler.js // also present as modeToAr in Scaler.js
if (ar.type !== AspectRatioType.FitWidth && ar.type !== AspectRatioType.FitHeight && ar.ratio) { if (ar.type !== AspectRatioType.FitWidth && ar.type !== AspectRatioType.FitHeight && ar.ratio) {
@ -203,7 +207,7 @@ class Resizer {
// IMPORTANT NOTE: lastAr needs to be set after _res_setAr() is called, as _res_setAr() assumes we're // IMPORTANT NOTE: lastAr needs to be set after _res_setAr() is called, as _res_setAr() assumes we're
// setting a static aspect ratio (even if the function is called from here or ArDetect). // setting a static aspect ratio (even if the function is called from here or ArDetect).
let fileAr = this.videoData.video.videoWidth / this.videoData.video.videoHeight; let fileAr = this.getFileAr();
if (ar.type === AspectRatioType.FitWidth){ if (ar.type === AspectRatioType.FitWidth){
ar.ratio = ratioOut > fileAr ? ratioOut : fileAr; ar.ratio = ratioOut > fileAr ? ratioOut : fileAr;
@ -465,6 +469,28 @@ class Resizer {
} }
setVideoAlignment(videoAlignmentX: VideoAlignmentType, videoAlignmentY?: VideoAlignmentType) { setVideoAlignment(videoAlignmentX: VideoAlignmentType, videoAlignmentY?: VideoAlignmentType) {
// if aspect ratio is unset or initial, CSS fixes are inactive by design.
// because of that, we need to set a manual aspect ratio first.
console.log('last aspect ratio:', this.lastAr);
if (!this.lastAr) {
console.warn('[Resizer.js::setVideoAlignment] Aspect ratio not set. This is illegal. This function will do nothing.');
this.setAr({
type: AspectRatioType.Fixed,
ratio: this.getFileAr()
});
}
if ([AspectRatioType.Reset, AspectRatioType.Initial].includes(this.lastAr.type)) {
if (this.lastAr.ratio) {
this.lastAr.type = AspectRatioType.Fixed;
} else {
this.setAr({
type: AspectRatioType.Fixed,
ratio: this.getFileAr()
});
}
}
this.videoAlignment = { this.videoAlignment = {
x: videoAlignmentX ?? VideoAlignmentType.Default, x: videoAlignmentX ?? VideoAlignmentType.Default,
y: videoAlignmentY ?? VideoAlignmentType.Default y: videoAlignmentY ?? VideoAlignmentType.Default