From 72f2f3be952d02ba2365c82f605ef817eb6c54d6 Mon Sep 17 00:00:00 2001
From: nift4 <nift4@protonmail.com>
Date: Mon, 20 Apr 2026 18:59:46 +0200
Subject: [PATCH] Fixed issues in DTS HD reported by FongMi

---
 .../main/java/androidx/media3/extractor/ts/DtsReader.java  | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java
index 3959a45735..ebe0de6919 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/ts/DtsReader.java
@@ -144,7 +144,9 @@ public void createTracks(ExtractorOutput extractorOutput, TrackIdGenerator idGen
 
   @Override
   public void packetStarted(long pesTimeUs, @TsPayloadReader.Flags int flags) {
-    timeUs = pesTimeUs;
+    if (pesTimeUs != C.TIME_UNSET) {
+      timeUs = pesTimeUs;
+    }
   }
 
   @Override
@@ -294,8 +296,7 @@ public void consume(ParsableByteArray data) throws ParserException {
 
   @Override
   public void packetFinished(boolean isEndOfInput) {
-    if (state == STATE_CHECKING_FOR_EXTSS_AFTER_CORE) {
-      checkNotNull(output);
+    if (isEndOfInput && state == STATE_CHECKING_FOR_EXTSS_AFTER_CORE) {
       if (coreFormatPendingEmit) {
         output.format(checkNotNull(format));
         coreFormatPendingEmit = false;