mirror of
https://github.com/shaka-project/shaka-player.git
synced 2026-06-26 17:46:26 +03:00
e5ce395f37
The bulk of the logic for gap jumping is handled in Playhead. It
tracks the current buffered ranges and jumps over any gaps that appear.
It listens for a special browser event ('waiting') for when the video
element runs out of playable frames.
This change also removes the logic for jumping gaps at the beginning
of the timeline. This is handled by the more general gap jumping
logic and works cross-browser.
Finally, this updates the buffering logic to only count the amount of
content buffered (i.e. ignoring the gaps). This fixes some bugs where
gaps in the content can result in StreamingEngine buffering forever
since it thinks only a little is buffered.
This includes full implementation of the logic, but this doesn't close
the issue since there aren't any integration tests yet. Those will
be added next.
Issue #555
Change-Id: Id99eb9fe469e8cf2c7464a3d70c3733791e806e0
149 lines
4.9 KiB
JavaScript
149 lines
4.9 KiB
JavaScript
/**
|
|
* @license
|
|
* Copyright 2016 Google Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
describe('TimeRangesUtils', function() {
|
|
describe('isBuffered', function() {
|
|
var isBuffered;
|
|
|
|
beforeAll(function() {
|
|
isBuffered = shaka.media.TimeRangesUtils.isBuffered;
|
|
});
|
|
|
|
it('still works when passed null', function() {
|
|
expect(isBuffered(null, 10)).toBe(false);
|
|
});
|
|
|
|
it('still works with nothing buffered', function() {
|
|
var b = createFakeBuffered([]);
|
|
expect(isBuffered(b, 10)).toBe(false);
|
|
});
|
|
|
|
it('returns buffered when inside a single range', function() {
|
|
var b = createFakeBuffered([{start: 10, end: 20}]);
|
|
expect(isBuffered(b, 13)).toBe(true);
|
|
});
|
|
|
|
// Ranges: [10-20], [30-40], [50-60]
|
|
defineTest('returns false when before range', {time: 3, expected: false});
|
|
defineTest('returns true inside first range', {time: 12, expected: true});
|
|
defineTest('returns true when inside gap', {time: 22, expected: true});
|
|
defineTest(
|
|
'returns true when inside last range', {time: 57, expected: true});
|
|
defineTest(
|
|
'returns false when after last range', {time: 3, expected: false});
|
|
|
|
/**
|
|
* @param {string} name
|
|
* @param {{time: number, expected: boolean}} data
|
|
*/
|
|
function defineTest(name, data) {
|
|
it(name, function() {
|
|
var b = createFakeBuffered(
|
|
[{start: 10, end: 20}, {start: 30, end: 40}, {start: 50, end: 60}]);
|
|
expect(isBuffered(b, data.time)).toBe(data.expected);
|
|
});
|
|
}
|
|
});
|
|
|
|
describe('bufferedAheadOf', function() {
|
|
var bufferedAheadOf;
|
|
|
|
beforeAll(function() {
|
|
bufferedAheadOf = shaka.media.TimeRangesUtils.bufferedAheadOf;
|
|
});
|
|
|
|
it('still works when passed null', function() {
|
|
expect(bufferedAheadOf(null, 10)).toBe(0);
|
|
});
|
|
|
|
it('still works when nothing is buffered', function() {
|
|
var b = createFakeBuffered([]);
|
|
expect(bufferedAheadOf(b, 10)).toBe(0);
|
|
});
|
|
|
|
|
|
// Ranges: [10-20], [30-40], [50-60]
|
|
defineTest(
|
|
'returns total when before first range', {time: 0, expected: 30});
|
|
defineTest(
|
|
'gives partial amount for first range', {time: 12, expected: 28});
|
|
defineTest('skips over first gap', {time: 25, expected: 20});
|
|
defineTest(
|
|
'gives partial amount for middle range', {time: 35, expected: 15});
|
|
defineTest('skips over last gap', {time: 45, expected: 10});
|
|
defineTest('gives partial amount for last range', {time: 55, expected: 5});
|
|
defineTest('returns 0 when past end', {time: 65, expected: 0});
|
|
|
|
/**
|
|
* @param {string} name
|
|
* @param {{time: number, expected: number}} data
|
|
*/
|
|
function defineTest(name, data) {
|
|
it(name, function() {
|
|
var b = createFakeBuffered(
|
|
[{start: 10, end: 20}, {start: 30, end: 40}, {start: 50, end: 60}]);
|
|
expect(bufferedAheadOf(b, data.time)).toBe(data.expected);
|
|
});
|
|
}
|
|
});
|
|
|
|
describe('getGapIndex', function() {
|
|
var getGapIndex;
|
|
|
|
beforeAll(function() {
|
|
getGapIndex = shaka.media.TimeRangesUtils.getGapIndex;
|
|
});
|
|
|
|
it('still works when passed null', function() {
|
|
expect(getGapIndex(null, 10)).toBe(null);
|
|
});
|
|
|
|
it('still works whith nothing buffered', function() {
|
|
var b = createFakeBuffered([]);
|
|
expect(getGapIndex(b, 10)).toBe(null);
|
|
});
|
|
|
|
|
|
// Ranges: [10-20], [30-40], [50-60]
|
|
defineTest('returns 0 when before first range', {time: 0, expected: 0});
|
|
defineTest('ignores when inside first range', {time: 12, expected: null});
|
|
defineTest(
|
|
'returns index when near end of first range',
|
|
{time: 19.95, expected: 1});
|
|
defineTest('returns index when inside first gap', {time: 25, expected: 1});
|
|
defineTest('ignores when inside middle range', {time: 35, expected: null});
|
|
defineTest(
|
|
'returns index when near end of middle range',
|
|
{time: 39.95, expected: 2});
|
|
defineTest('returns index when inside last gap', {time: 45, expected: 2});
|
|
defineTest('ignores when inside last range', {time: 55, expected: null});
|
|
defineTest('ignores when past end', {time: 65, expected: null});
|
|
|
|
/**
|
|
* @param {string} name
|
|
* @param {{time: number, expected: ?number}} data
|
|
*/
|
|
function defineTest(name, data) {
|
|
it(name, function() {
|
|
var b = createFakeBuffered(
|
|
[{start: 10, end: 20}, {start: 30, end: 40}, {start: 50, end: 60}]);
|
|
expect(getGapIndex(b, data.time)).toBe(data.expected);
|
|
});
|
|
}
|
|
});
|
|
});
|