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

fixed autodetection on netflix (and anywhere with fallbackMode, hopefully)

Browse Source
This commit is contained in:
Tamius Han 2018-07-10 21:58:26 +02:00
parent a4f0c9db4d
commit 0825dacdb8
3 changed files with 24 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/conf/Debug.js
View File

@ -21,6 +21,8 @@ Debug = {
debugDetection: true debugDetection: true
}, },
debugCanvas: { debugCanvas: {
// enabled: true,
// guardLine: true
enabled: false, enabled: false,
guardLine: false guardLine: false
} }

11
js/lib/PlayerData.js
View File

@ -225,10 +225,15 @@ class PlayerData {
checkPlayerSizeChange(){ checkPlayerSizeChange(){
if(Debug.debug){ if(Debug.debug){
if(this.element == undefined) if(this.element == undefined){
console.log("[PlayerDetect] player size changed. reason: player element undefined"); // return true;
}
if(this.dimensions.fullscreen){ // if(!this.dimensions) {
// return true;
// }
if(this.dimensions && this.dimensions.fullscreen){
if(! PlayerData.isFullScreen()){ if(! PlayerData.isFullScreen()){
console.log("[PlayerDetect] player size changed. reason: exited fullscreen"); console.log("[PlayerDetect] player size changed. reason: exited fullscreen");
} }

18
js/modules/ArDetect.js
View File

@ -536,14 +536,14 @@ class ArDetector {
//#endregion //#endregion
// this means we don't have letterbox // this means we don't have letterbox
if ( currentMaxVal > (this.blackLevel + ExtensionConf.arDetect.blackbarTreshold) || (currentMaxVal - currentMinVal) > ExtensionConf.arDetect.blackbarTreshold ){ if ( currentMaxVal > (this.blackLevel + ExtensionConf.arDetect.blackbarTreshold) || (currentMaxVal - currentMinVal) > ExtensionConf.arDetect.blackbarTreshold*4 ){
// Če ne zaznamo letterboxa, kličemo reset. Lahko, da je bilo razmerje stranic popravljeno na roke. Možno je tudi, // Če ne zaznamo letterboxa, kličemo reset. Lahko, da je bilo razmerje stranic popravljeno na roke. Možno je tudi,
// da je letterbox izginil. // da je letterbox izginil.
// If we don't detect letterbox, we reset aspect ratio to aspect ratio of the video file. The aspect ratio could // If we don't detect letterbox, we reset aspect ratio to aspect ratio of the video file. The aspect ratio could
// have been corrected manually. It's also possible that letterbox (that was there before) disappeared. // have been corrected manually. It's also possible that letterbox (that was there before) disappeared.
if(Debug.debug){ if(Debug.debug){
console.log("%c[ArDetect::_ard_vdraw] no edge detected. canvas has no edge.", "color: #aaf"); console.log(`%c[ArDetect::_ard_vdraw] no edge detected. canvas has no edge.\ncurrentMaxVal: ${currentMaxVal}\nBlack level (+ treshold):${this.blackLevel} (${this.blackLevel + ExtensionConf.arDetect.blackbarTreshold})\n---diff test---\nmaxVal-minVal: ${ (currentMaxVal - currentMinVal)}\ntreshold: ${ExtensionConf.arDetect.blackbarTreshold}`, "color: #aaf");
} }
// Pogledamo, ali smo že kdaj ponastavili CSS. Če še nismo, potem to storimo. Če smo že, potem ne. // Pogledamo, ali smo že kdaj ponastavili CSS. Če še nismo, potem to storimo. Če smo že, potem ne.
@ -576,7 +576,7 @@ class ArDetector {
// let's check if we're cropping too much (or whatever) // let's check if we're cropping too much (or whatever)
var guardLineOut; var guardLineOut;
guardLineOut = this.guardLine.check(image, fallbackMode); guardLineOut = this.guardLine.check(image, this.fallbackMode);
if (guardLineOut.blackbarFail) { // add new ssamples to our sample columns if (guardLineOut.blackbarFail) { // add new ssamples to our sample columns
for(var col of guardLineOut.offenders){ for(var col of guardLineOut.offenders){
@ -588,7 +588,7 @@ class ArDetector {
// if both succeed, then aspect ratio hasn't changed. // if both succeed, then aspect ratio hasn't changed.
// if we're in fallback mode and blackbar test failed, we restore CSS // if we're in fallback mode and blackbar test failed, we restore CSS
if (fallbackMode && guardLineOut.blackbarFail) { if (this.fallbackMode && guardLineOut.blackbarFail) {
this.conf.resizer.reset({type: "auto", ar: null}); this.conf.resizer.reset({type: "auto", ar: null});
this.guardLine.reset(); this.guardLine.reset();
this.noLetterboxCanvasReset = true; this.noLetterboxCanvasReset = true;
@ -664,8 +664,16 @@ class ArDetector {
// if(!textEdge){ // if(!textEdge){
this.processAr(edgePost); this.processAr(edgePost);
// we also know edges for guardline, so set them // we also know edges for guardline, so set them.
// we need to be mindful of fallbackMode though
if (!this.fallbackMode) {
this.guardLine.setBlackbar({top: edgePost.guardLineTop, bottom: edgePost.guardLineBottom}); this.guardLine.setBlackbar({top: edgePost.guardLineTop, bottom: edgePost.guardLineBottom});
} else {
if (this.conf.player.dimensions){
this.guardLine.setBlackbar({top: 0, bottom: this.conf.player.dimensions.height - 1})
}
}
// } // }
// else{ // else{
// console.log("detected text on edges, dooing nothing") // console.log("detected text on edges, dooing nothing")