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

started some work on stretcher

Browse Source
This commit is contained in:
Tamius Han 2018-05-28 23:56:44 +02:00
parent 0871ad6d97
commit 2bf5a07bc5
1 changed files with 81 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
js/modules/Stretcher.js
View File

@ -62,35 +62,101 @@ class Stretcher {
yFactor: 1 yFactor: 1
}; };
if (actualAr > videoAr) { if(playerAr >= videoAr){ž
if(videoAr > playerAr) { // player adds PILLARBOX
if(actualAr >= playerAr){
// actual > player > video
stretchFactors.xFactor = videoAr / playerAr;
stretchFactors.yFactor = actualAr / playerAr
if(Debug.debug){ if(Debug.debug){
console.log("[Stretcher.js::calculateStretch] stretching strategy 1") console.log("[Stretcher.js::calculateStretch] stretching strategy 1")
} }
stretchFactors.xFactor = playerAr / videoAr; // is this 1 then? } else if ( actualAr >= videoAr) {
stretchFactors.yFactor = actualAr / videoAr; // player > actual > video — letterbox & pillarbox
} else { // we need vertical stretch to remove black bars in video
// we need horizontal stretch to make video fit width
stretchFactors.xFactor = actualAr / videoAr;
stretchFactors.yFactor = actualAr / playerAr;
if(Debug.debug){ if(Debug.debug){
console.log("[Stretcher.js::calculateStretch] stretching strategy 2") console.log("[Stretcher.js::calculateStretch] stretching strategy 2")
} }
stretchFactors.xFactor = playerAr / videoAr; } else {
stretchFactors.yFactor = actualAr / videoAr; // player > video > actual — double pillarbox
} stretchFactors.xFactor = actualAr / playerAr;
} else { stretchFactors.yFactor = 1;
if (videoAr > playerAr) {
if(Debug.debug){ if(Debug.debug){
console.log("[Stretcher.js::calculateStretch] stretching strategy 3") console.log("[Stretcher.js::calculateStretch] stretching strategy 3")
} }
stretchFactors.xFactor = videoAr / actualAr; }
stretchFactors.yFactor = playerAr / actualAr; } else {
} else { // player adds LETTERBOX
if (actualAr < playerAr) {
// video > player > actual
// actual has pillarbox (same height as video)
stretchFactors.xFactor = actualAr / playerAr;
stretchFactors.yFactor = videoAr / playerAr;
if(Debug.debug){ if(Debug.debug){
console.log("[Stretcher.js::calculateStretch] stretching strategy 4") console.log("[Stretcher.js::calculateStretch] stretching strategy 4")
} }
stretchFactors.xFactor = playerAr / actualAr; } else if ( actualAr < videoAr ) {
stretchFactors.yFactor = 1; // video > actual > player
// video is letterboxed by player
// actual is pillarboxed by video
stretchFactors.xFactor = actualAr / playerAr;
stretchFActors.yFactor = actualAr / playerAr;
if(Debug.debug){
console.log("[Stretcher.js::calculateStretch] stretching strategy 5")
}
} else {
// actual > video > player
// actual fits width. Letterboxed by both.
stretchFactors.xFactor = 1;
stretchFactors.yFactor = actualAr / playerAr;
if(Debug.debug){
console.log("[Stretcher.js::calculateStretch] stretching strategy 6")
}
} }
} }
// if (actualAr > videoAr) {
// if(videoAr > playerAr) {
// // actual ar > video ar > player ar
// // stretch to fit player
// // stretchFactors.xFactor = playerAr / videoAr; // is this 1 then?
// stretchFactors.xFactor = 1;
// stretchFactors.yFactor = actualAr / playerAr;
// } else {
// // actual ar > player ar > video ar
// if(Debug.debug){
// console.log("[Stretcher.js::calculateStretch] stretching strategy 2")
// }
// stretchFactors.xFactor = 1; //playerAr / videoAr;
// stretchFactors.yFactor = actualAr / videoAr;
// }
// } else {
// if (videoAr > playerAr) {
// if(Debug.debug){
// console.log("[Stretcher.js::calculateStretch] stretching strategy 3")
// }
// stretchFactors.xFactor = videoAr / actualAr;
// stretchFactors.yFactor = playerAr / actualAr;
// } else {
// if(Debug.debug){
// console.log("[Stretcher.js::calculateStretch] stretching strategy 4")
// }
// stretchFactors.xFactor = playerAr / actualAr;
// stretchFactors.yFactor = 1;
// }
// }
return stretchFactors; return stretchFactors;
} }
} }