pair) {
final var keyValue = pair.first.toUpperCase() + "=" + pair.second.trim();
final var bytes = keyValue.getBytes();
@@ -483,24 +511,21 @@ public class OggFromWebMWriter implements Closeable {
}
/**
- * This returns a complete "OpusTags" header, created from the provided metadata tags.
- *
- * You probably want to use makeOpusMetadata(), which uses this function to create
- * a header with sensible metadata filled in.
- *
- * @ImplNote See
- * RFC7845 5.2
+ * This returns a complete Comment header, created from the provided metadata tags.
*
* @param keyValueLines A list of pairs of the tags. This can also be though of as a mapping
* from one key to multiple values.
+ * @param identificationHeader the identification header for the codec,
+ * which is required to be prefixed to the comment header.
* @return The binary header
*/
- private static byte[] makeOpusTagsHeader(final List> keyValueLines) {
+ private static byte[] makeCommentHeader(final List> keyValueLines,
+ final byte[] identificationHeader) {
final var tags = keyValueLines
.stream()
- .filter(p -> !p.second.isBlank())
- .map(OggFromWebMWriter::makeOpusMetadataTag)
- .collect(Collectors.toUnmodifiableList());
+ .filter(p -> p.second != null && !p.second.isBlank())
+ .map(OggFromWebMWriter::makeVorbisMetadataTag)
+ .toList();
final var tagsBytes = tags.stream().collect(Collectors.summingInt(arr -> arr.length));
@@ -509,11 +534,7 @@ public class OggFromWebMWriter implements Closeable {
final var head = ByteBuffer.allocate(byteCount);
head.order(ByteOrder.LITTLE_ENDIAN);
- // See RFC7845 5.2: https://datatracker.ietf.org/doc/html/rfc7845.html#section-5.2
- head.put(new byte[]{
- 0x4F, 0x70, 0x75, 0x73, 0x54, 0x61, 0x67, 0x73, // "OpusTags" binary string
- 0x00, 0x00, 0x00, 0x00, // vendor (aka. Encoder) string of length 0
- });
+ head.put(identificationHeader);
head.putInt(tags.size()); // 4 bytes for tag count
tags.forEach(head::put); // dynamic amount of tag bytes
diff --git a/app/src/main/java/org/schabi/newpipe/util/StreamInfoMetadataHelper.kt b/app/src/main/java/org/schabi/newpipe/util/StreamInfoMetadataHelper.kt
new file mode 100644
index 000000000..3e54ecac2
--- /dev/null
+++ b/app/src/main/java/org/schabi/newpipe/util/StreamInfoMetadataHelper.kt
@@ -0,0 +1,57 @@
+package org.schabi.newpipe.util
+
+import org.schabi.newpipe.extractor.localization.DateWrapper
+import org.schabi.newpipe.extractor.stream.SongMetadata
+import org.schabi.newpipe.extractor.stream.StreamInfo
+
+class StreamInfoMetadataHelper(
+ val streamInfo: StreamInfo
+) {
+ val songInfo: SongMetadata? = streamInfo.songMetadata
+
+ fun getTitle(): String? {
+ if (songInfo?.title?.contentEquals(streamInfo.name) == true) {
+ // YT Music uses uppercase chars in the description, but the StreamInfo name is using
+ // the correct case, so we prefer that
+ return streamInfo.name
+ }
+ return if (songInfo?.title?.isBlank() == false) songInfo.title else streamInfo.name
+ }
+
+ fun getArtist(): String? {
+ if (songInfo?.artist?.contentEquals(streamInfo.uploaderName) == true) {
+ // YT Music uses uppercase chars in the description, but the uploader name is using
+ // the correct case, so we prefer the uploader name
+ return streamInfo.uploaderName
+ }
+ return if (songInfo?.artist?.isBlank() == false) {
+ songInfo.artist
+ } else {
+ streamInfo.uploaderName
+ }
+ }
+
+ fun getPerformer(): List = songInfo?.performer ?: emptyList()
+
+ fun getComposer(): String? = songInfo?.composer
+
+ fun getGenre(): String? = if (songInfo?.genre?.isEmpty() == false) {
+ songInfo.genre
+ } else {
+ streamInfo.category
+ }
+
+ fun getAlbum(): String? = songInfo?.album
+
+ fun getTrackNumber(): Int? = if (songInfo?.track != SongMetadata.TRACK_UNKNOWN) songInfo?.track else null
+
+ fun getDuration(): Long = songInfo?.duration?.seconds ?: streamInfo.duration
+
+ fun getReleaseDate(): DateWrapper = songInfo?.releaseDate ?: streamInfo.uploadDate
+
+ fun getRecordLabel(): String? = songInfo?.label
+
+ fun getCopyright(): String? = songInfo?.copyright ?: streamInfo.licence
+
+ fun getLocation(): String? = songInfo?.location
+}