Skip to content

Fixes for discharging preloaded content #3530

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

Merged
merged 3 commits into from
Feb 8, 2021
Merged

Fixes for discharging preloaded content #3530

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
299a922
Don't send bytes_appended event when discharging from prebuffer; caus…
robertbryer Jan 25, 2021
e775151
Correct fix for adding double init segments
robertbryer Jan 29, 2021
c52b7f3
Fix issue where a downloaded segment is added to sourcebuffer before …
robertbryer Feb 4, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 21 additions & 7 deletions src/streaming/controllers/BufferController.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ function BufferController(config) {
lastIndex,
buffer,
dischargeBuffer,
dischargeFragments,
bufferState,
appendedBytesInfo,
wallclockTicked,
Expand Down Expand Up @@ -178,18 +179,24 @@ function BufferController(config) {
logger.debug('PreBuffer discharge requested, but there were no media segments in the PreBuffer.');
}

//A list of fragments to supress bytesAppended events for. This makes transferring from a prebuffer to a sourcebuffer silent.
dischargeFragments = [];
let chunks = dischargeBuffer.discharge();
let lastInit = null;
for (let j = 0; j < chunks.length; j++) {
const chunk = chunks[j];
const initChunk = initCache.extract(chunk.streamId, chunk.representationId);
if (initChunk) {
if (lastInit !== initChunk) {
buffer.append(initChunk);
lastInit = initChunk;
if (chunk.segmentType !== 'InitializationSegment') {
const initChunk = initCache.extract(chunk.streamId, chunk.representationId);
if (initChunk) {
if (lastInit !== initChunk) {
dischargeFragments.push(initChunk);
buffer.append(initChunk);
lastInit = initChunk;
}
}
buffer.append(chunk); //TODO Think about supressing buffer events the second time round after a discharge?
}
dischargeFragments.push(chunk);
buffer.append(chunk);
}

dischargeBuffer.reset();
Expand Down Expand Up @@ -306,7 +313,14 @@ function BufferController(config) {
triggerEvent(Events.SEEK_TARGET, {time: currentTime});
}

if (appendedBytesInfo) {
let suppressAppendedEvent = false;
if (dischargeFragments) {
if (dischargeFragments.indexOf(appendedBytesInfo) > 0) {
suppressAppendedEvent = true;
}
dischargeFragments = null;
}
if (appendedBytesInfo && !suppressAppendedEvent) {
triggerEvent(appendedBytesInfo.endFragment ? Events.BYTES_APPENDED_END_FRAGMENT : Events.BYTES_APPENDED, {
quality: appendedBytesInfo.quality,
startTime: appendedBytesInfo.start,
Expand Down