sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Allow additional entries in MetadataUtil.setFormatMetadata.

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

PiperOrigin-RevId: 338475948
This commit is contained in:
samrobinson 2020-10-22 16:23:54 +01:00 committed by Oliver Woodman
parent 18c6b16f91
commit 1191820429
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
library/extractor/src/main/java/com/google/android/exoplayer2/extractor/mp4/MetadataUtil.java
View file

@ -293,7 +293,10 @@ import java.util.List;
@Nullable Metadata udtaMetadata, @Nullable Metadata udtaMetadata,
@Nullable Metadata mdtaMetadata, @Nullable Metadata mdtaMetadata,
GaplessInfoHolder gaplessInfoHolder, GaplessInfoHolder gaplessInfoHolder,
Format.Builder formatBuilder) { Format.Builder formatBuilder,
Metadata.Entry... additionalEntries) {
Metadata formatMetadata = new Metadata();
if (trackType == C.TRACK_TYPE_AUDIO) { if (trackType == C.TRACK_TYPE_AUDIO) {
if (gaplessInfoHolder.hasGaplessInfo()) { if (gaplessInfoHolder.hasGaplessInfo()) {
formatBuilder formatBuilder
@ -302,7 +305,7 @@ import java.util.List;
} }
// We assume all udta metadata is associated with the audio track. // We assume all udta metadata is associated with the audio track.
if (udtaMetadata != null) { if (udtaMetadata != null) {
formatBuilder.setMetadata(udtaMetadata); formatMetadata = udtaMetadata;
} }
} else if (trackType == C.TRACK_TYPE_VIDEO && mdtaMetadata != null) { } else if (trackType == C.TRACK_TYPE_VIDEO && mdtaMetadata != null) {
// Populate only metadata keys that are known to be specific to video. // Populate only metadata keys that are known to be specific to video.
@ -318,9 +321,15 @@ import java.util.List;
} }
} }
if (!mdtaMetadataEntries.isEmpty()) { if (!mdtaMetadataEntries.isEmpty()) {
formatBuilder.setMetadata(new Metadata(mdtaMetadataEntries)); formatMetadata = new Metadata(mdtaMetadataEntries);
} }
} }
formatMetadata = formatMetadata.copyWithAppendedEntries(additionalEntries);
if (formatMetadata.length() > 0) {
formatBuilder.setMetadata(formatMetadata);
}
} }
/** /**