mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 06:25:41 +00:00
Psychotoxical
a4c400cc69
M4A files store the iTunSMPB value behind a 16-byte binary 'data' atom header. The previous parser took bytes directly after the ASCII key, landing in the binary header and producing a corrupted parts array (total_valid=348 instead of ~13M samples), which caused take_duration to exhaust the source in ~8ms — silent no-playback. Fix: search for the " 00000000 " sentinel within 128 bytes of the key to locate the actual value string, falling back to the old offset for ID3v2/MP3 files where no binary header exists. Also patches symphonia-format-isomp4 (local crate under patches/) to: - Tolerate SL descriptor predefined=0x01 (older iTunes M4A) - Convert descriptor.unwrap() panic to a proper decode error - Gracefully skip malformed trak atoms (e.g. MJPEG cover-art streams) instead of failing the entire probe Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
65 lines
1.8 KiB
Rust
65 lines
1.8 KiB
Rust
// Symphonia
|
|
// Copyright (c) 2019-2022 The Project Symphonia Developers.
|
|
//
|
|
// This Source Code Form is subject to the terms of the Mozilla Public
|
|
// License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
// file, You can obtain one at https://mozilla.org/MPL/2.0/.
|
|
|
|
use symphonia_core::errors::{decode_error, Result};
|
|
use symphonia_core::io::ReadBytes;
|
|
|
|
use crate::atoms::{Atom, AtomHeader, AtomIterator, AtomType, EdtsAtom, MdiaAtom, TkhdAtom};
|
|
|
|
/// Track atom.
|
|
#[allow(dead_code)]
|
|
#[derive(Debug)]
|
|
pub struct TrakAtom {
|
|
/// Atom header.
|
|
header: AtomHeader,
|
|
/// Track header atom.
|
|
pub tkhd: TkhdAtom,
|
|
/// Optional, edit list atom.
|
|
pub edts: Option<EdtsAtom>,
|
|
/// Media atom.
|
|
pub mdia: MdiaAtom,
|
|
}
|
|
|
|
impl Atom for TrakAtom {
|
|
fn header(&self) -> AtomHeader {
|
|
self.header
|
|
}
|
|
|
|
fn read<B: ReadBytes>(reader: &mut B, header: AtomHeader) -> Result<Self> {
|
|
let mut iter = AtomIterator::new(reader, header);
|
|
|
|
let mut tkhd = None;
|
|
let mut edts = None;
|
|
let mut mdia = None;
|
|
|
|
while let Some(header) = iter.next()? {
|
|
match header.atype {
|
|
AtomType::TrackHeader => {
|
|
tkhd = Some(iter.read_atom::<TkhdAtom>()?);
|
|
}
|
|
AtomType::Edit => {
|
|
edts = Some(iter.read_atom::<EdtsAtom>()?);
|
|
}
|
|
AtomType::Media => {
|
|
mdia = Some(iter.read_atom::<MdiaAtom>()?);
|
|
}
|
|
_ => (),
|
|
}
|
|
}
|
|
|
|
if tkhd.is_none() {
|
|
return decode_error("isomp4: missing tkhd atom");
|
|
}
|
|
|
|
if mdia.is_none() {
|
|
return decode_error("isomp4: missing mdia atom");
|
|
}
|
|
|
|
Ok(TrakAtom { header, tkhd: tkhd.unwrap(), edts, mdia: mdia.unwrap() })
|
|
}
|
|
}
|