Skip to content

Commit aab3b90

Browse files
forbesjoforbesjo
authored
refactor: export corrections (#68)
1 parent 0593771 commit aab3b90

15 files changed

Lines changed: 63 additions & 84 deletions

‎src/ad-cue-tags.js‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import window from 'global/window';
66
/**
77
* Searches for an ad cue that overlaps with the given mediaTime
88
*/
9-
const findAdCue = function(track, mediaTime) {
9+
export const findAdCue = function(track, mediaTime) {
1010
let cues = track.cues;
1111

1212
for (let i = 0; i < cues.length; i++) {
@@ -19,7 +19,7 @@ const findAdCue = function(track, mediaTime) {
1919
return null;
2020
};
2121

22-
const updateAdCues = function(media, track, offset = 0) {
22+
export const updateAdCues = function(media, track, offset = 0) {
2323
if (!media.segments) {
2424
return;
2525
}
@@ -89,9 +89,3 @@ const updateAdCues = function(media, track, offset = 0) {
8989
mediaTime += segment.duration;
9090
}
9191
};
92-
93-
export default {
94-
updateAdCues,
95-
findAdCue
96-
};
97-

‎src/bin-utils.js‎

Lines changed: 25 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ const formatAsciiString = function(e) {
4040
* Modified message with TypedArray values expanded
4141
* @function createTransferableMessage
4242
*/
43-
const createTransferableMessage = function(message) {
43+
export const createTransferableMessage = function(message) {
4444
const transferable = {};
4545

4646
Object.keys(message).forEach((key) => {
@@ -64,7 +64,7 @@ const createTransferableMessage = function(message) {
6464
* Returns a unique string identifier for a media initialization
6565
* segment.
6666
*/
67-
const initSegmentId = function(initSegment) {
67+
export const initSegmentId = function(initSegment) {
6868
let byterange = initSegment.byterange || {
6969
length: Infinity,
7070
offset: 0
@@ -78,35 +78,30 @@ const initSegmentId = function(initSegment) {
7878
/**
7979
* utils to help dump binary data to the console
8080
*/
81-
const utils = {
82-
hexDump(data) {
83-
let bytes = Array.prototype.slice.call(data);
84-
let step = 16;
85-
let result = '';
86-
let hex;
87-
let ascii;
81+
export const hexDump = (data) => {
82+
let bytes = Array.prototype.slice.call(data);
83+
let step = 16;
84+
let result = '';
85+
let hex;
86+
let ascii;
8887

89-
for (let j = 0; j < bytes.length / step; j++) {
90-
hex = bytes.slice(j * step, j * step + step).map(formatHexString).join('');
91-
ascii = bytes.slice(j * step, j * step + step).map(formatAsciiString).join('');
92-
result += hex + ' ' + ascii + '\n';
93-
}
94-
return result;
95-
},
96-
tagDump(tag) {
97-
return utils.hexDump(tag.bytes);
98-
},
99-
textRanges(ranges) {
100-
let result = '';
101-
let i;
88+
for (let j = 0; j < bytes.length / step; j++) {
89+
hex = bytes.slice(j * step, j * step + step).map(formatHexString).join('');
90+
ascii = bytes.slice(j * step, j * step + step).map(formatAsciiString).join('');
91+
result += hex + ' ' + ascii + '\n';
92+
}
10293

103-
for (i = 0; i < ranges.length; i++) {
104-
result += textRange(ranges, i) + ' ';
105-
}
106-
return result;
107-
},
108-
createTransferableMessage,
109-
initSegmentId
94+
return result;
11095
};
11196

112-
export default utils;
97+
export const tagDump = ({ bytes }) => hexDump(bytes);
98+
99+
export const textRanges = (ranges) => {
100+
let result = '';
101+
let i;
102+
103+
for (i = 0; i < ranges.length; i++) {
104+
result += textRange(ranges, i) + ' ';
105+
}
106+
return result;
107+
};

‎src/decrypter-worker.js‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
import window from 'global/window';
2-
import {Decrypter} from 'aes-decrypter';
3-
import BinUtils from './bin-utils';
4-
5-
const { createTransferableMessage } = BinUtils;
2+
import { Decrypter } from 'aes-decrypter';
3+
import { createTransferableMessage } from './bin-utils';
64

75
/**
86
* Our web worker interface so that things can talk to aes-decrypter

‎src/master-playlist-controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import SegmentLoader from './segment-loader';
88
import VTTSegmentLoader from './vtt-segment-loader';
99
import * as Ranges from './ranges';
1010
import videojs from 'video.js';
11-
import AdCueTags from './ad-cue-tags';
11+
import { updateAdCues } from './ad-cue-tags';
1212
import SyncController from './sync-controller';
1313
import worker from 'webwackify';
1414
import Decrypter from './decrypter-worker';
@@ -1098,7 +1098,7 @@ export class MasterPlaylistController extends videojs.EventTarget {
10981098
offset = seekable.start(0);
10991099
}
11001100

1101-
AdCueTags.updateAdCues(media, this.cueTagsTrack_, offset);
1101+
updateAdCues(media, this.cueTagsTrack_, offset);
11021102
}
11031103

11041104
/**

‎src/media-segment-request.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import videojs from 'video.js';
2-
import BinUtils from './bin-utils';
3-
4-
const { createTransferableMessage } = BinUtils;
2+
import { createTransferableMessage } from './bin-utils';
53

64
export const REQUEST_ERRORS = {
75
FAILURE: 2,

‎src/mse/remove-cues-from-track.js‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
* @param {Object} track the text track to remove the cues from
1111
* @private
1212
*/
13-
const removeCuesFromTrack = function(start, end, track) {
13+
export const removeCuesFromTrack = function(start, end, track) {
1414
let i;
1515
let cue;
1616

@@ -33,5 +33,3 @@ const removeCuesFromTrack = function(start, end, track) {
3333
}
3434
}
3535
};
36-
37-
export default removeCuesFromTrack;

‎src/mse/virtual-source-buffer.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
*/
44
import videojs from 'video.js';
55
import createTextTracksIfNecessary from './create-text-tracks-if-necessary';
6-
import removeCuesFromTrack from './remove-cues-from-track';
7-
import {addTextTrackData} from './add-text-track-data';
6+
import { removeCuesFromTrack } from './remove-cues-from-track';
7+
import { addTextTrackData } from './add-text-track-data';
88
import work from 'webwackify';
99
import transmuxWorker from './transmuxer-worker';
10-
import {isAudioCodec, isVideoCodec} from './codec-utils';
10+
import { isAudioCodec, isVideoCodec } from './codec-utils';
1111

1212
const workerResolve = () => {
1313
let result;

‎src/segment-loader.js‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ import videojs from 'video.js';
66
import SourceUpdater from './source-updater';
77
import Config from './config';
88
import window from 'global/window';
9-
import removeCuesFromTrack from './mse/remove-cues-from-track';
10-
import BinUtils from './bin-utils';
11-
import {mediaSegmentRequest, REQUEST_ERRORS} from './media-segment-request';
9+
import { removeCuesFromTrack } from './mse/remove-cues-from-track';
10+
import { initSegmentId } from './bin-utils';
11+
import { mediaSegmentRequest, REQUEST_ERRORS } from './media-segment-request';
1212
import { TIME_FUDGE_FACTOR, timeUntilRebuffer as timeUntilRebuffer_ } from './ranges';
1313
import { minRebufferMaxBandwidthSelector } from './playlist-selectors';
1414
import logger from './util/logger';
1515

16-
const { initSegmentId } = BinUtils;
17-
1816
// in ms
1917
const CHECK_BUFFER_DELAY = 500;
2018

‎src/sync-controller.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
*/
44

55
import mp4probe from 'mux.js/lib/mp4/probe';
6-
import {inspect as tsprobe} from 'mux.js/lib/tools/ts-inspector.js';
7-
import {sumDurations} from './playlist';
6+
import { inspect as tsprobe } from 'mux.js/lib/tools/ts-inspector.js';
7+
import { sumDurations } from './playlist';
88
import videojs from 'video.js';
99
import logger from './util/logger';
1010

‎src/videojs-http-streaming.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import PlaylistLoader from './playlist-loader';
99
import Playlist from './playlist';
1010
import xhrFactory from './xhr';
1111
import { Decrypter, AsyncStream, decrypt } from 'aes-decrypter';
12-
import utils from './bin-utils';
12+
import * as utils from './bin-utils';
1313
import { timeRangesToArray } from './ranges';
1414
import { MediaSource, URL } from './mse';
1515
import videojs from 'video.js';

0 commit comments

Comments
 (0)