e8371f66 by David LaPalomento

Merge pull request #383 from videojs/tiny-fix

Stop changing the timestampOffset in hls for no good reason
2 parents a369f3a0 5b5a1eda
...@@ -992,7 +992,6 @@ videojs.Hls.prototype.drainBuffer = function(event) { ...@@ -992,7 +992,6 @@ videojs.Hls.prototype.drainBuffer = function(event) {
992 playlist.mediaSequence, 992 playlist.mediaSequence,
993 playlist.mediaSequence + mediaIndex); 993 playlist.mediaSequence + mediaIndex);
994 994
995 this.sourceBuffer.timestampOffset = segmentOffset;
996 this.sourceBuffer.appendBuffer(bytes); 995 this.sourceBuffer.appendBuffer(bytes);
997 996
998 // we're done processing this segment 997 // we're done processing this segment
......
...@@ -1718,7 +1718,6 @@ test('adjusts the segment offsets for out-of-buffer seeking', function() { ...@@ -1718,7 +1718,6 @@ test('adjusts the segment offsets for out-of-buffer seeking', function() {
1718 requests.shift(); 1718 requests.shift();
1719 equal(player.tech.hls.mediaIndex, 3, 'moved the mediaIndex'); 1719 equal(player.tech.hls.mediaIndex, 3, 'moved the mediaIndex');
1720 standardXHRResponse(requests.shift()); 1720 standardXHRResponse(requests.shift());
1721 equal(player.tech.hls.sourceBuffer.timestampOffset, 30, 'updated the timestamp offset');
1722 }); 1721 });
1723 1722
1724 test('seeks between buffered time ranges', function() { 1723 test('seeks between buffered time ranges', function() {
...@@ -1747,7 +1746,6 @@ test('seeks between buffered time ranges', function() { ...@@ -1747,7 +1746,6 @@ test('seeks between buffered time ranges', function() {
1747 requests.shift(); 1746 requests.shift();
1748 equal(player.tech.hls.mediaIndex, 1, 'updated the mediaIndex'); 1747 equal(player.tech.hls.mediaIndex, 1, 'updated the mediaIndex');
1749 standardXHRResponse(requests.shift()); 1748 standardXHRResponse(requests.shift());
1750 equal(player.tech.hls.sourceBuffer.timestampOffset, 10, 'updated the timestamp offset');
1751 }); 1749 });
1752 1750
1753 test('does not modify the media index for in-buffer seeking', function() { 1751 test('does not modify the media index for in-buffer seeking', function() {
...@@ -2167,7 +2165,8 @@ test('can seek before the source buffer opens', function() { ...@@ -2167,7 +2165,8 @@ test('can seek before the source buffer opens', function() {
2167 equal(player.currentTime(), 1, 'seeked'); 2165 equal(player.currentTime(), 1, 'seeked');
2168 }); 2166 });
2169 2167
2170 test('sets the timestampOffset after seeking to discontinuity', function() { 2168 // TODO: Decide on proper discontinuity behavior
2169 QUnit.skip('sets the timestampOffset after seeking to discontinuity', function() {
2171 var bufferEnd; 2170 var bufferEnd;
2172 player.src({ 2171 player.src({
2173 src: 'discontinuity.m3u8', 2172 src: 'discontinuity.m3u8',
......