From 298e61398e8d2e26dd35c4a9af266330de150ddf Mon Sep 17 00:00:00 2001 From: olly Date: Tue, 15 Mar 2022 19:02:41 +0000 Subject: [PATCH] Improve EventLogger metadata logging 1. Fix indentation 2. Fix intention to only log one Metadata block PiperOrigin-RevId: 434818209 --- .../media3/exoplayer/util/EventLogger.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/EventLogger.java b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/EventLogger.java index 841a11ed26..758acbedea 100644 --- a/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/EventLogger.java +++ b/libraries/exoplayer/src/main/java/androidx/media3/exoplayer/util/EventLogger.java @@ -286,19 +286,19 @@ public class EventLogger implements AnalyticsListener { } // TODO: Replace this with an override of onMediaMetadataChanged. // Log metadata for at most one of the selected tracks. - for (int groupIndex = 0; groupIndex < trackGroupInfos.size(); groupIndex++) { + boolean loggedMetadata = false; + for (int groupIndex = 0; !loggedMetadata && groupIndex < trackGroupInfos.size(); groupIndex++) { TracksInfo.TrackGroupInfo trackGroupInfo = trackGroupInfos.get(groupIndex); TrackGroup trackGroup = trackGroupInfo.getTrackGroup(); - for (int trackIndex = 0; trackIndex < trackGroup.length; trackIndex++) { - if (!trackGroupInfo.isTrackSelected(trackIndex)) { - continue; - } - @Nullable Metadata metadata = trackGroup.getFormat(trackIndex).metadata; - if (metadata != null) { - logd(" Metadata ["); - printMetadata(metadata, " "); - logd(" ]"); - break; + for (int trackIndex = 0; !loggedMetadata && trackIndex < trackGroup.length; trackIndex++) { + if (trackGroupInfo.isTrackSelected(trackIndex)) { + @Nullable Metadata metadata = trackGroup.getFormat(trackIndex).metadata; + if (metadata != null && metadata.length() > 0) { + logd(" Metadata ["); + printMetadata(metadata, " "); + logd(" ]"); + loggedMetadata = true; + } } } }