Commit 11918204 by samrobinson Committed by Oliver Woodman

Allow additional entries in MetadataUtil.setFormatMetadata.

The primary use of this currently will be for appending SEF metadata.

PiperOrigin-RevId: 338475948
parent 18c6b16f
......@@ -293,7 +293,10 @@ import java.util.List;
@Nullable Metadata udtaMetadata,
@Nullable Metadata mdtaMetadata,
GaplessInfoHolder gaplessInfoHolder,
Format.Builder formatBuilder) {
Format.Builder formatBuilder,
Metadata.Entry... additionalEntries) {
Metadata formatMetadata = new Metadata();
if (trackType == C.TRACK_TYPE_AUDIO) {
if (gaplessInfoHolder.hasGaplessInfo()) {
formatBuilder
......@@ -302,7 +305,7 @@ import java.util.List;
}
// We assume all udta metadata is associated with the audio track.
if (udtaMetadata != null) {
formatBuilder.setMetadata(udtaMetadata);
formatMetadata = udtaMetadata;
}
} else if (trackType == C.TRACK_TYPE_VIDEO && mdtaMetadata != null) {
// Populate only metadata keys that are known to be specific to video.
......@@ -318,9 +321,15 @@ import java.util.List;
}
}
if (!mdtaMetadataEntries.isEmpty()) {
formatBuilder.setMetadata(new Metadata(mdtaMetadataEntries));
formatMetadata = new Metadata(mdtaMetadataEntries);
}
}
formatMetadata = formatMetadata.copyWithAppendedEntries(additionalEntries);
if (formatMetadata.length() > 0) {
formatBuilder.setMetadata(formatMetadata);
}
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment