Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Buffer management changes #2272

Closed
wants to merge 8 commits into from
Closed

Buffer management changes #2272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
ed482a6
Reduce epsilon value and make it configurable
jeoliva Oct 20, 2017
a2e5987
Fix issue when quota exceed situations happen
jeoliva Oct 23, 2017
5aa7380
Improve management of buffer ahead playback position
jeoliva Oct 23, 2017
7df772e
Add unit tests in SourceBufferController
jeoliva Oct 31, 2017
d91a613
Merge with development branch
jeoliva Nov 3, 2017
71570bb
When deactivating a stream, remove loaded fragments accordingly
jeoliva Nov 3, 2017
448410b
Add unit test for mediaPlayer method setSegmentOverlapToleranceTime
jeoliva Nov 10, 2017
c1186f9
Resolve conflicts
jeoliva Nov 13, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/dash/DashAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@ function DashAdapter() {
checkStreamProcessor(streamProcessor);

const indexHandler = streamProcessor.getIndexHandler();
if (indexHandler) {
if (indexHandler && !isNaN(value)) {
indexHandler.setCurrentTime(value);
}
}
Expand Down
63 changes: 30 additions & 33 deletions src/dash/DashHandler.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,10 +39,8 @@ import FactoryMaker from '../core/FactoryMaker';
import Debug from '../core/Debug';
import URLUtils from '../streaming/utils/URLUtils';
import Representation from './vo/Representation';

import {replaceTokenForTemplate, getTimeBasedSegment, getSegmentByIndex} from './utils/SegmentsUtils';
import SegmentsGetter from './utils/SegmentsGetter';

import SegmentBaseLoader from './SegmentBaseLoader';
import WebmSegmentBaseLoader from './WebmSegmentBaseLoader';

Expand All @@ -55,13 +53,13 @@ function DashHandler(config) {
let eventBus = EventBus(context).getInstance();
const urlUtils = URLUtils(context).getInstance();

let segmentBaseLoader;
let timelineConverter = config.timelineConverter;
let dashMetrics = config.dashMetrics;
let metricsModel = config.metricsModel;
let mediaPlayerModel = config.mediaPlayerModel;
let errHandler = config.errHandler;
const timelineConverter = config.timelineConverter;
const dashMetrics = config.dashMetrics;
const metricsModel = config.metricsModel;
const mediaPlayerModel = config.mediaPlayerModel;
const errHandler = config.errHandler;
const baseURLController = config.baseURLController;
let segmentBaseLoader;

let instance,
log,
Expand Down Expand Up @@ -90,15 +88,14 @@ function DashHandler(config) {
}

function isWebM (mimeType) {
let type = mimeType.split('/')[1];

const type = mimeType.split('/')[1];
return 'webm' === type.toLowerCase();
}

function initialize(StreamProcessor) {
streamProcessor = StreamProcessor;

let isDynamic = streamProcessor ? streamProcessor.getStreamInfo().manifestInfo.isDynamic : null;
const isDynamic = streamProcessor ? streamProcessor.getStreamInfo().manifestInfo.isDynamic : null;

segmentBaseLoader.initialize();

Expand Down Expand Up @@ -143,7 +140,7 @@ function DashHandler(config) {

function replaceIDForTemplate(url, value) {
if (value === null || url === null || url.indexOf('$RepresentationID$') === -1) { return url; }
let v = value.toString();
const v = value.toString();
return url.split('$RepresentationID$').join(v);
}

Expand Down Expand Up @@ -174,7 +171,6 @@ function DashHandler(config) {
}

function generateInitRequest(representation, mediaType) {

const request = new FragmentRequest();
const period = representation.adaptation.period;
const presentationStartTime = period.start;
Expand Down Expand Up @@ -202,7 +198,6 @@ function DashHandler(config) {
}

function isMediaFinished(representation) {

let isFinished = false;
const isDynamic = streamProcessor ? streamProcessor.getStreamInfo().manifestInfo.isDynamic : null;

Expand Down Expand Up @@ -244,7 +239,6 @@ function DashHandler(config) {
}

function updateSegmentList(voRepresentation) {

if (!voRepresentation) {
throw new Error('no representation');
}
Expand Down Expand Up @@ -305,10 +299,14 @@ function DashHandler(config) {
i;

if (segments && ln > 0) {
// In case timeThreshold is not provided, let's use the default value set in MediaPlayerModel
timeThreshold = (timeThreshold === undefined || timeThreshold === null) ?
mediaPlayerModel.getSegmentOverlapToleranceTime() : timeThreshold;
for (i = 0; i < ln; i++) {
frag = segments[i];
ft = frag.presentationStartTime;
fd = frag.duration;
// In case timeThreshold is null, set epsilon to half the fragment duration
epsilon = (timeThreshold === undefined || timeThreshold === null) ? fd / 2 : timeThreshold;
if ((time + epsilon) >= ft &&
(time - epsilon) < (ft + fd)) {
Expand All @@ -326,12 +324,12 @@ function DashHandler(config) {
return null;
}

let request = new FragmentRequest();
let representation = segment.representation;
let bandwidth = representation.adaptation.period.mpd.manifest.Period_asArray[representation.adaptation.period.index].
const request = new FragmentRequest();
const representation = segment.representation;
const bandwidth = representation.adaptation.period.mpd.manifest.Period_asArray[representation.adaptation.period.index].
AdaptationSet_asArray[representation.adaptation.index].Representation_asArray[representation.index].bandwidth;
let url = segment.media;
const type = streamProcessor ? streamProcessor.getType() : null;
let url = segment.media;

url = replaceTokenForTemplate(url, 'Number', segment.replacementNumber);
url = replaceTokenForTemplate(url, 'Time', segment.replacementTime);
Expand Down Expand Up @@ -365,18 +363,18 @@ function DashHandler(config) {

const type = streamProcessor ? streamProcessor.getType() : null;
const isDynamic = streamProcessor ? streamProcessor.getStreamInfo().manifestInfo.isDynamic : null;
let idx = index;
let keepIdx = options ? options.keepIdx : false;
let timeThreshold = options ? options.timeThreshold : null;
let ignoreIsFinished = (options && options.ignoreIsFinished) ? true : false;
const idx = index;
const keepIdx = options ? options.keepIdx : false;
const timeThreshold = options ? options.timeThreshold : null;
const ignoreIsFinished = (options && options.ignoreIsFinished) ? true : false;

if (!representation) {
return null;
}

if (requestedTime !== time) { // When playing at live edge with 0 delay we may loop back with same time and index until it is available. Reduces verboseness of logs.
requestedTime = time;
log('Getting the request for ' + type + ' time : ' + time);
log('Getting the request for ' + type + ' time : ' + time + ', keepIdx: ' + keepIdx);
}

updateSegments(representation);
Expand All @@ -398,7 +396,7 @@ function DashHandler(config) {
request.index = index;
request.mediaType = type;
request.mediaInfo = streamProcessor.getMediaInfo();
log('Signal complete.', request);
log('Signal complete in getSegmentRequestForTime - ', type, ' - Request:', request);

} else {
segment = getSegmentByIndex(index, representation);
Expand Down Expand Up @@ -436,10 +434,10 @@ function DashHandler(config) {
requestedTime = null;
index++;

log('Getting the next request at index: ' + index);
log('Getting the next request at index: ' + index + ', type: ' + type);

// check that there is a segment in this index. If none, update segments and wait for next time loop is called
let seg = getSegmentByIndex(index, representation);
const seg = getSegmentByIndex(index, representation);
if (!seg && isDynamic) {
log('No segment found at index: ' + index + '. Wait for next loop');
updateSegments(representation);
Expand All @@ -454,7 +452,7 @@ function DashHandler(config) {
request.index = index;
request.mediaType = type;
request.mediaInfo = streamProcessor.getMediaInfo();
log('Signal complete.');
log('Signal complete -', type);
} else {
updateSegments(representation);
segment = getSegmentByIndex(index, representation);
Expand All @@ -475,8 +473,7 @@ function DashHandler(config) {
}

function onInitializationLoaded(e) {
let representation = e.representation;
//log("Got an initialization.");
const representation = e.representation;
if (!representation.segments) return;

eventBus.trigger(Events.REPRESENTATION_UPDATED, {sender: this, representation: representation});
Expand All @@ -488,8 +485,8 @@ function DashHandler(config) {
if (e.error || (type !== e.mediaType)) return;

const fragments = e.segments;
let representation = e.representation;
let segments = [];
const representation = e.representation;
const segments = [];
let count = 0;

let i,
Expand Down Expand Up @@ -547,7 +544,7 @@ function DashHandler(config) {
}

DashHandler.__dashjs_factory_name = 'DashHandler';
let factory = FactoryMaker.getClassFactory(DashHandler);
const factory = FactoryMaker.getClassFactory(DashHandler);
factory.SEGMENTS_UNAVAILABLE_ERROR_CODE = SEGMENTS_UNAVAILABLE_ERROR_CODE;
FactoryMaker.updateClassFactory(DashHandler.__dashjs_factory_name, factory);
export default factory;
1 change: 0 additions & 1 deletion src/dash/utils/TimelineConverter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ function TimelineConverter() {
}

function calcPresentationTimeFromWallTime(wallTime, period) {
//console.log("XXX", wallTime.getTime() - period.mpd.availabilityStartTime.getTime(), clientServerTimeShift * 1000, clientServerTimeShift, period.mpd.availabilityStartTime.getTime())
return ((wallTime.getTime() - period.mpd.availabilityStartTime.getTime() + clientServerTimeShift * 1000) / 1000);
}

Expand Down