Correctly update output info if previous stream has been fully rendered

The output info for a new stream is marked pending until the last
sample of the previous stream has been processed. However, this fails
if the previous stream has already been fully processed. We need to
detect this case explicitly to avoid signalling the output change one
sample too late.

#minor-release

PiperOrigin-RevId: 512572854
(cherry picked from commit 39935d7f)

library/core/src/main/java/com/google/android/exoplayer2/mediacodec/MediaCodecRenderer.java

@@ -356,6 +356,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Nullable private ExoPlaybackException pendingPlaybackException;
   @Nullable private ExoPlaybackException pendingPlaybackException;
   protected DecoderCounters decoderCounters;
   protected DecoderCounters decoderCounters;
   private OutputStreamInfo outputStreamInfo;
   private OutputStreamInfo outputStreamInfo;
+  private long lastProcessedOutputBufferTimeUs;
 
 
   /**
   /**
    * @param trackType The {@link C.TrackType track type} that the renderer handles.
    * @param trackType The {@link C.TrackType track type} that the renderer handles.
@@ -406,6 +407,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     codecHotswapDeadlineMs = C.TIME_UNSET;
     codecHotswapDeadlineMs = C.TIME_UNSET;
     largestQueuedPresentationTimeUs = C.TIME_UNSET;
     largestQueuedPresentationTimeUs = C.TIME_UNSET;
     lastBufferInStreamPresentationTimeUs = C.TIME_UNSET;
     lastBufferInStreamPresentationTimeUs = C.TIME_UNSET;
+    lastProcessedOutputBufferTimeUs = C.TIME_UNSET;
     codecDrainState = DRAIN_STATE_NONE;
     codecDrainState = DRAIN_STATE_NONE;
     codecDrainAction = DRAIN_ACTION_NONE;
     codecDrainAction = DRAIN_ACTION_NONE;
   }
   }
@@ -635,8 +637,11 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
   @Override
   @Override
   protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs)
   protected void onStreamChanged(Format[] formats, long startPositionUs, long offsetUs)
       throws ExoPlaybackException {
       throws ExoPlaybackException {
-    if (outputStreamInfo.streamOffsetUs == C.TIME_UNSET) {
-      checkState(outputStreamInfo.startPositionUs == C.TIME_UNSET);
+    if (outputStreamInfo.streamOffsetUs == C.TIME_UNSET
+        || (pendingOutputStreamChanges.isEmpty()
+            && lastProcessedOutputBufferTimeUs != C.TIME_UNSET
+            && lastProcessedOutputBufferTimeUs >= largestQueuedPresentationTimeUs)) {
+      // This is the first stream, or the previous has been fully output already.
       setOutputStreamInfo(
       setOutputStreamInfo(
           new OutputStreamInfo(
           new OutputStreamInfo(
               /* previousStreamLastBufferTimeUs= */ C.TIME_UNSET, startPositionUs, offsetUs));
               /* previousStreamLastBufferTimeUs= */ C.TIME_UNSET, startPositionUs, offsetUs));
@@ -869,6 +874,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
     decodeOnlyPresentationTimestamps.clear();
     decodeOnlyPresentationTimestamps.clear();
     largestQueuedPresentationTimeUs = C.TIME_UNSET;
     largestQueuedPresentationTimeUs = C.TIME_UNSET;
     lastBufferInStreamPresentationTimeUs = C.TIME_UNSET;
     lastBufferInStreamPresentationTimeUs = C.TIME_UNSET;
+    lastProcessedOutputBufferTimeUs = C.TIME_UNSET;
     if (c2Mp3TimestampTracker != null) {
     if (c2Mp3TimestampTracker != null) {
       c2Mp3TimestampTracker.reset();
       c2Mp3TimestampTracker.reset();
     }
     }
@@ -1565,6 +1571,7 @@ public abstract class MediaCodecRenderer extends BaseRenderer {
    */
    */
   @CallSuper
   @CallSuper
   protected void onProcessedOutputBuffer(long presentationTimeUs) {
   protected void onProcessedOutputBuffer(long presentationTimeUs) {
+    lastProcessedOutputBufferTimeUs = presentationTimeUs;
     if (!pendingOutputStreamChanges.isEmpty()
     if (!pendingOutputStreamChanges.isEmpty()
         && presentationTimeUs >= pendingOutputStreamChanges.peek().previousStreamLastBufferTimeUs) {
         && presentationTimeUs >= pendingOutputStreamChanges.peek().previousStreamLastBufferTimeUs) {
       setOutputStreamInfo(pendingOutputStreamChanges.poll());
       setOutputStreamInfo(pendingOutputStreamChanges.poll());