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

Fix Format.toLogString handling of new Format.labels field

Browse Source 
Before this, because `Label.toString()` isn't implemented, the logged info
wasn't that useful:

```
labels=[androidx.media3.common.Label@6caac039]
```

With this change it's more useful:

```
labels=[en: english]
```
PiperOrigin-RevId: 671029474
This commit is contained in:
ibaker 2024-09-04 11:00:05 -07:00 committed by Copybara-Service
parent a00c446529
commit 6822818549
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libraries/common/src/main/java/androidx/media3/common/Format.java
View File

@ -27,6 +27,7 @@ import androidx.media3.common.util.UnstableApi;
import androidx.media3.common.util.Util; import androidx.media3.common.util.Util;
import com.google.common.base.Joiner; import com.google.common.base.Joiner;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.CanIgnoreReturnValue;
import java.lang.annotation.Documented; import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
@ -1380,6 +1381,7 @@ public final class Format {
if (format == null) { if (format == null) {
return "null"; return "null";
} }
Joiner commaJoiner = Joiner.on(',');
StringBuilder builder = new StringBuilder(); StringBuilder builder = new StringBuilder();
builder.append("id=").append(format.id).append(", mimeType=").append(format.sampleMimeType); builder.append("id=").append(format.id).append(", mimeType=").append(format.sampleMimeType);
if (format.containerMimeType != null) { if (format.containerMimeType != null) {
@ -1410,7 +1412,7 @@ public final class Format {
} }
} }
builder.append(", drm=["); builder.append(", drm=[");
Joiner.on(',').appendTo(builder, schemes); commaJoiner.appendTo(builder, schemes);
builder.append(']'); builder.append(']');
} }
if (format.width != NO_VALUE && format.height != NO_VALUE) { if (format.width != NO_VALUE && format.height != NO_VALUE) {
@ -1433,17 +1435,18 @@ public final class Format {
} }
if (!format.labels.isEmpty()) { if (!format.labels.isEmpty()) {
builder.append(", labels=["); builder.append(", labels=[");
Joiner.on(',').appendTo(builder, format.labels); commaJoiner.appendTo(
builder, Lists.transform(format.labels, l -> l.language + ": " + l.value));
builder.append("]"); builder.append("]");
} }
if (format.selectionFlags != 0) { if (format.selectionFlags != 0) {
builder.append(", selectionFlags=["); builder.append(", selectionFlags=[");
Joiner.on(',').appendTo(builder, Util.getSelectionFlagStrings(format.selectionFlags)); commaJoiner.appendTo(builder, Util.getSelectionFlagStrings(format.selectionFlags));
builder.append("]"); builder.append("]");
} }
if (format.roleFlags != 0) { if (format.roleFlags != 0) {
builder.append(", roleFlags=["); builder.append(", roleFlags=[");
Joiner.on(',').appendTo(builder, Util.getRoleFlagStrings(format.roleFlags)); commaJoiner.appendTo(builder, Util.getRoleFlagStrings(format.roleFlags));
builder.append("]"); builder.append("]");
} }
if (format.customData != null) { if (format.customData != null) {