fix rounding issue

Author: tomasz-oponowicz

site/demo/debug/dashas.swf

@@ -18,18 +18,14 @@ public class AudioSegmentHandler extends MediaSegmentHandler {
         super(context, segment, messages, defaultSampleDuration, timescale, timestamp);
     }
 
-    protected override function buildMessage(sampleDuration:uint, sampleSize:uint, sampleDependsOn:uint,
+    protected override function buildMessage(sampleTimestamp:Number, sampleSize:uint, sampleDependsOn:uint,
                                              sampleIsDependedOn:uint, compositionTimeOffset:Number,
                                              dataOffset:uint, ba:ByteArray):FLVTag {
         var message:FLVTag = _context.buildFLVTag();
 
         message.markAsAudio();
-
-        message.timestamp = _timestamp;
-        _timestamp = message.timestamp + sampleDuration * 1000 / _timescale;
-
+        message.timestamp = sampleTimestamp;
         message.length = sampleSize;
-
         message.dataOffset = dataOffset;
 
         message.data = new ByteArray();

site/demo/production/dashas.swf

@@ -94,13 +94,17 @@ public class MediaSegmentHandler extends SegmentHandler {
         var dataOffset:uint = runBox.dataOffset + baseDataOffset;
         var sampleSizes:Vector.<uint> = runBox.sampleSize;
 
+        var samplesDuration:uint = 0;
         for (var i:uint = 0; i < sampleSizes.length; i++) {
             var sampleDuration:uint = loadSampleDuration(runBox, i);
             var compositionTimeOffset:int = loadCompositionTimeOffset(runBox, i);
             var sampleDependsOn:uint = loadSampleDependsOn(runBox, i);
             var sampleIsDependedOn:uint = loadSampleIsDependedOn(runBox, i);
 
-            var message:FLVTag = buildMessage(sampleDuration, sampleSizes[i], sampleDependsOn, sampleIsDependedOn,
+            samplesDuration += sampleDuration;
+            var sampleTimestamp:Number = _timestamp + ((samplesDuration * 1000) / _timescale);
+
+            var message:FLVTag = buildMessage(sampleTimestamp, sampleSizes[i], sampleDependsOn, sampleIsDependedOn,
                     compositionTimeOffset, dataOffset, ba);
 
             _messages.push(message);
@@ -125,7 +129,7 @@ public class MediaSegmentHandler extends SegmentHandler {
         return i < runBox.sampleIsDependedOn.length ? runBox.sampleIsDependedOn[i] : 0;
     }
 
-    protected function buildMessage(sampleDuration:uint, sampleSize:uint, sampleDependsOn:uint,
+    protected function buildMessage(sampleTimestamp:Number, sampleSize:uint, sampleDependsOn:uint,
                                     sampleIsDependedOn:uint, compositionTimeOffset:Number,
                                     dataOffset:uint, ba:ByteArray):FLVTag {
         throw new IllegalOperationError("Method isn't implemented");

src/main/actionscript/com/castlabs/dash/handlers/AudioSegmentHandler.as

@@ -13,25 +13,20 @@ import com.castlabs.dash.boxes.FLVTag;
 import flash.utils.ByteArray;
 
 public class VideoSegmentHandler extends MediaSegmentHandler {
-    private static const MIN_CTO:int = -33;
-
     public function VideoSegmentHandler(context:DashContext, segment:ByteArray, messages:Vector.<FLVTag>,
                                         defaultSampleDuration:uint, timescale:uint, timestamp:Number) {
         super(context, segment, messages, defaultSampleDuration, timescale, timestamp);
     }
 
-    protected override function buildMessage(sampleDuration:uint, sampleSize:uint, sampleDependsOn:uint,
+    protected override function buildMessage(sampleTimestamp:Number, sampleSize:uint, sampleDependsOn:uint,
                                              sampleIsDependedOn:uint, compositionTimeOffset:Number,
                                              dataOffset:uint, ba:ByteArray):FLVTag {
         var message:FLVTag = _context.buildFLVTag();
 
         message.markAsVideo();
 
-        message.timestamp = _timestamp;
-        _timestamp = message.timestamp + sampleDuration * 1000 / _timescale;
-
+        message.timestamp = sampleTimestamp;
         message.length = sampleSize;
-
         message.dataOffset = dataOffset;
 
         message.data = new ByteArray();
@@ -49,7 +44,7 @@ public class VideoSegmentHandler extends MediaSegmentHandler {
         }
 
         if (!isNaN(compositionTimeOffset)) {
-            message.compositionTimestamp = compositionTimeOffset * 1000 / _timescale - MIN_CTO;
+            message.compositionTimestamp = compositionTimeOffset * 1000 / _timescale;
         }
 
         return message;