From 0541e1953ccebdf5932ec0409b0a3095c4567ba9 Mon Sep 17 00:00:00 2001
From: rohks <rohks@google.com>
Date: Tue, 22 Aug 2023 11:29:00 +0100
Subject: [PATCH] Add nullness annotations to `SampleQueue`

#fixit

PiperOrigin-RevId: 559058211
---
 .../java/androidx/media3/exoplayer/source/SampleQueue.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SampleQueue.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SampleQueue.java
index b00545ee6b..42d87e42e5 100644
--- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SampleQueue.java
+++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/source/SampleQueue.java
@@ -827,14 +827,14 @@ public class SampleQueue implements TrackOutput {
 
     if (sharedSampleMetadata.isEmpty()
         || !sharedSampleMetadata.getEndValue().format.equals(upstreamFormat)) {
+      Format upstreamFormat = checkNotNull(this.upstreamFormat);
       DrmSessionReference drmSessionReference =
           drmSessionManager != null
               ? drmSessionManager.preacquireSession(drmEventDispatcher, upstreamFormat)
               : DrmSessionReference.EMPTY;
 
       sharedSampleMetadata.appendSpan(
-          getWriteIndex(),
-          new SharedSampleMetadata(checkNotNull(upstreamFormat), drmSessionReference));
+          getWriteIndex(), new SharedSampleMetadata(upstreamFormat, drmSessionReference));
     }
 
     length++;
@@ -918,7 +918,8 @@ public class SampleQueue implements TrackOutput {
    */
   private void onFormatResult(Format newFormat, FormatHolder outputFormatHolder) {
     boolean isFirstFormat = downstreamFormat == null;
-    @Nullable DrmInitData oldDrmInitData = isFirstFormat ? null : downstreamFormat.drmInitData;
+    @Nullable
+    DrmInitData oldDrmInitData = downstreamFormat == null ? null : downstreamFormat.drmInitData;
     downstreamFormat = newFormat;
     @Nullable DrmInitData newDrmInitData = newFormat.drmInitData;