From 07ddc0fca55f09d78f59c1604ad662d0c97cefb9 Mon Sep 17 00:00:00 2001 From: samrobinson Date: Mon, 20 May 2024 08:10:39 -0700 Subject: [PATCH] Add debug trace for Muxer completely ending. PiperOrigin-RevId: 635459757 --- .../src/main/java/androidx/media3/effect/DebugTraceUtil.java | 3 ++- .../main/java/androidx/media3/transformer/MuxerWrapper.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java b/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java index f5d875dbbc..b1a02ae67c 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java @@ -228,7 +228,8 @@ public final class DebugTraceUtil { EVENT_CAN_WRITE_SAMPLE_AUDIO, EVENT_WRITE_SAMPLE_AUDIO, EVENT_TRACK_ENDED_AUDIO, - EVENT_TRACK_ENDED_VIDEO)) + EVENT_TRACK_ENDED_VIDEO, + EVENT_OUTPUT_ENDED)) .buildOrThrow(); private static final int MAX_FIRST_LAST_LOGS = 10; diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java b/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java index 2f69b18a6b..9762a8b564 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/MuxerWrapper.java @@ -27,6 +27,7 @@ import static androidx.media3.common.util.Util.usToMs; import static androidx.media3.effect.DebugTraceUtil.COMPONENT_MUXER; import static androidx.media3.effect.DebugTraceUtil.EVENT_CAN_WRITE_SAMPLE_AUDIO; import static androidx.media3.effect.DebugTraceUtil.EVENT_CAN_WRITE_SAMPLE_VIDEO; +import static androidx.media3.effect.DebugTraceUtil.EVENT_OUTPUT_ENDED; import static androidx.media3.effect.DebugTraceUtil.EVENT_TRACK_ENDED_AUDIO; import static androidx.media3.effect.DebugTraceUtil.EVENT_TRACK_ENDED_VIDEO; import static androidx.media3.effect.DebugTraceUtil.EVENT_WRITE_SAMPLE_AUDIO; @@ -612,6 +613,7 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; trackTypeToInfo.delete(trackType); if (trackTypeToInfo.size() == 0) { isEnded = true; + DebugTraceUtil.logEvent(COMPONENT_MUXER, EVENT_OUTPUT_ENDED, maxEndedTrackTimeUs); } }