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

…fset Issue:#6444 PiperOrigin-RevId: 270252126
google · Sep 20, 2019 · c9fc0da · c9fc0da
1 parent 47bfa06
commit c9fc0da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -26,6 +26,8 @@
   * Support unwrapping of nested metadata (e.g. ID3 and SCTE-35 in EMSG).
 * Add `HttpDataSource.getResponseCode` to provide the status code associated
   with the most recent HTTP response.
+* Fix transitions between packed audio and non-packed audio segments in HLS
+  ([#6444](https://github.com/google/ExoPlayer/issues/6444)).
 * Fix issue where a request would be retried after encountering an error, even
   though the `LoadErrorHandlingPolicy` classified the error as fatal.
 * Fix initialization data handling for FLAC in MP4

diff --git a/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java b/library/hls/src/main/java/com/google/android/exoplayer2/source/hls/HlsMediaChunk.java
@@ -392,6 +392,10 @@ private DefaultExtractorInput prepareExtraction(DataSource dataSource, DataSpec
             id3Timestamp != C.TIME_UNSET
                 ? timestampAdjuster.adjustTsTimestamp(id3Timestamp)
                 : 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);
       extractor.init(output);