Quellcode durchsuchen

use getSeqNoForDate() from m3u8parse, rather than flawed custom logic

Gil Pedersen vor 11 Jahren
Ursprung
Commit
fc5670fa79
2 geänderte Dateien mit 11 neuen und 26 gelöschten Zeilen
  1. 4 19
      lib/reader.js
  2. 7 7
      package.json

+ 4 - 19
lib/reader.js

@@ -152,25 +152,10 @@ function HlsStreamReader(src, options) {
   function initialSeqNo() {
     var index = self.index;
 
-    if (self.startDate) {
-      var count = index.segments.length;
-      var time = 0, startTime = self.startDate.getTime();
-
-      for (var i = 0; i < count; i++) {
-        var segment = index.segments[i];
-        if (segment.program_time) {
-          time = segment.program_time.getTime();
-        } else if (time === 0)
-          throw new Error('bad index, missing #EXT-X-PROGRAM-DATE-TIME');
-
-        time += 1000 * segment.duration;
-
-        if (time >= startTime)
-          return index.first_seq_no + i;
-      }
-      return -1;
-    }
-    return index.startSeqNo(self.fullStream);
+    if (self.startDate)
+      return index.seqNoForDate(self.startDate, true);
+    else
+      return index.startSeqNo(self.fullStream);
   }
 
   function updatecheck(updated) {

+ 7 - 7
package.json

@@ -26,18 +26,18 @@
   "author": "Gil Pedersen <gpdev@gpost.dk>",
   "license": "BSD",
   "dependencies": {
-    "debug": "~0.7.0",
     "carrier": "~0.1.8",
     "commander": "~1.1.1",
-    "readable-stream": "~1.0.0",
-    "xtend": "^2.0.3",
+    "debug": "~0.7.0",
     "deep-equal": "0.0.0",
+    "m3u8parse": "^0.1.7",
     "measured": "~0.1.3",
-    "streamprocess": "0.0.1",
-    "oncemore": "~0.1.0",
-    "m3u8parse": "~0.1.5",
     "mime": "^1.2.11",
-    "uristream": "~0.1.0"
+    "oncemore": "~0.1.0",
+    "readable-stream": "~1.0.0",
+    "streamprocess": "0.0.1",
+    "uristream": "~0.1.0",
+    "xtend": "^2.0.3"
   },
   "devDependencies": {
     "mocha": "~1.11.0",