sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add nullness annotations to SampleQueue

Browse source 
#fixit

PiperOrigin-RevId: 559058211
This commit is contained in:
rohks 2023-08-22 11:29:00 +01:00 committed by Julia Bibik
parent e9978a94af
commit 0541e1953c
1 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SampleQueue.java
View file

@ -827,14 +827,14 @@ public class SampleQueue implements TrackOutput {
if (sharedSampleMetadata.isEmpty() if (sharedSampleMetadata.isEmpty()
|| !sharedSampleMetadata.getEndValue().format.equals(upstreamFormat)) { || !sharedSampleMetadata.getEndValue().format.equals(upstreamFormat)) {
Format upstreamFormat = checkNotNull(this.upstreamFormat);
DrmSessionReference drmSessionReference = DrmSessionReference drmSessionReference =
drmSessionManager != null drmSessionManager != null
? drmSessionManager.preacquireSession(drmEventDispatcher, upstreamFormat) ? drmSessionManager.preacquireSession(drmEventDispatcher, upstreamFormat)
: DrmSessionReference.EMPTY; : DrmSessionReference.EMPTY;
sharedSampleMetadata.appendSpan( sharedSampleMetadata.appendSpan(
getWriteIndex(), getWriteIndex(), new SharedSampleMetadata(upstreamFormat, drmSessionReference));
new SharedSampleMetadata(checkNotNull(upstreamFormat), drmSessionReference));
} }
length++; length++;
@ -918,7 +918,8 @@ public class SampleQueue implements TrackOutput {
*/ */
private void onFormatResult(Format newFormat, FormatHolder outputFormatHolder) { private void onFormatResult(Format newFormat, FormatHolder outputFormatHolder) {
boolean isFirstFormat = downstreamFormat == null; boolean isFirstFormat = downstreamFormat == null;
@Nullable DrmInitData oldDrmInitData = isFirstFormat ? null : downstreamFormat.drmInitData; @Nullable
DrmInitData oldDrmInitData = downstreamFormat == null ? null : downstreamFormat.drmInitData;
downstreamFormat = newFormat; downstreamFormat = newFormat;
@Nullable DrmInitData newDrmInitData = newFormat.drmInitData; @Nullable DrmInitData newDrmInitData = newFormat.drmInitData;