WIP: calculating data offsets in the trun

@@ -422,6 +422,7 @@ tkhd = function(track) {
 };
 };
 
 
 traf = function(track) {
 traf = function(track) {
+  var sampleDependencyTable = sdtp(track);
   return box(types.traf,
   return box(types.traf,
              box(types.tfhd, new Uint8Array([
              box(types.tfhd, new Uint8Array([
                0x00, // version 0
                0x00, // version 0
@@ -436,8 +437,15 @@ traf = function(track) {
                0x00, 0x00, 0x00, // flags
                0x00, 0x00, 0x00, // flags
                0x00, 0x00, 0x00, 0x00 // baseMediaDecodeTime
                0x00, 0x00, 0x00, 0x00 // baseMediaDecodeTime
              ])),
              ])),
-             trun(track),
-             sdtp(track));
+             trun(track,
+                  sdtp.length +
+                  16 + // tfhd
+                  16 + // tfdt
+                  8 +  // traf header
+                  16 + // mfhd
+                  8 +  // moof header
+                  8),  // mdat header
+             sampleDependencyTable);
 };
 };
 
 
 /**
 /**
@@ -467,10 +475,11 @@ trex = function(track) {
   ]));
   ]));
 };
 };
 
 
-trun = function(track) {
+trun = function(track, offset) {
   var bytes, samples, sample, i;
   var bytes, samples, sample, i;
 
 
   samples = track.samples || [];
   samples = track.samples || [];
+  offset += 8 + 12 + (16 * samples.length);
 
 
   bytes = [
   bytes = [
     0x00, // version 0
     0x00, // version 0
@@ -479,7 +488,10 @@ trun = function(track) {
     (samples.length & 0xFF0000) >>> 16,
     (samples.length & 0xFF0000) >>> 16,
     (samples.length & 0xFF00) >>> 8,
     (samples.length & 0xFF00) >>> 8,
     samples.length & 0xFF, // sample_count
     samples.length & 0xFF, // sample_count
-    0x00, 0x00, 0x00, 0x00 // data_offset
+    (offset & 0xFF000000) >>> 24,
+    (offset & 0xFF0000) >>> 16,
+    (offset & 0xFF00) >>> 8,
+    offset & 0xFF // data_offset
   ];
   ];
 
 
   for (i = 0; i < samples.length; i++) {
   for (i = 0; i < samples.length; i++) {
@@ -503,7 +515,7 @@ trun = function(track) {
       (sample.compositionTimeOffset & 0xFF000000) >>> 24,
       (sample.compositionTimeOffset & 0xFF000000) >>> 24,
       (sample.compositionTimeOffset & 0xFF0000) >>> 16,
       (sample.compositionTimeOffset & 0xFF0000) >>> 16,
       (sample.compositionTimeOffset & 0xFF00) >>> 8,
       (sample.compositionTimeOffset & 0xFF00) >>> 8,
-      sample.compositionTimeOffset & 0xFF, // sample_composition_time_offset
+      sample.compositionTimeOffset & 0xFF // sample_composition_time_offset
     ]);
     ]);
   }
   }
   return box(types.trun, new Uint8Array(bytes));
   return box(types.trun, new Uint8Array(bytes));

@@ -353,6 +353,7 @@ test('generates a minimal moof', function() {
   equal(trun.type, 'trun', 'generated a trun box');
   equal(trun.type, 'trun', 'generated a trun box');
   equal(typeof trun.dataOffset, 'number', 'has a data offset');
   equal(typeof trun.dataOffset, 'number', 'has a data offset');
   ok(trun.dataOffset >= 0, 'has a non-negative data offset');
   ok(trun.dataOffset >= 0, 'has a non-negative data offset');
+  equal(trun.dataOffset, moof[0].size + 8, 'sets the data offset past the mdat header');
   equal(trun.samples.length, 2, 'wrote two samples');
   equal(trun.samples.length, 2, 'wrote two samples');
 
 
   equal(trun.samples[0].duration, 9000, 'wrote a sample duration');
   equal(trun.samples[0].duration, 9000, 'wrote a sample duration');

@@ -888,6 +888,12 @@ validateTrackFragment = function(track, metadata) {
 
 
   trun = track.boxes[2];
   trun = track.boxes[2];
   ok(trun.dataOffset >= 0, 'set data offset');
   ok(trun.dataOffset >= 0, 'set data offset');
+  equal(trun.dataOffset,
+        trun.size +
+        16 + // mfhd size
+        8 + // moof header size
+        8, // mdat header size
+        'uses movie fragment relative addressing');
   ok(trun.samples.length > 0, 'generated media samples');
   ok(trun.samples.length > 0, 'generated media samples');
   for (i = 0; i < trun.samples.length; i++) {
   for (i = 0; i < trun.samples.length; i++) {
     sample = trun.samples[i];
     sample = trun.samples[i];