Fix events without presentation time and id (#3851)

* Fix a memory leak in the EventController.js. For events without id and presentationTime the list of outdated events was not cleaned up * Default to id null for inline events
Dash-Industry-Forum · Jan 7, 2022 · cd63ff0 · cd63ff0
1 parent 0f4196e
commit cd63ff0
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/dash/models/DashManifestModel.js b/src/dash/models/DashManifestModel.js
@@ -849,14 +849,17 @@ function DashManifestModel() {
 
                     if (currentMpdEvent.hasOwnProperty(DashConstants.PRESENTATION_TIME)) {
                         event.presentationTime = currentMpdEvent.presentationTime;
-                        const presentationTimeOffset = eventStream.presentationTimeOffset ? eventStream.presentationTimeOffset / eventStream.timescale : 0;
-                        event.calculatedPresentationTime = event.presentationTime / eventStream.timescale + period.start - presentationTimeOffset;
                     }
+                    const presentationTimeOffset = eventStream.presentationTimeOffset ? eventStream.presentationTimeOffset / eventStream.timescale : 0;
+                    event.calculatedPresentationTime = event.presentationTime / eventStream.timescale + period.start - presentationTimeOffset;
+
                     if (currentMpdEvent.hasOwnProperty(DashConstants.DURATION)) {
                         event.duration = currentMpdEvent.duration / eventStream.timescale;
                     }
                     if (currentMpdEvent.hasOwnProperty(DashConstants.ID)) {
                         event.id = currentMpdEvent.id;
+                    } else {
+                        event.id = null;
                     }
 
                     if (currentMpdEvent.Signal && currentMpdEvent.Signal.Binary) {

diff --git a/src/streaming/controllers/EventController.js b/src/streaming/controllers/EventController.js
@@ -454,7 +454,7 @@ function EventController() {
         const id = event.id;
 
         events[schemeIdUri] = events[schemeIdUri].filter((e) => {
-            return (value && e.eventStream.value && e.eventStream.value !== value) || (e.id !== id);
+            return (value && e.eventStream.value && e.eventStream.value !== value) || e.id !== id;
         });
 
         if (events[schemeIdUri].length === 0) {