mirror of
https://github.com/Psychotoxical/psysonic.git
synced 2026-07-28 10:06:47 +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>
59 lines
1.5 KiB
Rust
59 lines
1.5 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 crate::atoms::{Atom, AtomHeader};
|
|
|
|
#[derive(Debug)]
|
|
pub enum SampleSize {
|
|
Constant(u32),
|
|
Variable(Vec<u32>),
|
|
}
|
|
|
|
/// Sample Size Atom
|
|
#[allow(dead_code)]
|
|
#[derive(Debug)]
|
|
pub struct StszAtom {
|
|
/// Atom header.
|
|
header: AtomHeader,
|
|
/// The total number of samples.
|
|
pub sample_count: u32,
|
|
/// A vector of `sample_count` sample sizes, or a constant size for all samples.
|
|
pub sample_sizes: SampleSize,
|
|
}
|
|
|
|
impl Atom for StszAtom {
|
|
fn header(&self) -> AtomHeader {
|
|
self.header
|
|
}
|
|
|
|
fn read<B: ReadBytes>(reader: &mut B, header: AtomHeader) -> Result<Self> {
|
|
let (_, _) = AtomHeader::read_extra(reader)?;
|
|
|
|
let sample_size = reader.read_be_u32()?;
|
|
let sample_count = reader.read_be_u32()?;
|
|
|
|
let sample_sizes = if sample_size == 0 {
|
|
// TODO: Apply a limit.
|
|
let mut entries = Vec::with_capacity(sample_count as usize);
|
|
|
|
for _ in 0..sample_count {
|
|
entries.push(reader.read_be_u32()?);
|
|
}
|
|
|
|
SampleSize::Variable(entries)
|
|
}
|
|
else {
|
|
SampleSize::Constant(sample_size)
|
|
};
|
|
|
|
Ok(StszAtom { header, sample_count, sample_sizes })
|
|
}
|
|
}
|