mirror of
https://github.com/kilyabin/psysonic.git
synced 2026-07-22 14:35: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>
104 lines
3.4 KiB
Rust
104 lines
3.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::{decode_error, Result};
|
|
use symphonia_core::io::ReadBytes;
|
|
use symphonia_core::meta::MetadataRevision;
|
|
|
|
use crate::atoms::{
|
|
Atom, AtomHeader, AtomIterator, AtomType, MvexAtom, MvhdAtom, TrakAtom, UdtaAtom,
|
|
};
|
|
|
|
use log::warn;
|
|
|
|
/// Movie atom.
|
|
#[allow(dead_code)]
|
|
#[derive(Debug)]
|
|
pub struct MoovAtom {
|
|
/// Atom header.
|
|
header: AtomHeader,
|
|
/// Movie header atom.
|
|
pub mvhd: MvhdAtom,
|
|
/// Trak atoms.
|
|
pub traks: Vec<TrakAtom>,
|
|
/// Movie extends atom. The presence of this atom indicates a fragmented stream.
|
|
pub mvex: Option<MvexAtom>,
|
|
/// User data (usually metadata).
|
|
pub udta: Option<UdtaAtom>,
|
|
}
|
|
|
|
impl MoovAtom {
|
|
/// If metadata was read, consumes the metadata and returns it.
|
|
pub fn take_metadata(&mut self) -> Option<MetadataRevision> {
|
|
self.udta.as_mut().and_then(|udta| udta.take_metadata())
|
|
}
|
|
|
|
/// Is the movie segmented.
|
|
pub fn is_fragmented(&self) -> bool {
|
|
self.mvex.is_some()
|
|
}
|
|
}
|
|
|
|
impl Atom for MoovAtom {
|
|
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 mvhd = None;
|
|
let mut traks = Vec::new();
|
|
let mut mvex = None;
|
|
let mut udta = None;
|
|
|
|
while let Some(header) = iter.next()? {
|
|
match header.atype {
|
|
AtomType::MovieHeader => {
|
|
mvhd = Some(iter.read_atom::<MvhdAtom>()?);
|
|
}
|
|
AtomType::Track => {
|
|
// Gracefully skip malformed tracks (e.g. MJPEG cover-art streams
|
|
// in older iTunes M4A files whose stbl or stsd may be missing
|
|
// required atoms). The AtomIterator's next_atom_pos was already
|
|
// set before read_atom was called, so a failure mid-parse still
|
|
// leaves the iterator positioned at the end of this atom.
|
|
match iter.read_atom::<TrakAtom>() {
|
|
Ok(trak) => traks.push(trak),
|
|
Err(e) => warn!("isomp4: skipping malformed trak atom: {}", e),
|
|
}
|
|
}
|
|
AtomType::MovieExtends => {
|
|
mvex = Some(iter.read_atom::<MvexAtom>()?);
|
|
}
|
|
AtomType::UserData => {
|
|
udta = Some(iter.read_atom::<UdtaAtom>()?);
|
|
}
|
|
_ => (),
|
|
}
|
|
}
|
|
|
|
if mvhd.is_none() {
|
|
return decode_error("isomp4: missing mvhd atom");
|
|
}
|
|
|
|
// If fragmented, the mvex atom should contain a trex atom for each trak atom in moov.
|
|
if let Some(mvex) = mvex.as_ref() {
|
|
// For each trak, find a matching trex atom using the track id.
|
|
for trak in traks.iter() {
|
|
let found = mvex.trexs.iter().any(|trex| trex.track_id == trak.tkhd.id);
|
|
|
|
if !found {
|
|
warn!("missing trex atom for trak with id={}", trak.tkhd.id);
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok(MoovAtom { header, mvhd: mvhd.unwrap(), traks, mvex, udta })
|
|
}
|
|
}
|