fix(tracks): read sidx boxes with struct so concurrent tracks parse correctly

This commit is contained in:
imSp4rky
2026-10-25 13:22:08 -06:00
parent 2dc458f8b4
commit 43fcb030f8
2 changed files with 34 additions and 16 deletions
+18
View File
@@ -345,6 +345,24 @@ def test_parse_sidx_refuses_what_it_cannot_cut() -> None:
assert parse_sidx(sidx_box(count=3)[:-4], 0) == (0, []) assert parse_sidx(sidx_box(count=3)[:-4], 0) == (0, [])
def test_parse_sidx_is_right_when_tracks_parse_at_the_same_time() -> None:
boxes = {758: sidx_box(count=758), 1408: sidx_box(count=1408, size=500)}
wrong: list[int] = []
def parse(count: int) -> None:
for _ in range(100):
if len(parse_sidx(boxes[count], 0)[1]) != count:
wrong.append(count)
threads = [threading.Thread(target=parse, args=(count,)) for count in (758, 1408, 758, 1408)]
for thread in threads:
thread.start()
for thread in threads:
thread.join(timeout=30)
assert not wrong
assert not any(thread.is_alive() for thread in threads)
def test_parse_sidx_refuses_a_box_that_counts_more_references_than_it_holds() -> None: def test_parse_sidx_refuses_a_box_that_counts_more_references_than_it_holds() -> None:
box = bytearray(sidx_box(count=3)) box = bytearray(sidx_box(count=3))
box[30:32] = (5).to_bytes(2, "big") box[30:32] = (5).to_bytes(2, "big")
+16 -16
View File
@@ -18,9 +18,7 @@ from uuid import UUID
from zlib import crc32 from zlib import crc32
import click import click
from construct import ConstructError
from langcodes import Language from langcodes import Language
from pymp4.parser import Box
from requests import Session from requests import Session
from requests.adapters import HTTPAdapter, Retry from requests.adapters import HTTPAdapter, Retry
@@ -360,23 +358,25 @@ def parse_sidx(data: bytes, offset: int) -> tuple[int, list[tuple[int, int, int]
Returns the timescale and one (start time, first byte, last byte) for each subsegment. The list Returns the timescale and one (start time, first byte, last byte) for each subsegment. The list
is empty when the box is not a ``sidx`` or when it points at more indexes and not at media. is empty when the box is not a ``sidx`` or when it points at more indexes and not at media.
""" """
# read by hand: pymp4's Box.parse gives wrong results when two threads parse at once
size, header = int.from_bytes(data[:4], "big"), 32 if data[8:9] == b"\x00" else 40 size, header = int.from_bytes(data[:4], "big"), 32 if data[8:9] == b"\x00" else 40
# pymp4 loops forever on a box that counts more references than its size holds count = int.from_bytes(data[header - 2 : header], "big")
if data[4:8] != b"sidx" or size < header + 12 * int.from_bytes(data[header - 2 : header], "big"): if data[4:8] != b"sidx" or len(data) < header or min(size, len(data)) < header + 12 * count:
return 0, [] return 0, []
try: if header == 32:
box = Box.parse(data) timescale, start, first_offset = struct.unpack_from(">III", data, 16)
except ConstructError: else:
return 0, [] timescale, start, first_offset = struct.unpack_from(">IQQ", data, 16)
if any(reference.reference_type != "MEDIA" for reference in box.references): byte = offset + size + first_offset
return 0, []
start, byte = box.earliest_presentation_time, offset + box.end + box.first_offset
subsegments: list[tuple[int, int, int]] = [] subsegments: list[tuple[int, int, int]] = []
for reference in box.references: for i in range(count):
subsegments.append((start, byte, byte + reference.referenced_size - 1)) word, duration = struct.unpack_from(">II", data, header + 12 * i)
start += reference.segment_duration if word >> 31:
byte += reference.referenced_size return 0, []
return box.timescale, subsegments subsegments.append((start, byte, byte + (word & 0x7FFFFFFF) - 1))
start += duration
byte += word & 0x7FFFFFFF
return timescale, subsegments
@dataclass @dataclass