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

Fix contiguous box reading regression

Browse Source
This commit is contained in:
Vanilagy
2025-06-17 13:53:43 +02:00
parent 25b694d1db
commit a2fc4decda
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/isobmff/isobmff-demuxer.ts
+5 -7
View File
@@ -50,7 +50,7 @@ import {
import { EncodedPacket, PLACEHOLDER_DATA } from '../packet';
import { Reader } from '../reader';
import { buildIsobmffMimeType } from './isobmff-misc';
import { IsobmffReader, MAX_BOX_HEADER_SIZE } from './isobmff-reader';
import { IsobmffReader, MAX_BOX_HEADER_SIZE, MIN_BOX_HEADER_SIZE } from './isobmff-reader';
type InternalTrack = {
id: number;
@@ -549,7 +549,7 @@ export class IsobmffDemuxer extends Demuxer {
readContiguousBoxes(totalSize: number) {
const startIndex = this.metadataReader.pos;
while (this.metadataReader.pos - startIndex < totalSize) {
while (this.metadataReader.pos - startIndex <= totalSize - MIN_BOX_HEADER_SIZE) {
this.traverseBox();
}
}
@@ -826,7 +826,7 @@ export class IsobmffDemuxer extends Demuxer {
this.metadataReader.pos += 4 + 4 + 4 + 2 + 32 + 2 + 2;
this.readContiguousBoxes(startPos + sampleBoxInfo.totalSize - this.metadataReader.pos);
this.readContiguousBoxes((startPos + sampleBoxInfo.totalSize) - this.metadataReader.pos);
} else {
if (lowercaseBoxName === 'mp4a') {
// We don't know the codec yet (might be AAC, might be MP3), need to read the esds box
@@ -960,7 +960,7 @@ export class IsobmffDemuxer extends Demuxer {
track.info.codec = 'pcm-f32be'; // Placeholder, will be adjusted by the pcmC box
}
this.readContiguousBoxes(startPos + sampleBoxInfo.totalSize - this.metadataReader.pos);
this.readContiguousBoxes((startPos + sampleBoxInfo.totalSize) - this.metadataReader.pos);
}
}
}; break;
@@ -1064,9 +1064,7 @@ export class IsobmffDemuxer extends Demuxer {
}; break;
case 'wave': {
if (boxInfo.totalSize > 8) {
this.readContiguousBoxes(boxInfo.contentSize);
}
this.readContiguousBoxes(boxInfo.contentSize);
}; break;
case 'esds': {
src/isobmff/isobmff-reader.ts
+1
View File
@@ -1,5 +1,6 @@
import { Reader } from '../reader';
export const MIN_BOX_HEADER_SIZE = 8;
export const MAX_BOX_HEADER_SIZE = 16;
export class IsobmffReader {