Skip to content
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.

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

feat: Add LCEVC dual track rendering #8168

Merged
merged 2 commits into from
Feb 26, 2025
Merged
Changes from all commits
Commits
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
74 changes: 70 additions & 4 deletions lib/media/streaming_engine.js
Original file line number Diff line number Diff line change
Expand Up @@ -660,6 +660,12 @@ shaka.media.StreamingEngine = class {
mediaState.stream = stream;
mediaState.segmentIterator = null;
mediaState.adaptation = !!adaptation;
if (stream.dependencyStream) {
mediaState.dependencyMediaState =
this.createMediaState_(stream.dependencyStream);
} else {
mediaState.dependencyMediaState = null;
}

const streamTag = shaka.media.StreamingEngine.logPrefix_(mediaState);
shaka.log.debug('switch: switching to Stream ' + streamTag);
Expand Down Expand Up @@ -1042,16 +1048,20 @@ shaka.media.StreamingEngine = class {
* @private
*/
createMediaState_(stream) {
return /** @type {shaka.media.StreamingEngine.MediaState_} */ ({
/** @type {!shaka.media.StreamingEngine.MediaState_} */
const mediaState = {
stream,
type: stream.type,
type: /** @type {shaka.util.ManifestParserUtils.ContentType} */(
stream.type),
segmentIterator: null,
segmentPrefetch: this.createSegmentPrefetch_(stream),
lastSegmentReference: null,
lastInitSegmentReference: null,
lastTimestampOffset: null,
lastAppendWindowStart: null,
lastAppendWindowEnd: null,
lastCodecs: null,
lastMimeType: null,
Comment on lines +1063 to +1064
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

😮

restoreStreamAfterTrickPlay: null,
endOfStream: false,
performingUpdate: false,
Expand All @@ -1063,10 +1073,17 @@ shaka.media.StreamingEngine = class {
// The playhead might be seeking on startup, if a start time is set, so
// start "seeked" as true.
seeked: true,
adaptation: false,
recovering: false,
hasError: false,
operation: null,
});
dependencyMediaState: null,
};
if (stream.dependencyStream) {
mediaState.dependencyMediaState =
this.createMediaState_(stream.dependencyStream);
}
return mediaState;
}

/**
Expand Down Expand Up @@ -1514,6 +1531,10 @@ shaka.media.StreamingEngine = class {
const p = this.fetchAndAppend_(mediaState, presentationTime, reference,
adaptation);
p.catch(() => {}); // TODO(#1993): Handle asynchronous errors.
if (mediaState.dependencyMediaState) {
this.fetchAndAppendDependency_(
mediaState.dependencyMediaState, presentationTime);
}
return null;
}

Expand Down Expand Up @@ -1898,6 +1919,48 @@ shaka.media.StreamingEngine = class {
}


/**
* Fetches and appends a dependency media state
*
* @param {!shaka.media.StreamingEngine.MediaState_} mediaState
* @param {number} presentationTime
* @private
*/
async fetchAndAppendDependency_(mediaState, presentationTime) {
const dependencyStream = mediaState.stream;
const iterator =
dependencyStream.segmentIndex.getIteratorForTime(presentationTime);
const reference = iterator && iterator.next().value;
if (reference) {
const initSegmentReference = reference.initSegmentReference;
if (initSegmentReference && !shaka.media.InitSegmentReference.equal(
initSegmentReference, mediaState.lastInitSegmentReference)) {
mediaState.lastInitSegmentReference = initSegmentReference;
try {
const init = await this.fetch_(mediaState, initSegmentReference);
this.playerInterface_.mediaSourceEngine.appendDependency(
init, 0, dependencyStream);
} catch (e) {
mediaState.lastInitSegmentReference = null;
throw e;
}
}
if (!mediaState.lastSegmentReference ||
mediaState.lastSegmentReference != reference) {
mediaState.lastSegmentReference = reference;
try {
const result = await this.fetch_(mediaState, reference);
this.playerInterface_.mediaSourceEngine.appendDependency(
result, 0, dependencyStream);
} catch (e) {
mediaState.lastSegmentReference = null;
throw e;
}
}
}
}


/**
* Clear per-stream error states and retry any failed streams.
* @param {number} delaySeconds
Expand Down Expand Up @@ -3003,7 +3066,8 @@ shaka.media.StreamingEngine.PlayerInterface;
* recovering: boolean,
* hasError: boolean,
* operation: shaka.net.NetworkingEngine.PendingRequest,
* segmentPrefetch: shaka.media.SegmentPrefetch
* segmentPrefetch: shaka.media.SegmentPrefetch,
* dependencyMediaState: ?shaka.media.StreamingEngine.MediaState_
* }}
*
* @description
Expand Down Expand Up @@ -3064,6 +3128,8 @@ shaka.media.StreamingEngine.PlayerInterface;
* @property {?shaka.media.SegmentPrefetch} segmentPrefetch
* A prefetch object for managing prefetching. Null if unneeded
* (if prefetching is disabled, etc).
* @property {?shaka.media.StreamingEngine.MediaState_} dependencyMediaState
* A dependency media state.
*/
shaka.media.StreamingEngine.MediaState_;

Expand Down