mirror of
https://github.com/arcodange-org/mediabunny.git
synced 2026-10-03 05:43:50 +02:00
FLAC container support (#95)
* add a test * recognize as input format * scaffold flac demuxer * implement getting metadata * Implement mime type * read all metadata + deduplicate stubs * Read first packet * copyright headers * read the first packet * Get entire first packet, work on advancing * iterate over all samples * testable with bun * stub out metadata support * parse descriptive metadata * All in 1 file seems more appropriate to the philosophy * some parameters are not needed anymore all within 1 class * skip over bytes we are sure are not the syncword * run prettier * timestamp is determined based on passed blocks, not maximumBlockSize * no binary search needed! * simplifications * Finish demuxer reading sequentially * more tests + add a file with a seektable * don't throw if (this.audioInfo.minimumBlockSize !== this.audioInfo.maximumBlockSize * Add docs * Update format compatibility table * Simplification * confirm conversion is working * Finish * Resolve TODO comment * Support images (read-only) * Returning description as Uint8Array * Cleanup of demuxer * Misc renames * Object on same line * Resolve first batch of comments * Throw errors on corrupt blocks, correctly use requestSlice() * Fix description field * Explain why last frame is a bit shorter * Add FLAC to README * Put track backings below demuxer * convert to methods * Reorder container checking * getBlockSize() -> readBlockSize() * bitStream -> bitstream * better naming for bytes * use .skip() * Don't return blockSize twice in readFlacFrameHeader * Use enum + switch to distinguish Flac block types * Use else-if * Use else-if * Compressed switch statement * readCodedNumber * Update flac-misc.ts * We don't need the bits variable at all * reorder functions in flac-demuxer * Handle gracefully not being able to load another sample * Update flac-demuxer.ts * blockingbit null * use async instead of promise.resolve * use binary search * Replace recursion with while loop * Add mutex to getPacket() * Load more data not in getPacketAtIndex, but outside * Apply suggestion from @Vanilagy Co-authored-by: David P. <[email protected]> * computeDuration() reads last packet * Update flac-demuxer.ts * share vorbis comment reading logic * reuse vorbis comment writing logic, set vendor always to "Mediabunny" * flush after writign * Use FileSlice.tempFromBytes * assert !== null * fixing nitpicks * apply suggestions * fix ogg * We are now muxing images * apply suggestion * Update src/flac/flac-muxer.ts Co-authored-by: David P. <[email protected]> * apply suggestion * readSampleRate() * seek outside writeHeader() * mention vorbis metadata + add to metadatatags comment * should be able to -> can * Add test in metadata tags * Add test for packets being byte identical after remuxing * compare to null * no casting to uint8array * make test pass * Update flac-muxer.ts * Call validateAudioChunkMetadata() and validateAndNormalizeTimestamp() * `onFrame` option * emit frames using onFrame * Run prettier over files * Fix FLAC PICTURE block logic, small other changes * Update docs * Remove .only modifier * fix remuxing and add test * Don't throw error if parsing fails in header, since hitting a syncword might just be coincidential * Fix remaining type errors --------- Co-authored-by: David P. <[email protected]>
This commit is contained in:
Jonny Burger
+3
-178
@@ -7,15 +7,11 @@
|
||||
*/
|
||||
|
||||
import { OPUS_SAMPLE_RATE, validateAudioChunkMetadata } from '../codec';
|
||||
import { parseModesFromVorbisSetupPacket, parseOpusIdentificationHeader } from '../codec-data';
|
||||
import { createVorbisComments, parseModesFromVorbisSetupPacket, parseOpusIdentificationHeader } from '../codec-data';
|
||||
import {
|
||||
assert,
|
||||
assertNever,
|
||||
bytesToBase64,
|
||||
keyValueIterator,
|
||||
promiseWithResolvers,
|
||||
setInt64,
|
||||
textEncoder,
|
||||
toDataView,
|
||||
toUint8Array,
|
||||
} from '../misc';
|
||||
@@ -199,7 +195,7 @@ export class OggMuxer extends Muxer {
|
||||
commentHeaderHeader[5] = 0x69; // 'i'
|
||||
commentHeaderHeader[6] = 0x73; // 's'
|
||||
|
||||
const commentHeader = this.createVorbisComments(commentHeaderHeader);
|
||||
const commentHeader = createVorbisComments(commentHeaderHeader, this.output._metadataTags, true);
|
||||
|
||||
trackData.packetQueue.push({
|
||||
data: identificationHeader,
|
||||
@@ -239,7 +235,7 @@ export class OggMuxer extends Muxer {
|
||||
const commentHeaderHeaderView = toDataView(commentHeaderHeader);
|
||||
commentHeaderHeaderView.setUint32(0, 0x4f707573, false); // 'Opus'
|
||||
commentHeaderHeaderView.setUint32(4, 0x54616773, false); // 'Tags'
|
||||
const commentHeader = this.createVorbisComments(commentHeaderHeader);
|
||||
const commentHeader = createVorbisComments(commentHeaderHeader, this.output._metadataTags, true);
|
||||
|
||||
trackData.packetQueue.push({
|
||||
data: identificationHeader,
|
||||
@@ -259,177 +255,6 @@ export class OggMuxer extends Muxer {
|
||||
}
|
||||
}
|
||||
|
||||
createVorbisComments(headerBytes: Uint8Array) {
|
||||
// https://datatracker.ietf.org/doc/html/rfc7845#section-5.2
|
||||
|
||||
const tags = this.output._metadataTags;
|
||||
const commentHeaderParts = [
|
||||
headerBytes,
|
||||
];
|
||||
|
||||
let vendorString = '';
|
||||
if (typeof tags.raw?.['vendor'] === 'string') {
|
||||
vendorString = tags.raw?.['vendor'];
|
||||
}
|
||||
const encodedVendorString = textEncoder.encode(vendorString);
|
||||
|
||||
let currentBuffer = new Uint8Array(4 + encodedVendorString.length);
|
||||
let currentView = new DataView(currentBuffer.buffer);
|
||||
currentView.setUint32(0, encodedVendorString.length, true);
|
||||
currentBuffer.set(encodedVendorString, 4);
|
||||
|
||||
commentHeaderParts.push(currentBuffer);
|
||||
|
||||
const writtenTags = new Set<string>();
|
||||
const addCommentTag = (key: string, value: string) => {
|
||||
const joined = `${key}=${value}`;
|
||||
const encoded = textEncoder.encode(joined);
|
||||
|
||||
currentBuffer = new Uint8Array(4 + encoded.length);
|
||||
currentView = new DataView(currentBuffer.buffer);
|
||||
|
||||
currentView.setUint32(0, encoded.length, true);
|
||||
currentBuffer.set(encoded, 4);
|
||||
|
||||
commentHeaderParts.push(currentBuffer);
|
||||
writtenTags.add(key);
|
||||
};
|
||||
|
||||
for (const { key, value } of keyValueIterator(tags)) {
|
||||
switch (key) {
|
||||
case 'title': {
|
||||
addCommentTag('TITLE', value);
|
||||
}; break;
|
||||
|
||||
case 'description': {
|
||||
addCommentTag('DESCRIPTION', value);
|
||||
}; break;
|
||||
|
||||
case 'artist': {
|
||||
addCommentTag('ARTIST', value);
|
||||
}; break;
|
||||
|
||||
case 'album': {
|
||||
addCommentTag('ALBUM', value);
|
||||
}; break;
|
||||
|
||||
case 'albumArtist': {
|
||||
addCommentTag('ALBUMARTIST', value);
|
||||
}; break;
|
||||
|
||||
case 'genre': {
|
||||
addCommentTag('GENRE', value);
|
||||
}; break;
|
||||
|
||||
case 'date': {
|
||||
addCommentTag('DATE', value.toISOString().slice(0, 10));
|
||||
}; break;
|
||||
|
||||
case 'comment': {
|
||||
addCommentTag('COMMENT', value);
|
||||
}; break;
|
||||
|
||||
case 'lyrics': {
|
||||
addCommentTag('LYRICS', value);
|
||||
}; break;
|
||||
|
||||
case 'trackNumber': {
|
||||
addCommentTag('TRACKNUMBER', value.toString());
|
||||
}; break;
|
||||
|
||||
case 'tracksTotal': {
|
||||
addCommentTag('TRACKTOTAL', value.toString());
|
||||
}; break;
|
||||
|
||||
case 'discNumber': {
|
||||
addCommentTag('DISCNUMBER', value.toString());
|
||||
}; break;
|
||||
|
||||
case 'discsTotal': {
|
||||
addCommentTag('DISCTOTAL', value.toString());
|
||||
}; break;
|
||||
|
||||
case 'images': {
|
||||
for (const image of value) {
|
||||
// https://datatracker.ietf.org/doc/rfc9639/ Section 8.8
|
||||
const pictureType = image.kind === 'coverFront' ? 3 : image.kind === 'coverBack' ? 4 : 0;
|
||||
const encodedMediaType = new Uint8Array(image.mimeType.length);
|
||||
|
||||
for (let i = 0; i < image.mimeType.length; i++) {
|
||||
encodedMediaType[i] = image.mimeType.charCodeAt(i);
|
||||
}
|
||||
|
||||
const encodedDescription = textEncoder.encode(image.description ?? '');
|
||||
|
||||
const buffer = new Uint8Array(
|
||||
4 // Picture type
|
||||
+ 4 // MIME type length
|
||||
+ encodedMediaType.length // MIME type
|
||||
+ 4 // Description length
|
||||
+ encodedDescription.length // Description
|
||||
+ 16 // Width, height, color depth, number of colors
|
||||
+ 4 // Picture data length
|
||||
+ image.data.length, // Picture data
|
||||
);
|
||||
const view = toDataView(buffer);
|
||||
|
||||
view.setUint32(0, pictureType, false);
|
||||
view.setUint32(4, encodedMediaType.length, false);
|
||||
buffer.set(encodedMediaType, 8);
|
||||
view.setUint32(8 + encodedMediaType.length, encodedDescription.length, false);
|
||||
buffer.set(encodedDescription, 12 + encodedMediaType.length);
|
||||
// Skip a bunch of fields (width, height, color depth, number of colors)
|
||||
view.setUint32(
|
||||
28 + encodedMediaType.length + encodedDescription.length, image.data.length, false,
|
||||
);
|
||||
buffer.set(
|
||||
image.data,
|
||||
32 + encodedMediaType.length + encodedDescription.length,
|
||||
);
|
||||
|
||||
const encoded = bytesToBase64(buffer);
|
||||
addCommentTag('METADATA_BLOCK_PICTURE', encoded);
|
||||
}
|
||||
}; break;
|
||||
|
||||
case 'raw': {
|
||||
// Handled later
|
||||
}; break;
|
||||
|
||||
default: assertNever(key);
|
||||
}
|
||||
}
|
||||
|
||||
if (tags.raw) {
|
||||
for (const key in tags.raw) {
|
||||
const value = tags.raw[key];
|
||||
if (key === 'vendor' || value == null || writtenTags.has(key)) {
|
||||
continue;
|
||||
}
|
||||
|
||||
if (typeof value === 'string') {
|
||||
addCommentTag(key, value);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
const listLengthBuffer = new Uint8Array(4);
|
||||
toDataView(listLengthBuffer).setUint32(0, writtenTags.size, true);
|
||||
commentHeaderParts.splice(2, 0, listLengthBuffer); // Insert after the header and vendor section
|
||||
|
||||
// Merge all comment header parts into a single buffer
|
||||
const commentHeaderLength = commentHeaderParts.reduce((a, b) => a + b.length, 0);
|
||||
const commentHeader = new Uint8Array(commentHeaderLength);
|
||||
|
||||
let pos = 0;
|
||||
for (const part of commentHeaderParts) {
|
||||
commentHeader.set(part, pos);
|
||||
pos += part.length;
|
||||
}
|
||||
|
||||
return commentHeader;
|
||||
}
|
||||
|
||||
async addEncodedAudioPacket(track: OutputAudioTrack, packet: EncodedPacket, meta?: EncodedAudioChunkMetadata) {
|
||||
const release = await this.mutex.acquire();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user