refactor: remove duplicate bufferIntersection code #880
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brandonocasey
commented
Jun 25, 2020
| @@ -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'; | |||
There was a problem hiding this comment.
Use the one in ranges
brandonocasey
commented
Jun 25, 2020
| @@ -322,7 +322,15 @@ export default class SourceUpdater extends videojs.EventTarget { | |||
| } | |||
|
|
|||
| buffered() { | |||
| return buffered(this.videoBuffer, this.audioBuffer); | |||
| if (this.audioBuffer && !this.videoBuffer) { | |||
There was a problem hiding this comment.
The only unique functionality in that file what using audio or video buffered, if we only had a buffer for one or the other.
brandonocasey
force-pushed
the
refactor/remove-buffered
branch
2 times, most recently
from
90a856c to
9a18a20
Compare
brandonocasey
commented
Jun 25, 2020
|
|
||
| QUnit.module('buffer'); | ||
|
|
||
| QUnit.test('buffered returns video buffered when no audio', function(assert) { |
There was a problem hiding this comment.
First two tests here moved to sourceUpdater, the rest moved to ranges.
brandonocasey
force-pushed
the
refactor/remove-buffered
branch
from
9a18a20 to
b6df38b
Compare
gkatsev
reviewed
Jun 25, 2020
| @@ -4,7 +4,7 @@ | |||
| import videojs from 'video.js'; | |||
| import logger from './util/logger'; | |||
| import noop from './util/noop'; | |||
| import { buffered } from './util/buffer'; | |||
There was a problem hiding this comment.
sounds like we can delete buffer.js?
There was a problem hiding this comment.
woops, removing
gkatsev
approved these changes
Jun 25, 2020
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No functional change here. This refactor removes
util/bufferthe nearly identical function inranges.js. While trying to find out why we sometimes download duplicate segments I cam upon a solution that usedbufferIntersection. Thats when I noticed that these functions are doing the same thing, andutil/bufferis just a copy paste.