From bcde7e03c210a2fd5a8c10963cb653bc2d82d771 Mon Sep 17 00:00:00 2001
From: ibaker <ibaker@google.com>
Date: Tue, 4 Jul 2023 10:09:27 +0000
Subject: [PATCH] Include timing info in some SCTE-35 `toString`
 implementations

This was helpful in investigating Issue: androidx/media#471

PiperOrigin-RevId: 545393217
(cherry picked from commit 3456382ae7116a8bb57b4212f449dfb50ea490d9)
---
 .../media3/extractor/metadata/scte35/PrivateCommand.java | 9 +++++++++
 .../extractor/metadata/scte35/SpliceInsertCommand.java   | 9 +++++++++
 .../extractor/metadata/scte35/TimeSignalCommand.java     | 9 +++++++++
 .../test/assets/playbackdumps/ts/sample_scte35.ts.dump   | 6 +++---
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/PrivateCommand.java b/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/PrivateCommand.java
index 53e0f372b1..8838b2bd8a 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/PrivateCommand.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/PrivateCommand.java
@@ -52,6 +52,15 @@ public final class PrivateCommand extends SpliceCommand {
     return new PrivateCommand(identifier, privateBytes, ptsAdjustment);
   }
 
+  @Override
+  public String toString() {
+    return "SCTE-35 PrivateCommand { ptsAdjustment="
+        + ptsAdjustment
+        + ", identifier= "
+        + identifier
+        + " }";
+  }
+
   // Parcelable implementation.
 
   @Override
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/SpliceInsertCommand.java b/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/SpliceInsertCommand.java
index 2ba778f805..627c51b342 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/SpliceInsertCommand.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/SpliceInsertCommand.java
@@ -219,6 +219,15 @@ public final class SpliceInsertCommand extends SpliceCommand {
     }
   }
 
+  @Override
+  public String toString() {
+    return "SCTE-35 SpliceInsertCommand { programSplicePts="
+        + programSplicePts
+        + ", programSplicePlaybackPositionUs= "
+        + programSplicePlaybackPositionUs
+        + " }";
+  }
+
   // Parcelable implementation.
 
   @Override
diff --git a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/TimeSignalCommand.java b/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/TimeSignalCommand.java
index ab52517a2e..b3b6d39422 100644
--- a/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/TimeSignalCommand.java
+++ b/libraries/extractor/src/main/java/androidx/media3/extractor/metadata/scte35/TimeSignalCommand.java
@@ -63,6 +63,15 @@ public final class TimeSignalCommand extends SpliceCommand {
     return ptsTime;
   }
 
+  @Override
+  public String toString() {
+    return "SCTE-35 TimeSignalCommand { ptsTime="
+        + ptsTime
+        + ", playbackPositionUs= "
+        + playbackPositionUs
+        + " }";
+  }
+
   // Parcelable implementation.
 
   @Override
diff --git a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_scte35.ts.dump b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_scte35.ts.dump
index 03a95ad04a..feab94915d 100644
--- a/libraries/test_data/src/test/assets/playbackdumps/ts/sample_scte35.ts.dump
+++ b/libraries/test_data/src/test/assets/playbackdumps/ts/sample_scte35.ts.dump
@@ -13,10 +13,10 @@ MediaCodecAdapter (exotest.video.mpeg2):
 MetadataOutput:
   Metadata[0]:
     presentationTimeUs = 33366
-    entry[0] = SCTE-35 splice command: type=SpliceInsertCommand
+    entry[0] = SCTE-35 SpliceInsertCommand { programSplicePts=200000, programSplicePlaybackPositionUs= 1000000822222 }
   Metadata[1]:
     presentationTimeUs = 33366
-    entry[0] = SCTE-35 splice command: type=SpliceInsertCommand
+    entry[0] = SCTE-35 SpliceInsertCommand { programSplicePts=200000, programSplicePlaybackPositionUs= 1000000822222 }
   Metadata[2]:
     presentationTimeUs = 33366
-    entry[0] = SCTE-35 splice command: type=SpliceInsertCommand
+    entry[0] = SCTE-35 SpliceInsertCommand { programSplicePts=300000, programSplicePlaybackPositionUs= 1000001933333 }