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) {
playlist.mediaSequence,
playlist.mediaSequence + mediaIndex);
this.sourceBuffer.timestampOffset = segmentOffset;
this.sourceBuffer.appendBuffer(bytes);
// we're done processing this segment
......
......@@ -1718,7 +1718,6 @@ test('adjusts the segment offsets for out-of-buffer seeking', function() {
requests.shift();
equal(player.tech.hls.mediaIndex, 3, 'moved the mediaIndex');
standardXHRResponse(requests.shift());
equal(player.tech.hls.sourceBuffer.timestampOffset, 30, 'updated the timestamp offset');
});
test('seeks between buffered time ranges', function() {
......@@ -1747,7 +1746,6 @@ test('seeks between buffered time ranges', function() {
requests.shift();
equal(player.tech.hls.mediaIndex, 1, 'updated the mediaIndex');
standardXHRResponse(requests.shift());
equal(player.tech.hls.sourceBuffer.timestampOffset, 10, 'updated the timestamp offset');
});
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() {
equal(player.currentTime(), 1, 'seeked');
});
test('sets the timestampOffset after seeking to discontinuity', function() {
// TODO: Decide on proper discontinuity behavior
QUnit.skip('sets the timestampOffset after seeking to discontinuity', function() {
var bufferEnd;
player.src({
src: 'discontinuity.m3u8',
......