refactor: remove duplicate bufferIntersection code in util/buffer.js (#…

…880)

src/ranges.js

@@ -162,7 +162,7 @@ export const findSoleUncommonTimeRangesEnd = function(original, update) {
  * @param {TimeRanges} bufferB
  * @return {TimeRanges} The interesection of `bufferA` with `bufferB`
  */
-const bufferIntersection = function(bufferA, bufferB) {
+export const bufferIntersection = function(bufferA, bufferB) {
   let start = null;
   let end = null;
   let arity = 0;

src/source-updater.js

@@ -4,7 +4,7 @@
 import videojs from 'video.js';
 import logger from './util/logger';
 import noop from './util/noop';
-import { buffered } from './util/buffer';
+import { bufferIntersection } from './ranges.js';
 import {getMimeForCodec} from '@videojs/vhs-utils/dist/codecs.js';
 
 const updating = (type, sourceUpdater) => {
@@ -322,7 +322,15 @@ export default class SourceUpdater extends videojs.EventTarget {
   }
 
   buffered() {
-    return buffered(this.videoBuffer, this.audioBuffer);
+    if (this.audioBuffer && !this.videoBuffer) {
+      return this.audioBuffered();
+    }
+
+    if (this.videoBuffer && !this.audioBuffer) {
+      return this.videoBuffered();
+    }
+
+    return bufferIntersection(this.audioBuffered(), this.videoBuffered());
   }
 
   setDuration(duration, doneFn = noop) {

test/ranges.test.js

@@ -496,3 +496,52 @@ QUnit.test('converts time ranges to an array', function(assert) {
     'formats ranges correctly'
   );
 });
+
+QUnit.module('bufferIntersection');
+
+QUnit.test('returns intersection of two buffers', function(assert) {
+  const a = createTimeRanges([[0, 5], [12, 100]]);
+  const b = createTimeRanges([[4, 5], [10, 101]]);
+
+  assert.ok(
+    rangesEqual(Ranges.bufferIntersection(a, b), createTimeRanges([[4, 5], [12, 100]])),
+    'returns intersection'
+  );
+});
+
+QUnit.test('returns empty when no buffers', function(assert) {
+  assert.ok(
+    rangesEqual(Ranges.bufferIntersection(null, null), createTimeRanges()),
+    'returns empty'
+  );
+});
+
+QUnit.test('returns empty when buffers are empty', function(assert) {
+  const a = createTimeRanges();
+  const b = createTimeRanges();
+
+  assert.ok(
+    rangesEqual(Ranges.bufferIntersection(a, b), createTimeRanges()),
+    'returns empty'
+  );
+});
+
+QUnit.test('returns empty when one buffer is empty', function(assert) {
+  const a = createTimeRanges([[0, 1], [2, 3]]);
+  const b = createTimeRanges();
+
+  assert.ok(
+    rangesEqual(Ranges.bufferIntersection(a, b), createTimeRanges()),
+    'returns empty'
+  );
+});
+
+QUnit.test('returns empty when other buffer empty', function(assert) {
+  const a = createTimeRanges();
+  const b = createTimeRanges([[0, 1], [2, 3]]);
+
+  assert.ok(
+    rangesEqual(Ranges.bufferIntersection(a, b), createTimeRanges()),
+    'returns empty'
+  );
+});

test/source-updater.test.js

@@ -347,6 +347,42 @@ QUnit.test('buffered returns intersection of audio and video buffers', function(
   this.sourceUpdater.videoBuffer = origVideoBuffer;
 });
 
+QUnit.test('buffered returns audio buffered if no video buffer', function(assert) {
+  const origAudioBuffer = this.sourceUpdater.audioBuffer;
+
+  // mocking the buffered ranges in this test because it's tough to know how much each
+  // browser will actually buffer
+  this.sourceUpdater.audioBuffer = {
+    buffered: videojs.createTimeRanges([[1, 2], [5.5, 5.6], [10.5, 11]])
+  };
+
+  timeRangesEqual(
+    this.sourceUpdater.buffered(),
+    this.sourceUpdater.audioBuffered(),
+    'buffered is audio'
+  );
+
+  this.sourceUpdater.audioBuffer = origAudioBuffer;
+});
+
+QUnit.test('buffered returns video buffered if no audio buffer', function(assert) {
+  const origVideoBuffer = this.sourceUpdater.videoBuffer;
+
+  // mocking the buffered ranges in this test because it's tough to know how much each
+  // browser will actually buffer
+  this.sourceUpdater.videoBuffer = {
+    buffered: videojs.createTimeRanges([[1.25, 1.5], [5.1, 6.1], [10.5, 10.9]])
+  };
+
+  timeRangesEqual(
+    this.sourceUpdater.buffered(),
+    this.sourceUpdater.videoBuffered(),
+    'buffered is video'
+  );
+
+  this.sourceUpdater.videoBuffer = origVideoBuffer;
+});
+
 QUnit.test('removeAudio removes audio buffer', function(assert) {
   const done = assert.async();