move transmuxing into drainBuffer

@@ -412,23 +412,15 @@ videojs.Hls.prototype.loadSegment = function(segmentUri, offset) {
     tech.bandwidth = (this.response.byteLength / tech.segmentXhrTime) * 8 * 1000;
     tech.bandwidth = (this.response.byteLength / tech.segmentXhrTime) * 8 * 1000;
     tech.bytesReceived += this.response.byteLength;
     tech.bytesReceived += this.response.byteLength;
 
 
-    // transmux the segment data from MP2T to FLV
-    tech.segmentParser_.parseSegmentBinaryData(new Uint8Array(this.response));
-    tech.segmentParser_.flushTags();
-
     // package up all the work to append the segment
     // package up all the work to append the segment
     // if the segment is the start of a timestamp discontinuity,
     // if the segment is the start of a timestamp discontinuity,
     // we have to wait until the sourcebuffer is empty before
     // we have to wait until the sourcebuffer is empty before
     // aborting the source buffer processing
     // aborting the source buffer processing
-    tags = [];
-    while (tech.segmentParser_.tagsAvailable()) {
-      tags.push(tech.segmentParser_.getNextTag());
-    }
     tech.segmentBuffer_.push({
     tech.segmentBuffer_.push({
       mediaIndex: tech.mediaIndex,
       mediaIndex: tech.mediaIndex,
       playlist: tech.playlists.media(),
       playlist: tech.playlists.media(),
       offset: offset,
       offset: offset,
-      tags: tags
+      bytes: this.response
     });
     });
     tech.drainBuffer();
     tech.drainBuffer();
 
 
@@ -447,6 +439,7 @@ videojs.Hls.prototype.drainBuffer = function(event) {
     playlist,
     playlist,
     offset,
     offset,
     tags,
     tags,
+    bytes,
     segment,
     segment,
 
 
     ptsTime,
     ptsTime,
@@ -460,7 +453,7 @@ videojs.Hls.prototype.drainBuffer = function(event) {
   mediaIndex = segmentBuffer[0].mediaIndex;
   mediaIndex = segmentBuffer[0].mediaIndex;
   playlist = segmentBuffer[0].playlist;
   playlist = segmentBuffer[0].playlist;
   offset = segmentBuffer[0].offset;
   offset = segmentBuffer[0].offset;
-  tags = segmentBuffer[0].tags;
+  bytes = segmentBuffer[0].bytes;
   segment = playlist.segments[mediaIndex];
   segment = playlist.segments[mediaIndex];
 
 
   if (segment.key) {
   if (segment.key) {
@@ -489,6 +482,15 @@ videojs.Hls.prototype.drainBuffer = function(event) {
     this.el().vjs_setProperty('currentTime', segmentOffset * 0.001);
     this.el().vjs_setProperty('currentTime', segmentOffset * 0.001);
   }
   }
 
 
+  // transmux the segment data from MP2T to FLV
+  this.segmentParser_.parseSegmentBinaryData(new Uint8Array(bytes));
+  this.segmentParser_.flushTags();
+
+  tags = [];
+  while (this.segmentParser_.tagsAvailable()) {
+    tags.push(this.segmentParser_.getNextTag());
+  }
+
   // if we're refilling the buffer after a seek, scan through the muxed
   // if we're refilling the buffer after a seek, scan through the muxed
   // FLV tags until we find the one that is closest to the desired
   // FLV tags until we find the one that is closest to the desired
   // playback time
   // playback time