mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 14:35: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>
54 lines
1.4 KiB
Rust
54 lines
1.4 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::Result;
|
|
use symphonia_core::io::ReadBytes;
|
|
use symphonia_core::meta::MetadataRevision;
|
|
|
|
use crate::atoms::{Atom, AtomHeader, AtomIterator, AtomType, MetaAtom};
|
|
|
|
/// User data atom.
|
|
#[allow(dead_code)]
|
|
#[derive(Debug)]
|
|
pub struct UdtaAtom {
|
|
/// Atom header.
|
|
header: AtomHeader,
|
|
/// Metadata atom.
|
|
pub meta: Option<MetaAtom>,
|
|
}
|
|
|
|
impl UdtaAtom {
|
|
/// If metadata was read, consumes the metadata and returns it.
|
|
pub fn take_metadata(&mut self) -> Option<MetadataRevision> {
|
|
self.meta.as_mut().and_then(|meta| meta.take_metadata())
|
|
}
|
|
}
|
|
|
|
impl Atom for UdtaAtom {
|
|
fn header(&self) -> AtomHeader {
|
|
self.header
|
|
}
|
|
|
|
#[allow(clippy::single_match)]
|
|
fn read<B: ReadBytes>(reader: &mut B, header: AtomHeader) -> Result<Self> {
|
|
let mut iter = AtomIterator::new(reader, header);
|
|
|
|
let mut meta = None;
|
|
|
|
while let Some(header) = iter.next()? {
|
|
match header.atype {
|
|
AtomType::Meta => {
|
|
meta = Some(iter.read_atom::<MetaAtom>()?);
|
|
}
|
|
_ => (),
|
|
}
|
|
}
|
|
|
|
Ok(UdtaAtom { header, meta })
|
|
}
|
|
}
|