making karma test and qunit.html pass

cconcolato · cconcolato · commit c89ce34191de · 2019-05-26T18:19:38.000-07:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -56,7 +56,7 @@ module.exports = function(grunt) {
               'src/parsing/tfdt.js',
               'src/parsing/trun.js',
               'src/isofile.js',
-              'src/box-print.js',                 
+              'src/box-print.js',
               'src/mp4box.js'
         ],
         dest: 'dist/<%= pkg.name %>.simple.js'
@@ -94,10 +94,10 @@ module.exports = function(grunt) {
         eqeqeq: false,
         asi: true,
         //verbose: true,
-	loopfunc: true,
+	      loopfunc: true,
         eqnull: true,
-	reporterOutput: "",
-        globals: {
+	      reporterOutput: "",
+          globals: {
         }
       }
     },
diff --git a/_config.yml b/_config.yml
diff --git a/karma.conf.js b/karma.conf.js
@@ -15,7 +15,7 @@ module.exports = function(config) {
         // client configuration
         client: {
           qunit: {
-            testTimeout: 5000
+            testTimeout: 20000
           }
         },
 
@@ -93,7 +93,6 @@ module.exports = function(config) {
 
         // start these browsers
         // available browser launchers: https://npmjs.org/browse/keyword/karma-launcher
-        // 
         //browsers: ['Chrome', 'Firefox'],
         browsers: ['Chrome'],
 
@@ -106,7 +105,7 @@ module.exports = function(config) {
         //browserDisconnectTolerance : 1, // default 0
         //browserNoActivityTimeout : 60000, //default 10000
         browserNoActivityTimeout: 30000,
-        
+
         customLaunchers: {
             Chrome_travis_ci: {
                 base: 'Chrome',
@@ -115,7 +114,7 @@ module.exports = function(config) {
         },
 
         coverageReporter: {
-          reporters: [ 
+          reporters: [
             { type: "lcov", dir: "coverage/" },
             { type: 'text-summary' }
           ]
diff --git a/package.json b/package.json
@@ -25,25 +25,28 @@
   "license": "BSD-3-Clause",
   "devDependencies": {
     "blanket": "^1.2.3",
-    "grunt": "^0.4.5",
-    "grunt-bump": "^0.3.1",
+    "grunt": "^1.0.4",
+    "grunt-bump": "^0.8.0",
     "grunt-cli": "^1.2.0",
-    "grunt-contrib-concat": "^0.5.0",
-    "grunt-contrib-jshint": "^0.10.0",
-    "grunt-contrib-qunit": "^0.5.2",
-    "grunt-contrib-uglify": "^0.6.0",
-    "grunt-contrib-watch": "^0.6.1",
-    "grunt-karma": "^0.11.0",
+    "grunt-contrib-concat": "^1.0.1",
+    "grunt-contrib-jshint": "^2.1.0",
+    "grunt-contrib-qunit": "^3.1.0",
+    "grunt-contrib-uglify": "^4.0.1",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-karma": "^3.0.2",
     "grunt-karma-coveralls": "^2.5.4",
-    "karma": "^0.12.35",
-    "karma-chrome-launcher": "^0.1.12",
-    "karma-coverage": "^0.5.5",
-    "karma-firefox-launcher": "^0.1.6",
+    "karma": "^4.1.0",
+    "karma-chrome-launcher": "^2.2.0",
+    "karma-coverage": "^1.1.2",
+    "karma-firefox-launcher": "^1.1.0",
     "karma-phantomjs-launcher": "^1.0.4",
     "karma-qunit": "^0.1.4",
     "qunitjs": "^1.23.0"
   },
   "scripts": {
     "test": "grunt test --verbose"
+  },
+  "dependencies": {
+    "npm": "^6.9.0"
   }
 }
diff --git a/src/isofile-advanced-creation.js b/src/isofile-advanced-creation.js
@@ -63,11 +63,13 @@ ISOFile.prototype.addTrack = function (_options) {
 	var sample_description_entry = new BoxParser[options.type+"SampleEntry"]();
 	sample_description_entry.data_reference_index = 1;
 	var media_type = "";
-	for (var i = 0; i < BoxParser.sampleEntryCodes.length; i++) {
-		var code = BoxParser.sampleEntryCodes[i];
-		if (code.types.indexOf(options.type) > -1) {
-			media_type = code.prefix;
-			break;
+	for (var mediaType in BoxParser.sampleEntryCodes) {
+		var codes = BoxParser.sampleEntryCodes[mediaType];
+		for (var i = 0; i < codes.length; i++) {
+			if (codes.indexOf(options.type) > -1) {
+				media_type = mediaType;
+				break;
+			}
 		}
 	}
 	switch(media_type) {
diff --git a/src/parsing/sampleentries/sampleentry.js b/src/parsing/sampleentries/sampleentry.js
@@ -18,7 +18,8 @@ BoxParser.SampleEntry.prototype.parse = function(stream) {
 }
 
 BoxParser.SampleEntry.prototype.parseDataAndRewind = function(stream) {
-	this.parse(stream);
+	this.parseHeader(stream);
+	this.data = stream.readUint8Array(this.size - this.hdr_size);
 	// restore the header size as if the sample entry header had not been parsed
 	this.hdr_size -= 8;
 	// rewinding
diff --git a/test/qunit-box-data.js b/test/qunit-box-data.js
@@ -12,8 +12,8 @@ var boxtests = [
 			compatible_brands: [ "avc1", "iso5", "dsms", "msix", "dash"]
 		}
 	},
-	{ 
-		url: mediaTestBaseUrl + "mp4/box/sidx.mp4",	
+	{
+		url: mediaTestBaseUrl + "mp4/box/sidx.mp4",
 		rangeStart: 1566,
 		rangeSize: 152,
 		boxname: "sidx",
@@ -27,79 +27,79 @@ var boxtests = [
 			earliest_presentation_time: 0,
 			first_offset: 0,
 			references: [
-				{ 
+				{
 					reference_type: 0,
 					referenced_size: 776279,
 					subsegment_duration: 224,
 					starts_with_SAP: 1,
 					SAP_type: 1,
 					SAP_delta_time: 0
 				},
-				{ 
+				{
 					reference_type: 0,
 					referenced_size: 298018,
 					subsegment_duration: 110,
 					starts_with_SAP: 1,
 					SAP_type: 1,
 					SAP_delta_time: 0
 				},
-				{ 
+				{
 					reference_type: 0,
 					referenced_size: 151055,
 					subsegment_duration: 62,
 					starts_with_SAP: 1,
 					SAP_type: 1,
 					SAP_delta_time: 0
 				},
-				{ 
+				{
 					reference_type: 0,
 					referenced_size: 583055,
 					subsegment_duration: 130,
 					starts_with_SAP: 1,
 					SAP_type: 1,
 					SAP_delta_time: 0
 				},
-				{ 
+				{
 					reference_type: 0,
 					referenced_size: 310294,
 					subsegment_duration: 45,
 					starts_with_SAP: 1,
 					SAP_type: 1,
 					SAP_delta_time: 0
 				},
-				{ 
+				{
 					reference_type: 0,
 					referenced_size: 353217,
 					subsegment_duration: 50,
 					starts_with_SAP: 1,
 					SAP_type: 1,
 					SAP_delta_time: 0
 				},
-				{ 
+				{
 					reference_type: 0,
 					referenced_size: 229078,
 					subsegment_duration: 37,
 					starts_with_SAP: 1,
 					SAP_type: 1,
 					SAP_delta_time: 0
 				},
-				{ 
+				{
 					reference_type: 0,
 					referenced_size: 685457,
 					subsegment_duration: 114,
 					starts_with_SAP: 1,
 					SAP_type: 1,
 					SAP_delta_time: 0
 				},
-				{ 
+				{
 					reference_type: 0,
 					referenced_size: 746586,
 					subsegment_duration: 250,
 					starts_with_SAP: 1,
 					SAP_type: 1,
 					SAP_delta_time: 0
 				},
-				{ 
+				{
 					reference_type: 0,
 					referenced_size: 228474,
 					subsegment_duration: 231,
@@ -125,7 +125,7 @@ var boxtests = [
 			timescale:	1,
 			presentation_time_delta:	1,
 			event_duration:	1,
-			id:	1							
+			id:	1
 		}
 	}
 ];
diff --git a/test/qunit-helper.js b/test/qunit-helper.js
@@ -45,7 +45,7 @@ function checkBoxData(assert, box, data) {
 				var dataentry = data[prop][i];
 				assert.deepEqual(boxentry, dataentry, "Box property "+prop+", entry #"+i+" deep equality");
 			}
-		} else if (data[prop].byteLength) {
+		} else if (data[prop] && data[prop].byteLength) {
 			var uint8data = new Uint8Array(data[prop]);
 			var uint8box = new Uint8Array(box[prop]);
 			var equal = true;
diff --git a/test/qunit-iso-conformance.js b/test/qunit-iso-conformance.js
@@ -21,7 +21,7 @@ function makeBoxParsingTest(fileIndex) {
 	});
 }
 
-/* 
+/*
 var conformanceFiles = [];
 var xhr = new XMLHttpRequest();
 xhr.open('GET', 'iso-conformance-files.js', false);
diff --git a/test/qunit-iso-creation.js b/test/qunit-iso-creation.js
@@ -3,7 +3,7 @@ QUnit.module("File Creation");
 QUnit.test("addSample and segmentation", function( assert ) {
 	var timeout = window.setTimeout(function() { assert.ok(false, "Timeout"); QUnit.start(); }, TIMEOUT_MS);
 	var f = MP4Box.createFile();
-	f.onSegment = function(id, user, buffer, sampleNum) {		
+	f.onSegment = function(id, user, buffer, sampleNum) {
 		window.clearTimeout(timeout);
 		console.log("Received segment for track "+id);
 		assert.ok(true, "Segment received");
diff --git a/test/qunit-media-data.js b/test/qunit-media-data.js
@@ -55,15 +55,15 @@ var testFiles = [
 	}
 /*,
 
-	{ // 12 
+	{ // 12
 		desc: "File with negative CTS-DTS offsets",
 		url: mediaTestBaseUrl + 'mp4/negctts.mp4'
 	},
-	{ // 13 
+	{ // 13
 		desc: "File with no default flags in fragments",
 		url: mediaTestBaseUrl + 'mp4/noFragsDefault.mp4'
 	},
-	{ // 14 
+	{ // 14
 		desc: "File with negative CTS-DTS offsets and no default flags in fragments",
 		url: mediaTestBaseUrl + 'mp4/negctts_noFragsDefault.mp4'
 	}
diff --git a/test/qunit-mse-tests.js b/test/qunit-mse-tests.js
@@ -21,10 +21,10 @@ QUnit.asyncTest( "Appending init segment", function( assert ) {
 	function onInitAppended(e) {
 		window.clearTimeout(timeout);
 		assert.equal(ms.readyState, "open", "MSE opened after init append");
-		QUnit.start();					
+		QUnit.start();
 	}
 
-	mp4boxfile.onReady = function(info) { 
+	mp4boxfile.onReady = function(info) {
 		track_id = info.tracks[0].id;
 		mp4boxfile.setSegmentOptions(track_id, null, { nbSamples: 10, rapAlignement: true } );
 		var initSegs = mp4boxfile.initializeSegmentation();
@@ -35,7 +35,7 @@ QUnit.asyncTest( "Appending init segment", function( assert ) {
 	}
 
 	function onSourceOpen(e) {
-		getFile(testFiles[index].url, function (buffer) {			
+		getFile(testFiles[index].url, function (buffer) {
 			mp4boxfile.appendBuffer(buffer);
 		});
 	}
diff --git a/test/qunit-tests.js b/test/qunit-tests.js
diff --git a/test/sample-urls.js b/test/sample-urls.js

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,8 @@ BoxParser.SampleEntry.prototype.parse = function(stream) {`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`BoxParser.SampleEntry.prototype.parseDataAndRewind = function(stream) {`
`21`		`- this.parse(stream);`
	`21`	`+ this.parseHeader(stream);`
	`22`	`+ this.data = stream.readUint8Array(this.size - this.hdr_size);`
`22`	`23`	`// restore the header size as if the sample entry header had not been parsed`
`23`	`24`	`this.hdr_size -= 8;`
`24`	`25`	`// rewinding`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ function checkBoxData(assert, box, data) {`
`45`	`45`	`var dataentry = data[prop][i];`
`46`	`46`	`assert.deepEqual(boxentry, dataentry, "Box property "+prop+", entry #"+i+" deep equality");`
`47`	`47`	`}`
`48`		`- } else if (data[prop].byteLength) {`
	`48`	`+ } else if (data[prop] && data[prop].byteLength) {`
`49`	`49`	`var uint8data = new Uint8Array(data[prop]);`
`50`	`50`	`var uint8box = new Uint8Array(box[prop]);`
`51`	`51`	`var equal = true;`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ function makeBoxParsingTest(fileIndex) {`
`21`	`21`	`});`
`22`	`22`	`}`
`23`	`23`
`24`		`-/*`
	`24`	`+/*`
`25`	`25`	`var conformanceFiles = [];`
`26`	`26`	`var xhr = new XMLHttpRequest();`
`27`	`27`	`xhr.open('GET', 'iso-conformance-files.js', false);`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@ QUnit.asyncTest( "Appending init segment", function( assert ) {`
`21`	`21`	`function onInitAppended(e) {`
`22`	`22`	`window.clearTimeout(timeout);`
`23`	`23`	`assert.equal(ms.readyState, "open", "MSE opened after init append");`
`24`		`- QUnit.start();`
	`24`	`+ QUnit.start();`
`25`	`25`	`}`
`26`	`26`
`27`		`- mp4boxfile.onReady = function(info) {`
	`27`	`+ mp4boxfile.onReady = function(info) {`
`28`	`28`	`track_id = info.tracks[0].id;`
`29`	`29`	`mp4boxfile.setSegmentOptions(track_id, null, { nbSamples: 10, rapAlignement: true } );`
`30`	`30`	`var initSegs = mp4boxfile.initializeSegmentation();`
`@@ -35,7 +35,7 @@ QUnit.asyncTest( "Appending init segment", function( assert ) {`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`function onSourceOpen(e) {`
`38`		`- getFile(testFiles[index].url, function (buffer) {`
	`38`	`+ getFile(testFiles[index].url, function (buffer) {`
`39`	`39`	`mp4boxfile.appendBuffer(buffer);`
`40`	`40`	`});`
`41`	`41`	`}`