loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Handle null extraFormat on entry in DebugTraceUtil.

Browse Source 
PiperOrigin-RevId: 631821753
This commit is contained in:
samrobinson 2024-05-08 09:11:30 -07:00 committed by Copybara-Service
parent ad2fc4fbb1
commit 8b14d71ff0
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libraries/effect/src/main/java/androidx/media3/effect/DebugTraceUtil.java
View File

@ -22,13 +22,11 @@ import static java.lang.annotation.ElementType.TYPE_USE;
import android.util.JsonWriter; import android.util.JsonWriter;
import androidx.annotation.GuardedBy; import androidx.annotation.GuardedBy;
import androidx.annotation.Nullable;
import androidx.annotation.StringDef; import androidx.annotation.StringDef;
import androidx.media3.common.C; import androidx.media3.common.C;
import androidx.media3.common.util.SystemClock; import androidx.media3.common.util.SystemClock;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.util.Util; import androidx.media3.common.util.Util;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import java.io.IOException; import java.io.IOException;
import java.io.StringWriter; import java.io.StringWriter;
@ -176,7 +174,7 @@ public final class DebugTraceUtil {
public static synchronized void logEvent( public static synchronized void logEvent(
@DebugTraceEvent String eventName, @DebugTraceEvent String eventName,
long presentationTimeUs, long presentationTimeUs,
@Nullable String extraFormat, String extraFormat,
Object... extraArgs) { Object... extraArgs) {
if (!enableTracing) { if (!enableTracing) {
return; return;
@ -186,8 +184,7 @@ public final class DebugTraceUtil {
events.put(eventName, new EventLogger()); events.put(eventName, new EventLogger());
} }
EventLogger logger = events.get(eventName); EventLogger logger = events.get(eventName);
@Nullable String extra = Util.formatInvariant(extraFormat, extraArgs);
String extra = extraFormat != null ? Util.formatInvariant(extraFormat, extraArgs) : null;
logger.addLog(new EventLog(presentationTimeUs, eventTimeMs, extra)); logger.addLog(new EventLog(presentationTimeUs, eventTimeMs, extra));
} }
@ -200,7 +197,7 @@ public final class DebugTraceUtil {
*/ */
public static synchronized void logEvent( public static synchronized void logEvent(
@DebugTraceEvent String eventName, long presentationTimeUs) { @DebugTraceEvent String eventName, long presentationTimeUs) {
logEvent(eventName, presentationTimeUs, /* extraFormat= */ null); logEvent(eventName, presentationTimeUs, /* extraFormat= */ "");
} }
/** /**
@ -250,7 +247,7 @@ public final class DebugTraceUtil {
entry.getKey(), entry.getKey(),
eventLog.eventTimeMs, eventLog.eventTimeMs,
presentationTimeToString(eventLog.presentationTimeUs), presentationTimeToString(eventLog.presentationTimeUs),
Strings.nullToEmpty(eventLog.extra))); eventLog.extra));
} }
} }
} }
@ -268,9 +265,9 @@ public final class DebugTraceUtil {
private static final class EventLog { private static final class EventLog {
public final long presentationTimeUs; public final long presentationTimeUs;
public final long eventTimeMs; public final long eventTimeMs;
@Nullable public final String extra; public final String extra;
private EventLog(long presentationTimeUs, long eventTimeMs, @Nullable String extra) { private EventLog(long presentationTimeUs, long eventTimeMs, String extra) {
this.presentationTimeUs = presentationTimeUs; this.presentationTimeUs = presentationTimeUs;
this.eventTimeMs = eventTimeMs; this.eventTimeMs = eventTimeMs;
this.extra = extra; this.extra = extra;
@ -279,7 +276,7 @@ public final class DebugTraceUtil {
@Override @Override
public String toString() { public String toString() {
return formatInvariant("%s@%dms", presentationTimeToString(presentationTimeUs), eventTimeMs) return formatInvariant("%s@%dms", presentationTimeToString(presentationTimeUs), eventTimeMs)
+ (extra != null ? formatInvariant("(%s)", extra) : ""); + (extra.isEmpty() ? "" : formatInvariant("(%s)", extra));
} }
} }