arcodange/mediabunny
1
0
Fork 0
mirror of https://github.com/arcodange-org/mediabunny.git synced 2026-09-27 02:43:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix(isobmff): write QuickTime-compliant MOV AAC sample entry (#311)

Browse Source 
* fix(isobmff): write QuickTime-compliant MOV AAC sample entry

* Clean up logic, only version 1 sample description box was needed, remove bloaty tests

---------

Co-authored-by: Vanilagy <[email protected]>
This commit is contained in:
Igor Samokhovets
2026-02-26 21:48:11 +01:00
committed by GitHub
co-authored by Vanilagy
parent adc2f125bf
commit 152002bd5d
1 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/isobmff/isobmff-boxes.ts
+21 -6
View File
@@ -726,9 +726,10 @@ export const soundSampleDescription = (
) => { ) => {
let version = 0; let version = 0;
let contents: NestedNumberArray; let contents: NestedNumberArray;
let sampleSizeInBits = 16; let sampleSizeInBits = 16;
if ((PCM_AUDIO_CODECS as readonly AudioCodec[]).includes(trackData.track.source._codec)) {
const isPcmCodec = (PCM_AUDIO_CODECS as readonly AudioCodec[]).includes(trackData.track.source._codec);
if (isPcmCodec) {
const codec = trackData.track.source._codec as PcmAudioCodec; const codec = trackData.track.source._codec as PcmAudioCodec;
const { sampleSize } = parsePcmCodec(codec); const { sampleSize } = parsePcmCodec(codec);
sampleSizeInBits = 8 * sampleSize; sampleSizeInBits = 8 * sampleSize;
@@ -738,6 +739,10 @@ export const soundSampleDescription = (
} }
} }
if (trackData.muxer.isQuickTime) {
version = 1;
}
if (version === 0) { if (version === 0) {
contents = [ contents = [
Array(6).fill(0), // Reserved Array(6).fill(0), // Reserved
@@ -753,6 +758,8 @@ export const soundSampleDescription = (
u16(0), // Sample rate (lower) u16(0), // Sample rate (lower)
]; ];
} else { } else {
const compressionId = isPcmCodec ? 0 : -2;
contents = [ contents = [
Array(6).fill(0), // Reserved Array(6).fill(0), // Reserved
u16(1), // Data reference index u16(1), // Data reference index
@@ -761,13 +768,21 @@ export const soundSampleDescription = (
u32(0), // Vendor u32(0), // Vendor
u16(trackData.info.numberOfChannels), // Number of channels u16(trackData.info.numberOfChannels), // Number of channels
u16(Math.min(sampleSizeInBits, 16)), // Sample size (bits) u16(Math.min(sampleSizeInBits, 16)), // Sample size (bits)
u16(0), // Compression ID i16(compressionId), // Compression ID
u16(0), // Packet size u16(0), // Packet size
u16(trackData.info.sampleRate < 2 ** 16 ? trackData.info.sampleRate : 0), // Sample rate (upper) u16(trackData.info.sampleRate < 2 ** 16 ? trackData.info.sampleRate : 0), // Sample rate (upper)
u16(0), // Sample rate (lower) u16(0), // Sample rate (lower)
u32(1), // Samples per packet (must be 1 for uncompressed formats) isPcmCodec
u32(sampleSizeInBits / 8), // Bytes per packet ? [
u32(trackData.info.numberOfChannels * sampleSizeInBits / 8), // Bytes per frame u32(1), // Samples per packet (must be 1 for uncompressed formats)
u32(sampleSizeInBits / 8), // Bytes per packet
u32(trackData.info.numberOfChannels * sampleSizeInBits / 8), // Bytes per frame
]
: [
u32(0), // Samples per packet (don't bother, still works with 0)
u32(0), // Bytes per packet (variable)
u32(0), // Bytes per frame (variable)
],
u32(2), // Bytes per sample (constant in FFmpeg) u32(2), // Bytes per sample (constant in FFmpeg)
]; ];
} }