From b9aa5c4d3e71ef0095a48378772158a310142410 Mon Sep 17 00:00:00 2001
From: Cat <carinasadres@gmail.com>
Date: Tue, 10 Jan 2017 14:52:08 +0100
Subject: [PATCH] embed - cancel stall timeout properly

---
 embed/core.js   | 20 ++++++++------------
 embed/test.html | 12 +++++++-----
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/embed/core.js b/embed/core.js
index fb4b80ea..8b2e7902 100644
--- a/embed/core.js
+++ b/embed/core.js
@@ -1163,14 +1163,9 @@ function mistPlay(streamName,options) {
           element.checkStalledTimeout = false;
           player.cancelAskNextCombo();
         }
-        if (element.checkStalledTimeout) {
-          clearTimeout(element.checkStalledTimeout);
-          element.checkStalledTimeout = false;
-          player.cancelAskNextCombo();
-        }
       };
-      element.addEventListener('progress',progress,true);
-      element.addEventListener('playing',progress,true);
+      //element.addEventListener('progress',progress,true);
+      //element.addEventListener('playing',progress,true);
       element.addEventListener('play',function(){
         player.paused = false;
         if ((!element.checkProgressTimeout) && (player.element) && ('currentTime' in player.element)) {
@@ -1178,10 +1173,11 @@ function mistPlay(streamName,options) {
           var lasttime = player.element.currentTime;
           element.checkProgressTimeout = setInterval(function(){
             var newtime = player.element.currentTime;
+            progress();
             if (newtime == 0) { return; }
-            var progress = newtime - lasttime;
+            var progressed = newtime - lasttime;
             lasttime = newtime;
-            if (progress == 0) {
+            if (progressed == 0) {
               var msg = 'There should be playback but nothing was played';
               var r = {
                 type: 'playback',
@@ -1203,8 +1199,8 @@ function mistPlay(streamName,options) {
               return;
             }
             player.cancelAskNextCombo();
-            if (progress < 5) {
-              var msg = 'It seems playback is lagging (progressed '+Math.round(progress*100)/100+'/10s)'
+            if (progressed < 1) {
+              var msg = 'It seems playback is lagging (progressed '+Math.round(progressed*100)/100+'/2s)'
               player.addlog(msg);
               player.report({
                 type: 'playback',
@@ -1212,7 +1208,7 @@ function mistPlay(streamName,options) {
               });
               return;
             }
-          },10e3);
+          },2e3);
         }
       },true);
       element.addEventListener('pause',function(){
diff --git a/embed/test.html b/embed/test.html
index a1eda086..e3309ae4 100644
--- a/embed/test.html
+++ b/embed/test.html
@@ -15,11 +15,12 @@
     <script>
       // global options can be set here
       var mistoptions = {
-        host: 'http://cat.mistserver.org:8080'
-        //host: 'http://thulmk3:8080'
+        //host: 'http://cat.mistserver.org:8080'
+        host: 'http://thulmk3:8080'
         //host: 'https://cat.mistserver.org:4433'
         //host: 'http://localhost:8080'
         //host: 'http://live.us.picarto.tv:8080'
+        //host: 'balderlaptop:8080'
       };
     </script>
     
@@ -79,14 +80,14 @@
         
         //tryplayers = Object.keys(mistplayers);
         tryplayers = [];
-        tryplayers.push('automatic');
+        //tryplayers.push('automatic');
         //tryplayers.push('html5');
-        //tryplayers.push('dashjs');
+        tryplayers.push('dashjs');
         //tryplayers.push('videojs');
         //tryplayers.push('flash_strobe');
         //tryplayers.push('silverlight');
         streams = [];
-        streams.push('live');
+        //streams.push('live');
         //streams.push('golive+emitan');
         //streams.push('subtel');
         //streams.push('ogg');
@@ -94,6 +95,7 @@
         //streams.push('vids+hahalol.mp3');
         //streams.push('lama');
         //streams.push('bunny');
+        streams.push('golive+SockyChannel');
         
         for (var j in streams) {
           for (var i in tryplayers) {