Mirror
/
videojs-http-streaming
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
Browse Source

Remove ad-hoc logging in favor of a config-enabled logging like playback-watcher (#1014)

pull/6/head
Jon-Carlos Rivera 9 years ago
committed by GitHub
parent
8afcc7c64d
commit
f323d266ef
2 changed files with 45 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 50
      src/segment-loader.js
  2. 26
      src/sync-controller.js

50
src/segment-loader.js
View File

@ -10,14 +10,6 @@ import { createTransferableMessage } from './bin-utils';
// in ms
const CHECK_BUFFER_DELAY = 500;
const c = 'console';
// temporary, switchable debug logging
const log = function() {
if (window.logit) {
window[c].log.apply(window[c], arguments);
}
};
/**
* Determines if we should call endOfStream on the media source based
@ -100,8 +92,6 @@ const initSegmentId = function(initSegment) {
export default class SegmentLoader extends videojs.EventTarget {
constructor(options) {
super();
let settings;
// check pre-conditions
if (!options) {
throw new TypeError('Initialization options are required');
@ -112,7 +102,7 @@ export default class SegmentLoader extends videojs.EventTarget {
if (!options.mediaSource) {
throw new TypeError('No MediaSource specified');
}
settings = videojs.mergeOptions(videojs.options.hls, options);
let settings = videojs.mergeOptions(videojs.options.hls, options);
// public properties
this.state = 'INIT';
@ -161,6 +151,10 @@ export default class SegmentLoader extends videojs.EventTarget {
// ...for determining the fetch location
this.fetchAtBuffer_ = false;
if (settings.debug) {
this.logger_ = videojs.log.bind(videojs, 'segment-loader', this.loaderType_, '->');
}
}
/**
@ -305,7 +299,7 @@ export default class SegmentLoader extends videojs.EventTarget {
// and we will likely need to adjust the mediaIndex
let mediaSequenceDiff = newPlaylist.mediaSequence - oldPlaylist.mediaSequence;
log('mediaSequenceDiff', mediaSequenceDiff);
this.logger_('mediaSequenceDiff', mediaSequenceDiff);
// update the mediaIndex on the SegmentLoader
// this is important because we can abort a request and this value must be
@ -462,9 +456,6 @@ export default class SegmentLoader extends videojs.EventTarget {
return null;
}
log('cB_', 'mediaIndex:', mediaIndex, 'hasPlayed:', hasPlayed, 'currentTime:', currentTime, 'syncPoint:', syncPoint, 'fetchAtBuffer:', this.fetchAtBuffer_);
log('cB_ 2', 'bufferedTime:', bufferedTime);
// if there is plenty of content buffered, and the video has
// been played before relax for awhile
if (bufferedTime >= Config.GOAL_BUFFER_LENGTH) {
@ -477,19 +468,27 @@ export default class SegmentLoader extends videojs.EventTarget {
return null;
}
this.logger_('checkBuffer_',
'mediaIndex:', mediaIndex,
'hasPlayed:', hasPlayed,
'currentTime:', currentTime,
'syncPoint:', syncPoint,
'fetchAtBuffer:', this.fetchAtBuffer_,
'bufferedTime:', bufferedTime);
// When the syncPoint is null, there is no way of determining a good
// conservative segment index to fetch from
// The best thing to do here is to get the kind of sync-point data by
// making a request
if (syncPoint === null) {
mediaIndex = this.getSyncSegmentCandidate_(playlist);
log('getSync', mediaIndex);
this.logger_('getSync', 'mediaIndex:', mediaIndex);
return this.generateSegmentInfo_(playlist, mediaIndex, null, true);
}
// Under normal playback conditions fetching is a simple walk forward
if (mediaIndex !== null) {
log('++', mediaIndex + 1);
this.logger_('walkForward', 'mediaIndex:', mediaIndex + 1);
let segment = playlist.segments[mediaIndex];
if (segment && segment.end) {
@ -522,7 +521,10 @@ export default class SegmentLoader extends videojs.EventTarget {
mediaIndex = mediaSourceInfo.mediaIndex;
startOfSegment = mediaSourceInfo.startTime;
}
log('gMIFT', mediaIndex, 'sos', startOfSegment);
this.logger_('getMediaIndexForTime',
'mediaIndex:', mediaIndex,
'startOfSegment:', startOfSegment);
return this.generateSegmentInfo_(playlist, mediaIndex, startOfSegment, false);
}
@ -1044,6 +1046,8 @@ export default class SegmentLoader extends videojs.EventTarget {
* @private
*/
handleUpdateEnd_() {
this.logger_('handleUpdateEnd_', 'segmentInfo:', this.pendingSegment_);
if (!this.pendingSegment_) {
this.state = 'READY';
if (!this.paused()) {
@ -1059,8 +1063,6 @@ export default class SegmentLoader extends videojs.EventTarget {
this.mediaIndex = segmentInfo.mediaIndex;
this.fetchAtBuffer_ = true;
log('handleUpdateEnd_', this.mediaIndex);
// any time an update finishes and the last segment is in the
// buffer, end the stream. this ensures the "ended" event will
// fire if playback reaches that point.
@ -1104,4 +1106,12 @@ export default class SegmentLoader extends videojs.EventTarget {
this.throughput.rate +=
(segmentProcessingThroughput - rate) / (++this.throughput.count);
}
/**
* A debugging logger noop that is set to console.log only if debugging
* is enabled globally
*
* @private
*/
logger_() {}
}

26
src/sync-controller.js
View File

@ -7,14 +7,6 @@ import {inspect as tsprobe} from 'mux.js/lib/tools/ts-inspector.js';
import {sumDurations} from './playlist';
import videojs from 'video.js';
const c = 'console';
// temporary, switchable debug logging
const log = function() {
if (window.logit) {
window[c].log.apply(window[c], arguments);
}
};
export const syncPointStrategies = [
// Stategy "VOD": Handle the VOD-case where the sync-point is *always*
// the equivalence display-time 0 === segment-index 0
@ -125,6 +117,10 @@ export default class SyncController extends videojs.EventTarget {
this.timelines = [];
this.discontinuities = [];
this.datetimeToDisplayTime = null;
if (videojs.options.hls && videojs.options.hls.debug) {
this.logger_ = videojs.log.bind(videojs, 'sync-controller ->');
}
}
/**
@ -145,7 +141,7 @@ export default class SyncController extends videojs.EventTarget {
let syncPoint = strategy.run(this, playlist, duration, currentTimeline);
if (syncPoint) {
log(`syncPoint found via <${strategy.name}>:`, syncPoint);
this.logger_(`syncPoint found via <${strategy.name}>:`, syncPoint);
return syncPoint;
}
}
@ -176,7 +172,7 @@ export default class SyncController extends videojs.EventTarget {
mediaSequence: oldPlaylist.mediaSequence + i,
time: lastRemovedSegment.start
};
log('playlist sync:', newPlaylist.syncInfo);
this.logger_('playlist sync:', newPlaylist.syncInfo);
this.trigger('syncinfoupdate');
break;
}
@ -299,7 +295,7 @@ export default class SyncController extends videojs.EventTarget {
let mappingObj = this.timelines[segmentInfo.timeline];
if (segmentInfo.timestampOffset !== null) {
log('tsO:', segmentInfo.timestampOffset);
this.logger_('tsO:', segmentInfo.timestampOffset);
mappingObj = {
time: segmentInfo.timestampOffset,
@ -359,4 +355,12 @@ export default class SyncController extends videojs.EventTarget {
}
}
}
/**
* A debugging logger noop that is set to console.log only if debugging
* is enabled globally
*
* @private
*/
logger_() {}
}
Write Preview
Loading…
Cancel
Save