From 6633b05c0ac32ee35eef74be95d7e4745599d650 Mon Sep 17 00:00:00 2001 From: claincly Date: Tue, 1 Aug 2023 16:00:30 +0000 Subject: [PATCH] Reorder DebugTraceEvent PiperOrigin-RevId: 552818752 --- .../androidx/media3/effect/DebugTraceUtil.java | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) 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 0fc385b2f5..acc092e627 100644 --- a/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java +++ b/libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java @@ -77,12 +77,13 @@ public final class DebugTraceUtil { public static final String EVENT_VFP_RENDERED_TO_INPUT = "VFP-RenderedToInput"; public static final String EVENT_VFP_FRAME_DEQUEUED = "VFP-FrameDequeued"; public static final String EVENT_VFP_RENDERED_TO_OUTPUT = "VFP-RenderedToOutput"; - public static final String EVENT_MUXER_CAN_WRITE_SAMPLE_VIDEO = "Muxer-CanWriteSample_Video"; - public static final String EVENT_MUXER_CAN_WRITE_SAMPLE_AUDIO = "Muxer-CanWriteSample_Audio"; public static final String EVENT_ENCODER_ENCODED_FRAME = "Encoder-EncodedFrame"; - public static final String EVENT_MUXER_INPUT_AUDIO = "Muxer-Input_Audio"; + public static final String EVENT_MUXER_CAN_WRITE_SAMPLE_VIDEO = "Muxer-CanWriteSample_Video"; public static final String EVENT_MUXER_INPUT_VIDEO = "Muxer-Input_Video"; + public static final String EVENT_MUXER_CAN_WRITE_SAMPLE_AUDIO = "Muxer-CanWriteSample_Audio"; + public static final String EVENT_MUXER_INPUT_AUDIO = "Muxer-Input_Audio"; public static final String EVENT_DECODER_RECEIVE_EOS = "Decoder-ReceiveEOS"; + public static final String EVENT_DECODER_SIGNAL_EOS = "Decoder-SignalEOS"; public static final String EVENT_VFP_RECEIVE_DECODER_EOS = "VFP-ReceiveDecoderEOS"; public static final String EVENT_EXTERNAL_INPUT_MANAGER_SIGNAL_EOS = "ExternalInputManager-SignalEOS"; @@ -92,10 +93,10 @@ public final class DebugTraceUtil { "TexIdTextureManager-SignalEOS"; public static final String EVENT_VFP_SIGNAL_EOS = "VFP-SignalEOS"; public static final String EVENT_ENCODER_RECEIVE_EOS = "Encoder-ReceiveEOS"; - public static final String EVENT_DECODER_SIGNAL_EOS = "Decoder-SignalEOS"; public static final String EVENT_MUXER_TRACK_ENDED_AUDIO = "Muxer-TrackEnded_Audio"; public static final String EVENT_MUXER_TRACK_ENDED_VIDEO = "Muxer-TrackEnded_Video"; + /** List ordered based on expected event ordering. */ private static final ImmutableList EVENT_TYPES = ImmutableList.of( EVENT_VIDEO_INPUT_FORMAT, @@ -103,19 +104,19 @@ public final class DebugTraceUtil { EVENT_VFP_RENDERED_TO_INPUT, EVENT_VFP_FRAME_DEQUEUED, EVENT_VFP_RENDERED_TO_OUTPUT, - EVENT_MUXER_CAN_WRITE_SAMPLE_VIDEO, - EVENT_MUXER_CAN_WRITE_SAMPLE_AUDIO, EVENT_ENCODER_ENCODED_FRAME, - EVENT_MUXER_INPUT_AUDIO, + EVENT_MUXER_CAN_WRITE_SAMPLE_VIDEO, EVENT_MUXER_INPUT_VIDEO, + EVENT_MUXER_CAN_WRITE_SAMPLE_AUDIO, + EVENT_MUXER_INPUT_AUDIO, EVENT_DECODER_RECEIVE_EOS, + EVENT_DECODER_SIGNAL_EOS, EVENT_VFP_RECEIVE_DECODER_EOS, EVENT_EXTERNAL_INPUT_MANAGER_SIGNAL_EOS, EVENT_BITMAP_TEXTURE_MANAGER_SIGNAL_EOS, EVENT_TEX_ID_TEXTURE_MANAGER_SIGNAL_EOS, EVENT_VFP_SIGNAL_EOS, EVENT_ENCODER_RECEIVE_EOS, - EVENT_DECODER_SIGNAL_EOS, EVENT_MUXER_TRACK_ENDED_AUDIO, EVENT_MUXER_TRACK_ENDED_VIDEO);