When the HLS container format is not packed audio, reset timestmap offset

Issue:#6444
PiperOrigin-RevId: 270252126

RELEASENOTES.md

@@ -2,6 +2,8 @@
 
 
 ### dev-v2 (not yet released) ###
 ### dev-v2 (not yet released) ###
 
 
+* Fix transitions between packed audio and non-packed audio segments in HLS
+  ([#6444](https://github.com/google/ExoPlayer/issues/6444)).
 * DASH: Support negative @r values in segment timelines
 * DASH: Support negative @r values in segment timelines
   ([#1787](https://github.com/google/ExoPlayer/issues/1787)).
   ([#1787](https://github.com/google/ExoPlayer/issues/1787)).
 * Add `allowedCapturePolicy` field to `AudioAttributes` wrapper to allow to
 * Add `allowedCapturePolicy` field to `AudioAttributes` wrapper to allow to

library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java

@@ -392,6 +392,10 @@ import java.util.concurrent.atomic.AtomicInteger;
             id3Timestamp != C.TIME_UNSET
             id3Timestamp != C.TIME_UNSET
                 ? timestampAdjuster.adjustTsTimestamp(id3Timestamp)
                 ? timestampAdjuster.adjustTsTimestamp(id3Timestamp)
                 : startTimeUs);
                 : startTimeUs);
+      } else {
+        // In case the container format changes mid-stream to non-packed-audio, we need to reset
+        // the timestamp offset.
+        output.setSampleOffsetUs(/* sampleOffsetUs= */ 0L);
       }
       }
       output.init(uid, shouldSpliceIn, /* reusingExtractor= */ false);
       output.init(uid, shouldSpliceIn, /* reusingExtractor= */ false);
       extractor.init(output);
       extractor.init(output);