Merge pull request #1101 from bbcrddave/ReaddStreamTeardownCompleteEvent

Re-add STREAM_TEARDOWN_COMPLETE event needed for metrics reset
Dash-Industry-Forum · Feb 1, 2016 · 4fa5884 · 4fa5884
2 parents 6abdf75 + e8a9365
commit 4fa5884
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/src/streaming/controllers/StreamController.js b/src/streaming/controllers/StreamController.js
@@ -712,6 +712,8 @@ function StreamController() {
                 eventBus.trigger(Events.PROTECTION_DESTROYED, {data: manifestModel.getValue().url});
             }
         }
+
+        eventBus.trigger(Events.STREAM_TEARDOWN_COMPLETE);
     }
 
     instance = {

diff --git a/src/streaming/rules/abr/ThroughputRule.js b/src/streaming/rules/abr/ThroughputRule.js
@@ -114,7 +114,7 @@ function ThroughputRule(config) {
 
         }
 
-        if (lastRequest.trace.length) {
+        if (lastRequest.trace && lastRequest.trace.length) {
             downloadTime = (lastRequest._tfinish.getTime() - lastRequest.tresponse.getTime()) / 1000;
 
             bytes = lastRequest.trace.reduce(function (a, b) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -712,6 +712,8 @@ function StreamController() { @@
                     eventBus.trigger(Events.PROTECTION_DESTROYED, {data: manifestModel.getValue().url});
                 }
             }
+            eventBus.trigger(Events.STREAM_TEARDOWN_COMPLETE);
         }
         instance = {
@@ Expand Down @@