Fixed some problems with recursion in autodetection startup. Fixed problems with autodetection sometimes not starting.

js/lib/PlayerData.js

@@ -44,25 +44,34 @@ class PlayerData {
   }
 
   startChangeDetection(){
+    this.ghettoWatcher
     this.watchTimeout = setInterval(this.ghettoWatcher, 100, this);
   }
 
-  stopChangeDetection(){
+  scheduleGhettoWatcher(){
-    clearInterval(this.watchTimeout);
+    ths = this;
+    this.watchTimeout = setTimeout(function(){
+      ths.ghettoWatcher();
+      ths.scheduleGhettoWatcher();
+    }, 100)
   }
 
-  ghettoWatcher(ths){
+  stopChangeDetection(){
-    if(ths.checkPlayerSizeChange()){
+    clearTimeout(this.watchTimeout);
+  }
+
+  ghettoWatcher(){
+    if(this.checkPlayerSizeChange()){
       if(Debug.debug){
         console.log("[uw::ghettoOnChange] change detected");
       }
 
-      ths.getPlayerDimensions();
+      this.getPlayerDimensions();
-      if(! ths.element ){
+      if(! this.element ){
         return;
       }
 
-      ths.videoData.resizer.restore(); // note: this returns true if change goes through, false otherwise.
+      this.videoData.resizer.restore(); // note: this returns true if change goes through, false otherwise.
       return;
     }
 
@@ -71,18 +80,18 @@ class PlayerData {
     // sometimes, checkPlayerSizeChange might not detect a change to fullscreen. This means we need to 
     // trick it into doing that
 
-    if(ths.dimensions.fullscreen != PlayerData.isFullScreen()) {
+    if(this.dimensions.fullscreen != PlayerData.isFullScreen()) {
       if(Debug.debug){
         console.log("[PlayerData::ghettoWatcher] fullscreen switch detected (basic change detection failed)");
       }
 
-      ths.getPlayerDimensions();
+      this.getPlayerDimensions();
 
-      if(! ths.element ){
+      if(! this.element ){
         return;
       }
 
-      ths.videoData.resizer.restore();
+      this.videoData.resizer.restore();
     }
   }
 

js/lib/VideoData.js

@@ -22,10 +22,13 @@ class VideoData {
   }
 
   initArDetection() {
-    if(ths.arDetector)
+    if(this.arDetector){
       this.arDetector.init();
-    else
+    }
+    else{
       this.arDetector = new ArDetector(this);
+      this.arDetector.init();
+    }
   }
 
   startArDetection() {

js/modules/ArDetect.js

@@ -14,15 +14,12 @@ class ArDetector {
     this.fallbackMode = false;
 
     this.blackLevel = ExtensionConf.arDetect.blackLevel_default;    
-
-    this.init();
   }
 
   init(){
     if(Debug.debug){
       console.log("[ArDetect::init] Initializing autodetection")
     }
-  
     this.setup(ExtensionConf.arDetect.hSamples, ExtensionConf.arDetect.vSamples);
   }
 
@@ -48,8 +45,8 @@ class ArDetector {
     
     try{
       if(Debug.debug){
-        console.log("%c[ArDetect::_ard_setup] Starting automatic aspect ratio detection.", _ard_console_start);
+        console.log("%c[ArDetect::setup] Starting automatic aspect ratio detection.", _ard_console_start);
-        console.log("[ArDetect::_ard_setup] Choice config bits:\ncanvas dimensions:",cwidth, "×", cheight, "\nsamplingInterval (ExtensionConf):", ExtensionConf.arDetect.samplingInterval, "width/interval:", parseInt(cheight / ExtensionConf.arDetect.samplingInterval));
+        console.log("[ArDetect::setup] Choice config bits:\ncanvas dimensions:",cwidth, "×", cheight, "\nvideoData:", this.conf);
       }
     
       this._halted = false;
@@ -66,12 +63,12 @@ class ArDetector {
       
       if(this.canvas){
         if(Debug.debug)
-          console.log("[ArDetect::_ard_setup] existing canvas found. REMOVING KEBAB removing kebab\n\n\n\n(im hungry and you're not authorized to have it)");
+          console.log("[ArDetect::setup] existing canvas found. REMOVING KEBAB removing kebab\n\n\n\n(im hungry and you're not authorized to have it)");
         
         this.canvas.remove();
         
         if(Debug.debug)
-          console.log("[ArDetect::_ard_setup] canvas removed");
+          console.log("[ArDetect::setup] canvas removed");
       }
       
       // imamo video, pa tudi problem. Ta problem bo verjetno kmalu popravljen, zato setup začnemo hitreje kot prej
@@ -79,8 +76,11 @@ class ArDetector {
       // less delay than before
 
       if(this.video.videoWidth === 0 || this.video.videoHeight === 0 ){
-        if(! this.timer)
+
-          this.setupTimer = setTimeout(this.init(), 100);
+        if(Debug.debug){
+          console.log("[ArDetector::setup] video has no width or height!", this.video.videoWidth,"×", this.video.videoHeight)
+        }
+        this.scheduleInitRestart();
         
         return;
       }
@@ -175,6 +175,27 @@ class ArDetector {
     return ! this._halted;
   }
 
+  scheduleInitRestart(timeout, force_reset){
+    if(! timeout){
+      timeout = 100;
+    }
+    // don't allow more than 1 instance
+    if(this.setupTimer){ 
+      clearTimeout(this.setupTimer);
+    }
+    
+    var ths = this;
+    this.setupTimer = setTimeout(function(){
+        ths.setupTimer = null;
+        try{
+        ths.init();
+        }catch(e){console.log("[ArDetector::scheduleInitRestart] Failed to start init(). Error:",e)}
+        ths = null;
+      },
+      timeout
+    );
+  }
+
   scheduleFrameCheck(timeout, force_reset){
     if(! timeout){
       this.frameCheck();

js/modules/PageInfo.js

@@ -44,22 +44,35 @@ class PageInfo {
     // }
     if(! vids[0].offsetWidth || ! vids[0].offsetHeight){
       this.hasVideos = false;
+
+      if(Debug.debug){
+        console.log("[PageInfo::rescan] video lacks offsetwidth or offsetheight, doing nothing")
+      }
+
       this.scheduleRescan();
       return;
     }
 
     if(this.videos.length > 0){
       if(vids[0] == this.videos[0].video){
+        console.log("[PageInfo::rescan] videos are equal, doing nothing")
       // do nothing
       } else {
+        console.log("videos not equal!", vids[0], this.videos[0].video)
         this.videos[0].destroy();
         this.videos[0] = new VideoData(vids[0]);
+        this.videos[0].initArDetection();
       }
     } else {
+
+      if(Debug.debug)
+        console.log("[PageInfo::rescan] Adding new video!", vids[0], ";", vids[0].offsetWidth, "×", vids[0].offsetHeight);
+
       this.videos.push(new VideoData(vids[0]));
+      this.videos[0].initArDetection();
     }
 
-    console.log("Rescan complete. Total videos?", this.videos.length)
+    // console.log("Rescan complete. Total videos?", this.videos.length)
     }catch(e){
       console.log("rescan error:",e)
     }

js/modules/Resizer.js

@@ -361,6 +361,7 @@ class Resizer {
       ths.conf.destroy();
       return;
     }
+    console.log("css watcher running. video?", ths.video)
     
     // // our current css is fucky? Null, undefined and 0 are invalid values.
     // if(! GlobalVars.currentCss.width || ! GlobalVars.currentCss.height )