simple print node test

cconcolato · cconcolato · commit baf7d612fd39 · 2017-03-14T23:22:09.000+01:00
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -31,6 +31,7 @@ module.exports = function(grunt) {
               'src/isofile-sample-processing.js', // file level sample processing operations (sample table, get, ...)
               'src/isofile-item-processing.js',   // item processing operations (sample table, get, ...)
               'src/isofile-write.js',             // file level write operations (segment creation ...)
+              'src/box-print.js',                 // simple print
               'src/mp4box.js'                     // application level operations (data append, sample extraction, segmentation, ...)
         ],
         dest: 'dist/<%= pkg.name %>.all.js'
diff --git a/src/DataStream.js b/src/DataStream.js
@@ -566,6 +566,9 @@ DataStream.prototype.readCString = function(length) {
 */
 var MAX_SIZE = Math.pow(2, 32);
 
+DataStream.prototype.readInt64 = function () {
+  return (this.readInt32()*MAX_SIZE)+this.readUint32();
+}
 DataStream.prototype.readUint64 = function () {
 	return (this.readUint32()*MAX_SIZE)+this.readUint32();
 }
diff --git a/src/box-print.js b/src/box-print.js
@@ -0,0 +1,73 @@
+/* 
+ * Copyright (c) Telecom ParisTech/TSI/MM/GPAC Cyril Concolato
+ * License: BSD-3-Clause (see LICENSE file)
+ */
+BoxParser.Box.prototype.printHeader = function(output) {
+	this.size += 8;
+	if (this.size > MAX_SIZE) {
+		this.size += 8;
+	}
+	if (this.type === "uuid") {
+		this.size += 16;
+	}
+	output.log(output.indent+"size:"+this.size);
+	output.log(output.indent+"type:"+this.type);
+}
+
+BoxParser.FullBox.prototype.printHeader = function(output) {
+	this.size += 4;
+	BoxParser.Box.prototype.printHeader.call(this, output);
+	output.log(output.indent+"version:"+this.version);
+	output.log(output.indent+"flags:"+this.flags);
+}
+
+BoxParser.Box.prototype.print = function(output) {
+	this.printHeader(output);
+}
+
+BoxParser.ContainerBox.prototype.print = function(output) {
+	this.printHeader(output);
+	for (var i=0; i<this.boxes.length; i++) {
+		if (this.boxes[i]) {
+			var prev_indent = output.indent;
+			output.indent += " ";
+			this.boxes[i].print(output);
+			output.indent = prev_indent;
+		}
+	}
+}
+
+ISOFile.prototype.print = function(output) {
+	output.indent = "";
+	for (var i=0; i<this.boxes.length; i++) {
+		if (this.boxes[i]) {
+			this.boxes[i].print(output);
+		}
+	}	
+}
+
+BoxParser.mvhdBox.prototype.print = function(output) {
+	BoxParser.FullBox.prototype.printHeader.call(this, output);
+	output.log("creation_time: "+this.creation_time);
+	output.log("modification_time: "+this.modification_time);
+	output.log("timescale: "+this.timescale);
+	output.log("duration: "+this.duration);
+	output.log("rate: "+this.rate);
+	output.log("volume: "+this.volume>>8);
+	output.log("matrix: "+this.matrix.join(", "));
+	output.log("next_track_id: "+this.next_track_id);
+}
+
+BoxParser.tkhdBox.prototype.print = function(output) {
+	BoxParser.FullBox.prototype.printHeader.call(this, output);
+	output.log("creation_time: "+this.creation_time);
+	output.log("modification_time: "+this.modification_time);
+	output.log("track_id: "+this.track_id);
+	output.log("duration: "+this.duration);
+	output.log("volume: "+this.volume>>8);
+	output.log("matrix: "+this.matrix.join(", "));
+	output.log("layer: "+this.layer);
+	output.log("alternate_group: "+this.alternate_group);
+	output.log("width: "+this.width);
+	output.log("height: "+this.height);
+}
diff --git a/src/box.js b/src/box.js
@@ -10,13 +10,9 @@ var BoxParser = {
 				 "mdat", "idat", "free", "skip",
 				 "avcC", "hvcC", "ftyp", "styp", 
 				 "payl", "vttC",
-				 "rtp ", "sdp ",
+				 "sdp ",
 				 "btrt", "frma",
 				 "trpy", "tpyl", "totl", "tpay", "dmed", "dimm", "drep", "nump", "npck", "maxr", "tmin", "tmax", "dmax", "pmax", "payt",
-				 "vmhd", "smhd", "hmhd", // full boxes not yet parsed
-				 "idat", "meco",
-				 "udta", "strk",
-				 "free", "skip", 
 				 "clap", "pasp"
 			   ],
 	fullBoxCodes : [ "mvhd", "tkhd", "mdhd", "hdlr", "vmhd", "smhd", "hmhd", "nmhd", "url ", "urn ", 
@@ -25,7 +21,7 @@ var BoxParser = {
 				  "esds", "subs",
 				  "txtC",
 				  "sidx", "emsg", "prft", "pssh",
-				  "elst", "dref", "url ", "urn ",
+				  "elst", "dref", 
 				  "sbgp", "sgpd",
 				  "cprt",
 				  "iods",
@@ -34,9 +30,12 @@ var BoxParser = {
 				  "schm", 
 				  "stvi", 
 				  "padb", "stdp", "sdtp", "saio", "saiz",
-				  "meta", "xml ", "bxml", "iloc", "pitm", "ipro", "iinf", "infe", "iref" , "mere", 
+				  "meta", "xml ", "bxml", "iloc", "pitm", "ipro", "iinf", "infe", "mere", 
 				  "kind", "elng", 
-				  "ipma", "pixi", "ispe"
+				  "ipma", "pixi", "ispe",
+				  "sthd",
+				  "tenc",
+				  "vpcC"
 				  /* missing "stsd", "iref", : special case full box and container */
 				],
 	containerBoxCodes : [ 
@@ -53,7 +52,6 @@ var BoxParser = {
 		[ "vttc" ], 
 		[ "tref" ],
 		[ "iref" ],
-		[ "udta" ],
 		[ "mfra" ],
 		[ "meco" ],
 		[ "hnti" ],
@@ -71,7 +69,7 @@ var BoxParser = {
 	sampleEntryCodes : [ 
 		/* 4CC as registered on http://mp4ra.org/codecs.html */
 		{ prefix: "Visual", types: [ "mp4v", "avc1", "avc2", "avc3", "avc4", "avcp", "drac", "encv", "mjp2", "mvc1", "mvc2", "resv", "s263", "svc1", "vc-1", "hvc1", "hev1"  ] },
-		{ prefix: "Audio", 	types: [ "mp4a", "ac-3", "alac", "dra1", "dtsc", "dtse", ,"dtsh", "dtsl", "ec-3", "enca", "g719", "g726", "m4ae", "mlpa",  "raw ", "samr", "sawb", "sawp", "sevc", "sqcp", "ssmv", "twos", ".mp3" ] },
+		{ prefix: "Audio", 	types: [ "mp4a", "ac-3", "alac", "dra1", "dtsc", "dtse", "dtsh", "dtsl", "ec-3", "enca", "g719", "g726", "m4ae", "mlpa",  "raw ", "samr", "sawb", "sawp", "sevc", "sqcp", "ssmv", "twos", ".mp3" ] },
 		{ prefix: "Hint", 	types: [ "fdp ", "m2ts", "pm2t", "prtp", "rm2t", "rrtp", "rsrp", "rtp ", "sm2t", "srtp" ] },
 		{ prefix: "Metadata", types: [ "metx", "mett", "urim" ] },
 		{ prefix: "Subtitle", types: [ "stpp", "wvtt", "sbtt", "tx3g", "stxt" ] },
@@ -212,13 +210,15 @@ BoxParser.TRUN_FLAGS_FLAGS		= 0x400;
 BoxParser.TRUN_FLAGS_CTS_OFFSET	= 0x800;
 
 BoxParser.Box.prototype.add = function(name) {
-	var i, j;
-	var box = new BoxParser[name+"Box"]();
+	return this.addBox(new BoxParser[name+"Box"]());
+}
+
+BoxParser.Box.prototype.addBox = function(box) {
 	this.boxes.push(box);
-	if (this[name+"s"]) {
-		this[name+"s"].push(box);
+	if (this[box.type+"s"]) {
+		this[box.type+"s"].push(box);
 	} else {
-		this[name] = box;
+		this[box.type] = box;
 	}
 	return box;
 }
diff --git a/src/isofile-advanced-creation.js b/src/isofile-advanced-creation.js
@@ -1,15 +1,17 @@
 ISOFile.prototype.add = BoxParser.Box.prototype.add;
+ISOFile.prototype.addBox = BoxParser.Box.prototype.addBox;
 
-ISOFile.prototype.init = function () {
-	var ftyp = this.add("ftyp").set("major_brand", "iso4")
+ISOFile.prototype.init = function (_options) {
+	var options = _options || {}; 
+	var ftyp = this.add("ftyp").set("major_brand", (options.brands && options.brands[0]) || "iso4")
 							   .set("minor_version", 0)
-							   .set("compatible_brands", []);
+							   .set("compatible_brands", options.brands || ["iso4"]);
 	var moov = this.add("moov");
-	moov.add("mvhd").set("timescale",600)
-					.set("rate", 1)
+	moov.add("mvhd").set("timescale", options.timescale || 600)
+					.set("rate", options.rate || 1)
 					.set("creation_time", 0)
 					.set("modification_time", 0)
-					.set("duration", 0)
+					.set("duration", options.duration || 0)
 					.set("volume", 1)
 					.set("matrix", [ 0, 0, 0, 0, 0, 0, 0, 0, 0])
 					.set("next_track_id", 1);
@@ -19,7 +21,7 @@ ISOFile.prototype.init = function () {
 
 ISOFile.prototype.addTrack = function (_options) {
 	if (!this.moov) {
-		this.init();
+		this.init(_options);
 	}
 
 	var options = _options || {}; 
@@ -30,11 +32,14 @@ ISOFile.prototype.addTrack = function (_options) {
 
 	var trak = this.moov.add("trak");
 	this.moov.mvhd.next_track_id = options.id+1;
-	trak.add("tkhd").set("creation_time",0)
+	trak.add("tkhd").set("flags",BoxParser.TKHD_FLAG_ENABLED | 
+								 BoxParser.TKHD_FLAG_IN_MOVIE | 
+								 BoxParser.TKHD_FLAG_IN_PREVIEW)
+					.set("creation_time",0)
 					.set("modification_time", 0)
 					.set("track_id", options.id)
-					.set("duration", 0)
-					.set("layer", 0)
+					.set("duration", options.duration || 0)
+					.set("layer", options.layer || 0)
 					.set("alternate_group", 0)
 					.set("volume", 1)
 					.set("matrix", [ 0, 0, 0, 0, 0, 0, 0, 0, 0 ])
@@ -45,7 +50,7 @@ ISOFile.prototype.addTrack = function (_options) {
 	mdia.add("mdhd").set("creation_time", 0)
 					.set("modification_time", 0)
 					.set("timescale", options.timescale || 1)
-					.set("duration", 0)
+					.set("duration", options.media_duration || 0)
 					.set("language", options.language || 0);
 
 	mdia.add("hdlr").set("handler", options.hdlr || "vide")
@@ -54,7 +59,9 @@ ISOFile.prototype.addTrack = function (_options) {
 	mdia.add("elng").set("extended_language", options.language || "fr-FR");
 
 	var minf = mdia.add("minf");
-	var sample_entry = new BoxParser[options.type+"SampleEntry"]();
+	if (BoxParser[options.type+"SampleEntry"] === undefined) return;
+	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];
@@ -66,30 +73,39 @@ ISOFile.prototype.addTrack = function (_options) {
 	switch(media_type) {
 		case "Visual":
 			minf.add("vmhd").set("graphicsmode",0).set("opcolor", [ 0, 0, 0 ]);
-			sample_entry.set("width", options.width)
+			sample_description_entry.set("width", options.width)
 						.set("height", options.height)
 						.set("horizresolution", 0x48<<16)
 						.set("vertresolution", 0x48<<16)
 						.set("frame_count", 1)
 						.set("compressorname", options.type+" Compressor")
 						.set("depth", 0x18);
-
-			sample_entry.add("avcC").set("SPS", [])
-									.set("PPS", [])
-									.set("configurationVersion", 1)
-									.set("AVCProfileIndication",0)
-									.set("profile_compatibility", 0)
-									.set("AVCLevelIndication" ,0)
-									.set("lengthSizeMinusOne", 0);
+		// sample_description_entry.add("avcC").set("SPS", [])
+		// 						.set("PPS", [])
+		// 						.set("configurationVersion", 1)
+		// 						.set("AVCProfileIndication",0)
+		// 						.set("profile_compatibility", 0)
+		// 						.set("AVCLevelIndication" ,0)
+		// 						.set("lengthSizeMinusOne", 0);
 			break;
 		case "Audio":
-			minf.add("smhd");
+			minf.add("smhd").set("balance", options.balance || 0);
+			sample_description_entry.set("channel_count", options.channel_count || 2)
+						.set("samplesize", options.samplesize || 16)
+						.set("samplerate", options.samplerate || 1<<16);
 			break;
 		case "Hint":
-			minf.add("hmhd");
+			minf.add("hmhd"); // TODO: add properties
 			break;
 		case "Subtitle":
 			minf.add("sthd");
+			switch (options.type) {
+				case "stpp":
+					sample_description_entry.set("namespace", options.namespace || "nonamespace")
+								.set("schema_location", options.schema_location || "")
+								.set("auxiliary_mime_types", options.auxiliary_mime_types || "");
+					break;
+			}
 			break;
 		case "Metadata":
 			minf.add("nmhd");
@@ -101,9 +117,12 @@ ISOFile.prototype.addTrack = function (_options) {
 			minf.add("nmhd");
 			break;
 	}
+	if (options.description) {
+		sample_description_entry.addBox(options.description);
+	}
 	minf.add("dinf").add("dref").addEntry((new BoxParser["url Box"]()).set("flags", 0x1));
 	var stbl = minf.add("stbl");
-	stbl.add("stsd").addEntry(sample_entry);
+	stbl.add("stsd").addEntry(sample_description_entry);
 	stbl.add("stts").set("sample_counts", [])
 					.set("sample_deltas", []);
 	stbl.add("stsc").set("first_chunk", [])
@@ -118,18 +137,20 @@ ISOFile.prototype.addTrack = function (_options) {
 							  .set("default_sample_size", options.default_sample_size || 0)
 							  .set("default_sample_flags", options.default_sample_flags || 0);
 	this.buildTrakSampleLists(trak);
-	return trak;
+	return options.id;
 }
 
-BoxParser.Box.prototype.computeSize = function() {
+BoxParser.Box.prototype.computeSize = function(stream_) {
 	var stream = stream_ || new DataStream();
 	stream.endianness = DataStream.BIG_ENDIAN;
 	this.write(stream);
 }
 
-ISOFile.prototype.addSample = function (trak, data, _options) {
+ISOFile.prototype.addSample = function (track_id, data, _options) {
 	var options = _options || {};
 	var sample = {};
+	var trak = this.getTrackById(track_id);
+	if (trak === null) return;
     sample.number = trak.samples.length;
 	sample.track_id = trak.tkhd.track_id;
 	sample.timescale = trak.mdia.mdhd.timescale;
@@ -155,13 +176,13 @@ ISOFile.prototype.addSample = function (trak, data, _options) {
 
 	this.processSamples();
 	
-	//var moof = ISOFile.createSingleSampleMoof(sample);
-	//this.moofs.push(moof);
-	//this.boxes.push(moof);
-	//moof.computeSize();
-	///* adjusting the data_offset now that the moof size is known*/
-	//moof.trafs[0].truns[0].data_offset = moof.size+8; //8 is mdat header
-	//this.add("mdat").data = data;
+	var moof = ISOFile.createSingleSampleMoof(sample);
+	this.addBox(moof);
+	moof.computeSize();
+	/* adjusting the data_offset now that the moof size is known*/
+	moof.trafs[0].truns[0].data_offset = moof.size+8; //8 is mdat header
+	this.add("mdat").data = data;
+	return sample;
 }
 
 ISOFile.createSingleSampleMoof = function(sample) {
diff --git a/src/mp4box.js b/src/mp4box.js
@@ -13,5 +13,5 @@ MP4Box.createFile = function (_keepMdatData, _stream) {
 }
 
 if (typeof exports !== 'undefined') {
-	module.exports = MP4Box;	
+	exports.createFile = MP4Box.createFile;	
 }
diff --git a/src/parsing/rtp.js b/src/parsing/rtp.js
diff --git a/src/writing/sampleentry.js b/src/writing/sampleentry.js
@@ -59,3 +59,15 @@ BoxParser.AudioSampleEntry.prototype.write = function(stream) {
 	stream.writeUint32(this.samplerate<<16);
 	this.writeFooter(stream);
 }
+
+BoxParser.stppSampleEntry.prototype.write = function(stream) {
+	this.writeHeader(stream);
+	this.size += this.namespace.length+1+
+				 this.schema_location.length+1+
+				 this.auxiliary_mime_types.length+1;
+	stream.writeCString(this.namespace);
+	stream.writeCString(this.schema_location);
+	stream.writeCString(this.auxiliary_mime_types);
+	this.writeFooter(stream);
+}
+
diff --git a/test/node/info.js b/test/node/info.js
@@ -1,13 +1,13 @@
 var fs = require('fs');
-var MP4Box = require('mp4box');
+var MP4Box = require('../../dist/mp4box.all.js');
 
 if (process.argv.length > 2) {
 	var mp4boxfile = MP4Box.createFile();
 	var arrayBuffer = new Uint8Array(fs.readFileSync(process.argv[2])).buffer;
 	arrayBuffer.fileStart = 0;
 
 	mp4boxfile.appendBuffer(arrayBuffer);
-	console.log(mp4boxfile.getInfo());
+	console.log(mp4boxfile.print(MP4Box.Log));
 } else {
 	console.log("usage: node info.js <file>");
 }
diff --git a/test/node/print.js b/test/node/print.js
diff --git a/test/qunit-helper.js b/test/qunit-helper.js
diff --git a/test/qunit-iso-creation.js b/test/qunit-iso-creation.js

Original file line number	Diff line number	Diff line change
`@@ -566,6 +566,9 @@ DataStream.prototype.readCString = function(length) {`
`566`	`566`	`*/`
`567`	`567`	`var MAX_SIZE = Math.pow(2, 32);`
`568`	`568`
	`569`	`+DataStream.prototype.readInt64 = function () {`
	`570`	`+ return (this.readInt32()*MAX_SIZE)+this.readUint32();`
	`571`	`+}`
`569`	`572`	`DataStream.prototype.readUint64 = function () {`
`570`	`573`	`return (this.readUint32()*MAX_SIZE)+this.readUint32();`
`571`	`574`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,5 +13,5 @@ MP4Box.createFile = function (_keepMdatData, _stream) {`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`if (typeof exports !== 'undefined') {`
`16`		`- module.exports = MP4Box;`
	`16`	`+ exports.createFile = MP4Box.createFile;`
`17`	`17`	`}`