mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 06:25:41 +00:00
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>
106 lines
3.5 KiB
Rust
106 lines
3.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 struct SampleDurationEntry {
|
|
pub sample_count: u32,
|
|
pub sample_delta: u32,
|
|
}
|
|
|
|
/// Time-to-sample atom.
|
|
#[allow(dead_code)]
|
|
#[derive(Debug)]
|
|
pub struct SttsAtom {
|
|
/// Atom header.
|
|
header: AtomHeader,
|
|
pub entries: Vec<SampleDurationEntry>,
|
|
pub total_duration: u64,
|
|
}
|
|
|
|
impl SttsAtom {
|
|
/// Get the timestamp and duration for the sample indicated by `sample_num`. Note, `sample_num`
|
|
/// is indexed relative to the `SttsAtom`. Complexity of this function in O(N).
|
|
pub fn find_timing_for_sample(&self, sample_num: u32) -> Option<(u64, u32)> {
|
|
let mut ts = 0;
|
|
let mut next_entry_first_sample = 0;
|
|
|
|
// The Stts atom compactly encodes a mapping between number of samples and sample duration.
|
|
// Iterate through each entry until the entry containing the next sample is found. The next
|
|
// packet timestamp is then the sum of the product of sample count and sample duration for
|
|
// the n-1 iterated entries, plus the product of the number of consumed samples in the n-th
|
|
// iterated entry and sample duration.
|
|
for entry in &self.entries {
|
|
next_entry_first_sample += entry.sample_count;
|
|
|
|
if sample_num < next_entry_first_sample {
|
|
let entry_sample_offset = sample_num + entry.sample_count - next_entry_first_sample;
|
|
ts += u64::from(entry.sample_delta) * u64::from(entry_sample_offset);
|
|
|
|
return Some((ts, entry.sample_delta));
|
|
}
|
|
|
|
ts += u64::from(entry.sample_count) * u64::from(entry.sample_delta);
|
|
}
|
|
|
|
None
|
|
}
|
|
|
|
/// Get the sample that contains the timestamp indicated by `ts`. Note, the returned `sample_num`
|
|
/// is indexed relative to the `SttsAtom`. Complexity of this function in O(N).
|
|
pub fn find_sample_for_timestamp(&self, ts: u64) -> Option<u32> {
|
|
let mut ts_accum = 0;
|
|
let mut sample_num = 0;
|
|
|
|
for entry in &self.entries {
|
|
let delta = u64::from(entry.sample_delta) * u64::from(entry.sample_count);
|
|
|
|
if ts_accum + delta > ts {
|
|
sample_num += ((ts - ts_accum) / u64::from(entry.sample_delta)) as u32;
|
|
return Some(sample_num);
|
|
}
|
|
|
|
ts_accum += delta;
|
|
sample_num += entry.sample_count;
|
|
}
|
|
|
|
None
|
|
}
|
|
}
|
|
|
|
impl Atom for SttsAtom {
|
|
fn header(&self) -> AtomHeader {
|
|
self.header
|
|
}
|
|
|
|
fn read<B: ReadBytes>(reader: &mut B, header: AtomHeader) -> Result<Self> {
|
|
let (_, _) = AtomHeader::read_extra(reader)?;
|
|
|
|
let entry_count = reader.read_be_u32()?;
|
|
|
|
let mut total_duration = 0;
|
|
|
|
// TODO: Limit table length.
|
|
let mut entries = Vec::with_capacity(entry_count as usize);
|
|
|
|
for _ in 0..entry_count {
|
|
let sample_count = reader.read_be_u32()?;
|
|
let sample_delta = reader.read_be_u32()?;
|
|
|
|
total_duration += u64::from(sample_count) * u64::from(sample_delta);
|
|
|
|
entries.push(SampleDurationEntry { sample_count, sample_delta });
|
|
}
|
|
|
|
Ok(SttsAtom { header, entries, total_duration })
|
|
}
|
|
}
|