Add a working test for a basic ondemand SegmentTemplate. Getting a Re…

…presentation is far harder than expected - DashManifestModel methods starting with getAdaptation... doesn't mean it'll get an adaptation, and it generally expects things to have happened in e.g. DashAdapter or DashHandler that augment the default objects before it works... Also always calculates full list of segments for an ondemand stream.

.jshintrc

@@ -12,6 +12,7 @@
     "devel" : true,
     "browser": true,
     "loopfunc" : true,
+    "multistr": true,
     "predef" : [
         "it",
         "describe",

externals/xml2json.js

@@ -70,10 +70,11 @@ function X2JS(matchers, attrPrefix, ignoreRoot) {
 			    i,
 			    len; 
 
-			// get the first node that isn't a comment
+			// get the first node that we understand
 			for(i = 0, len = node.childNodes.length; i < len; i += 1) {
-			   if (node.childNodes[i].nodeType !== DOMNodeTypes.COMMENT_NODE) {
-			       child = node.childNodes[i];
+			   let cNode = node.childNodes[i];
+			   if (cNode.nodeType == DOMNodeTypes.ELEMENT_NODE || cNode.nodeType == DOMNodeTypes.TEXT_NODE || cNode.nodeType == DOMNodeTypes.CDATA_SECTION_NODE) {
+			       child = cNode;
 			       break;
 			   } 
 			}

package.json

@@ -38,7 +38,8 @@
     "mocha": "^2.3.4",
     "sinon": "^1.17.2",
     "time-grunt": "^1.2.0",
-    "uglify-js": "^2.4.21"
+    "uglify-js": "^2.4.21",
+    "xmldom": "^0.1.22"
   },
   "dependencies": {
     "codem-isoboxer": "0.2.2",

src/core/Debug.js

@@ -111,11 +111,25 @@ function Debug() {
         eventBus.trigger(Events.LOG, {message: message});
     }
 
+    /**
+     * Returns window.performance.now(), if available
+     * Otherwise falls back to Date()
+     * mocha doesn't have window.performance and it's possible some UAs don't either
+     */
+    function timer() {
+        if (typeof performance !== "undefined") {
+            return performance.now();
+        } else {
+            return (new Date()).getTime();
+        }
+    }
+
     instance = {
         log: log,
         setLogTimestampVisible: setLogTimestampVisible,
         setLogToBrowserConsole: setLogToBrowserConsole,
         getLogToBrowserConsole: getLogToBrowserConsole,
+        timer: timer
     };
 
     setup();

src/dash/parser/DashParser.js

@@ -42,7 +42,9 @@ import SegmentValuesMap from './maps/SegmentValuesMap';
 function DashParser(/*config*/) {
 
     const context = this.context;
-    const log = Debug(context).getInstance().log;
+    const debug = Debug(context).getInstance();
+    const log = debug.log;
+    const timer = debug.timer;
     const errorHandler = ErrorHandler(context).getInstance();
 
     let instance,
@@ -69,19 +71,19 @@ function DashParser(/*config*/) {
         var manifest;
 
         try {
-            const startTime = window.performance.now();
+            const startTime = timer();
 
             manifest = converter.xml_str2json(data);
 
             if (!manifest) {
                 throw new Error('parser error');
             }
 
-            const jsonTime = window.performance.now();
+            const jsonTime = timer();
 
             objectIron.run(manifest);
 
-            const ironedTime = window.performance.now();
+            const ironedTime = timer();
 
             xlinkController.setMatchers(matchers);
             xlinkController.setIron(objectIron);

src/dash/utils/SegmentsUtils.js

@@ -255,7 +255,7 @@ export function decideSegmentListRangeForTemplate(timelineConverter, isDynamic,
     };
     var currentSegmentList = representation.segments;
     var availabilityLowerLimit = 2 * duration;
-    var availabilityUpperLimit = givenAvailabilityUpperLimit || Math.max(2 * minBufferTime, 10 * duration);
+    var availabilityUpperLimit = givenAvailabilityUpperLimit || Number.POSITIVE_INFINITY;
 
     var originAvailabilityTime = NaN;
     var originSegment = null;

test/dash.SegmentsGetterSpec.js

@@ -1,19 +1,54 @@
 import ObjectsHelper from './helpers/ObjectsHelper';
 import VoHelper from './helpers/VOHelper';
+import MPDfiles from './helpers/MPDfiles';
+
 import SegmentsGetter from '../src/dash/utils/SegmentsGetter';
+import DashParser from '../src/dash/parser/DashParser';
+import DashManifestModel from '../src/dash/models/DashManifestModel';
+import TimelineConverter from '../src/dash/utils/TimelineConverter';
 
 const expect = require('chai').expect;
+const DOMParser = require('xmldom').DOMParser;
 
 describe('SegmentsGetter', function () {
     const objectsHelper = new ObjectsHelper();
     const voHelper = new VoHelper();
+
     const createSegmentsGetter = (isDynamic) => {
         const context = {};
-        const config = {};
+        const config = {
+            timelineConverter: createTimelineConverter()
+        };
 
         return SegmentsGetter(context).create(config, !!isDynamic);
     };
 
+    const createDashParser = () => {
+        const context = {};
+
+        return DashParser(context).create();
+    };
+
+    const createDashManifestModel = () => {
+        return DashManifestModel({}).getInstance();
+    };
+
+    const createTimelineConverter = () => {
+        return TimelineConverter({}).getInstance();
+    };
+
+    const parseManifest = xmlStr => {
+        const manifest = createDashParser().parse(xmlStr, objectsHelper.getDummyXlinkController());
+        manifest.loadedTime = {getTime: () => 0};
+        return manifest;
+    };
+
+    beforeEach(() => {
+        global.window = {
+            DOMParser: DOMParser
+        };
+    });
+
     it('should not regenerate segments for a static MPD if they are already there', () => {
         const segmentsGetter = createSegmentsGetter(false);
         const representation = voHelper.createRepresentation('audio');
@@ -29,4 +64,23 @@ describe('SegmentsGetter', function () {
         expect(segments[1]).to.deep.equal(voHelper.createSegment(1));
         expect(segments.length).to.equal(2);
     });
+
+    it('should calculate the correct number of segments for an ondemand SegmentTemplate manifest', (done) => {
+        const model = createDashManifestModel();
+        const timelineConverter = createTimelineConverter();
+        const manifest = parseManifest(MPDfiles.bbcrdtestcard);
+        const mpd = model.getMpd(manifest);
+        const period = model.getRegularPeriods(manifest, mpd)[0];
+        const adaptationIndex = model.getIndexForAdaptation(model.getAdaptationForType(manifest, 0, 'video'), manifest, period.index);
+        const adaptationSet = model.getAdaptationsForPeriod(manifest, period)[adaptationIndex];
+        const representations = model.getRepresentationsForAdaptation(manifest, adaptationSet);
+        const representation = representations[representations.length - 1];
+
+        representation.segmentAvailabilityRange = timelineConverter.calcSegmentAvailabilityRange(representation, model.getIsDynamic(manifest));
+
+        createSegmentsGetter().getSegments(representation, 0, 0, (representation, segments) => {
+            expect(segments.length).to.equal(938);
+            done();
+        });
+    });
 });