Rollback of androidx@e665e2a

PiperOrigin-RevId: 619871653
(cherry picked from commit b60cd2c)

Author: icbaker

RELEASENOTES.md

@@ -30,6 +30,12 @@
         from WAV files ([#1117](https://github.com/androidx/media/pull/1117)).
     *   MP3: Populate `Format.averageBitrate` from metadata frames such as
         `XING` and `VBRI`.
+    *   MPEG-TS: Revert a change that aimed to ensure the last frame is rendered
+        by passing the last access unit of a stream to the sample queue
+        ([#7909](https://github.com/google/ExoPlayer/issues/7909)). This is due
+        to the change causing new problems with I-frame only HLS streams
+        ([#1150](https://github.com/google/ExoPlayer/issues/1150)) and H.262 HLS
+        streams ([#1126](https://github.com/google/ExoPlayer/issues/1126)).
 *   Audio:
     *   Allow renderer recovery by disabling offload if audio track fails to
         initialize in offload mode.

libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac3Reader.java

@@ -159,7 +159,7 @@ public void consume(ParsableByteArray data) {
   }
 
   @Override
-  public void packetFinished(boolean isEndOfInput) {
+  public void packetFinished() {
     // Do nothing.
   }
 

libraries/extractor/src/main/java/androidx/media3/extractor/ts/Ac4Reader.java

@@ -161,7 +161,7 @@ public void consume(ParsableByteArray data) {
   }
 
   @Override
-  public void packetFinished(boolean isEndOfInput) {
+  public void packetFinished() {
     // Do nothing.
   }
 

libraries/extractor/src/main/java/androidx/media3/extractor/ts/AdtsReader.java

@@ -194,7 +194,7 @@ public void consume(ParsableByteArray data) throws ParserException {
   }
 
   @Override
-  public void packetFinished(boolean isEndOfInput) {
+  public void packetFinished() {
     // Do nothing.
   }
 

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java

@@ -215,7 +215,7 @@ public void consume(ParsableByteArray data) throws ParserException {
   }
 
   @Override
-  public void packetFinished(boolean isEndOfInput) {
+  public void packetFinished() {
     // Do nothing.
   }
 

libraries/extractor/src/main/java/androidx/media3/extractor/ts/DvbSubtitleReader.java

@@ -86,7 +86,7 @@ public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
   }
 
   @Override
-  public void packetFinished(boolean isEndOfInput) {
+  public void packetFinished() {
     if (writingSample) {
       // packetStarted method must be called before reading sample.
       checkState(sampleTimeUs != C.TIME_UNSET);

libraries/extractor/src/main/java/androidx/media3/extractor/ts/ElementaryStreamReader.java

@@ -31,7 +31,7 @@
  *   <li>{@link #seek()} (optional, to reset the state)
  *   <li>{@link #packetStarted(long, int)} (to signal the start of a new packet)
  *   <li>{@link #consume(ParsableByteArray)} (zero or more times, to provide packet data)
- *   <li>{@link #packetFinished(boolean)} (to signal the end of the current packet)
+ *   <li>{@link #packetFinished()} (to signal the end of the current packet)
  *   <li>Repeat steps 3-5 for subsequent packets
  * </ol>
  */
@@ -67,5 +67,5 @@ public interface ElementaryStreamReader {
   void consume(ParsableByteArray data) throws ParserException;
 
   /** Called when a packet ends. */
-  void packetFinished(boolean isEndOfInput);
+  void packetFinished();
 }

libraries/extractor/src/main/java/androidx/media3/extractor/ts/H262Reader.java

@@ -217,13 +217,8 @@ public void consume(ParsableByteArray data) {
   }
 
   @Override
-  public void packetFinished(boolean isEndOfInput) {
-    checkStateNotNull(output); // Asserts that createTracks has been called.
-    if (isEndOfInput) {
-      @C.BufferFlags int flags = sampleIsKeyframe ? C.BUFFER_FLAG_KEY_FRAME : 0;
-      int size = (int) (totalBytesWritten - samplePosition);
-      output.sampleMetadata(sampleTimeUs, flags, size, /* offset= */ 0, /* cryptoData= */ null);
-    }
+  public void packetFinished() {
+    // Do nothing.
   }
 
   /**

libraries/extractor/src/main/java/androidx/media3/extractor/ts/H263Reader.java

@@ -216,13 +216,8 @@ public void consume(ParsableByteArray data) {
   }
 
   @Override
-  public void packetFinished(boolean isEndOfInput) {
-    // Assert that createTracks has been called.
-    checkStateNotNull(sampleReader);
-    if (isEndOfInput) {
-      sampleReader.onDataEnd(totalBytesWritten, /* bytesWrittenPastPosition= */ 0, hasOutputFormat);
-      sampleReader.reset();
-    }
+  public void packetFinished() {
+    // Do nothing.
   }
 
   /**

libraries/extractor/src/main/java/androidx/media3/extractor/ts/H264Reader.java

@@ -167,11 +167,8 @@ public void consume(ParsableByteArray data) {
   }
 
   @Override
-  public void packetFinished(boolean isEndOfInput) {
-    assertTracksCreated();
-    if (isEndOfInput) {
-      sampleReader.end(totalBytesWritten);
-    }
+  public void packetFinished() {
+    // Do nothing.
   }
 
   @RequiresNonNull("sampleReader")
@@ -511,13 +508,6 @@ private void outputSample(int offset) {
       output.sampleMetadata(sampleTimeUs, flags, size, offset, null);
     }
 
-    public void end(long position) {
-      // Output a final sample with the NAL units currently held
-      nalUnitStartPosition = position;
-      outputSample(/* offset= */ 0);
-      readingSample = false;
-    }
-
     private static final class SliceHeaderData {
 
       private static final int SLICE_TYPE_I = 2;