From 5666678d8aa5810984fdf1f8cc0e02b81976c672 Mon Sep 17 00:00:00 2001 From: ibaker Date: Fri, 26 Apr 2024 04:18:24 -0700 Subject: [PATCH] Use `Dumper.addTime` in more places This ensures that `C.TIME_UNSET` is more clear in dump files. Some of these call-sites will **never** pass `C.TIME_UNSET`, but it seems clearest to always use `addTime` and maybe it will ensure when these sites are copied in future, `addTime` will be used in the new location too. PiperOrigin-RevId: 628363183 --- .../java/androidx/media3/test/utils/CapturingAudioSink.java | 2 +- .../java/androidx/media3/test/utils/CapturingImageOutput.java | 2 +- .../androidx/media3/test/utils/CapturingRenderersFactory.java | 4 ++-- .../main/java/androidx/media3/test/utils/FakeTrackOutput.java | 2 +- .../media3/test/utils/robolectric/PlaybackOutput.java | 4 ++-- .../test/java/androidx/media3/transformer/CapturingMuxer.java | 2 +- 6 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingAudioSink.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingAudioSink.java index b0285b1516..4609d3b04d 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingAudioSink.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingAudioSink.java @@ -154,7 +154,7 @@ public final class CapturingAudioSink extends ForwardingAudioSink implements Dum public void dump(Dumper dumper) { dumper .startBlock("buffer #" + bufferCounter) - .add("time", presentationTimeUs) + .addTime("time", presentationTimeUs) .add("data", dataHashcode) .endBlock(); } diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingImageOutput.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingImageOutput.java index 3d2187b11f..0b404420d1 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingImageOutput.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingImageOutput.java @@ -51,7 +51,7 @@ public final class CapturingImageOutput implements Dumpable, ImageOutput { renderedBitmaps.add( dumper -> { dumper.startBlock("image output #" + currentImageCount); - dumper.add("presentationTimeUs", presentationTimeUs); + dumper.addTime("presentationTimeUs", presentationTimeUs); dumper.add("bitmap hash", Arrays.hashCode(bitmapPixels)); dumper.endBlock(); }); diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingRenderersFactory.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingRenderersFactory.java index 515a94974b..a32ae01410 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingRenderersFactory.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/CapturingRenderersFactory.java @@ -421,7 +421,7 @@ public class CapturingRenderersFactory implements RenderersFactory, Dumper.Dumpa @Override public void dump(Dumper dumper) { dumper.startBlock("input buffer #" + inputBufferCounter); - dumper.add("timeUs", bufferTimeUs); + dumper.addTime("timeUs", bufferTimeUs); if (flags != 0) { dumper.add("flags", flags); } @@ -450,7 +450,7 @@ public class CapturingRenderersFactory implements RenderersFactory, Dumper.Dumpa @Override public void dump(Dumper dumper) { dumper.startBlock("output buffer #" + outputBufferCounter); - dumper.add("timeUs", bufferTimeUs); + dumper.addTime("timeUs", bufferTimeUs); if (flags != 0) { dumper.add("flags", flags); } diff --git a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeTrackOutput.java b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeTrackOutput.java index df3a7facaa..0da7968c9b 100644 --- a/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeTrackOutput.java +++ b/libraries/test_utils/src/main/java/androidx/media3/test/utils/FakeTrackOutput.java @@ -245,7 +245,7 @@ public final class FakeTrackOutput implements TrackOutput, Dumper.Dumpable { public void dump(Dumper dumper) { dumper .startBlock("sample " + index) - .add("time", timeUs) + .addTime("time", timeUs) .add("flags", flags) .add("data", getSampleData(startOffset, endOffset)); if (cryptoData != null) { diff --git a/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java b/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java index 0b87f34603..ebaeb3fdf5 100644 --- a/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java +++ b/libraries/test_utils_robolectric/src/main/java/androidx/media3/test/utils/robolectric/PlaybackOutput.java @@ -139,7 +139,7 @@ public final class PlaybackOutput implements Dumper.Dumpable { for (int i = 0; i < metadatas.size(); i++) { dumper.startBlock("Metadata[" + i + "]"); Metadata metadata = metadatas.get(i); - dumper.add("presentationTimeUs", metadata.presentationTimeUs); + dumper.addTime("presentationTimeUs", metadata.presentationTimeUs); for (int j = 0; j < metadata.length(); j++) { dumper.add("entry[" + j + "]", getEntryAsString(metadata.get(j))); } @@ -387,7 +387,7 @@ public final class PlaybackOutput implements Dumper.Dumpable { dumper.startBlock("Subtitle[" + i + "]"); // TODO: Solving https://github.com/google/ExoPlayer/issues/9672 will allow us to remove this // hack of forcing presentationTimeUs to be >= 0. - dumper.add("presentationTimeUs", max(0, subtitles.get(i).presentationTimeUs)); + dumper.addTime("presentationTimeUs", max(0, subtitles.get(i).presentationTimeUs)); ImmutableList subtitle = subtitles.get(i).cues; if (!subtitle.equals(subtitlesFromDeprecatedTextOutput.get(i))) { throw new IllegalStateException( diff --git a/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java b/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java index c6bbce2c87..4070719ad6 100644 --- a/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java +++ b/libraries/transformer/src/test/java/androidx/media3/transformer/CapturingMuxer.java @@ -280,7 +280,7 @@ public final class CapturingMuxer implements Muxer, Dumpable { .add("size", sampleSize) .add("isKeyFrame", isKeyFrame); if (presentationTimeUs != C.TIME_UNSET) { - dumper.add("presentationTimeUs", presentationTimeUs); + dumper.addTime("presentationTimeUs", presentationTimeUs); } dumper.endBlock(); }