dvd: route AC-3 audio to the physically-correct sub-stream by probed channel count
Fixes the "Silence of the Lambs" R2 PAL wrong-substream rip: the feature's IFO declares one 5.1 AC-3 stream, but the scan assigned it the on-wire sub-stream id 0x80 purely by per-codec ordinal (ifo::assign_audio_sub_stream_ids). On this disc the physical 0x80 carries the 2.0 down-mix and the 5.1 main mix lives at a different 0x8x sub-stream, so the rip muxed 2.0 while labelling it "Dolby Digital 5.1" (the acmod fixup in mkv.rs then corrected only the Channels element, surfacing the mismatch as the "IFO claimed 6 but acmod says 2" warning — too late to re-route). New src/disc/dvd_audio_probe.rs probes each physical AC-3 sub-stream's real channel count from the head of the feature (the acmod/lfeon of its first frame after the 0x0B77 sync) and re-routes each IFO-declared AC-3 stream onto the physical sub-stream whose actual channel count matches the declared count, instead of trusting the ordinal. Wired into both mux demux paths (DiscStream::new and resolve::build_iso_pipeline) over the decrypting reader, so it works on CSS discs and the autorip ISO-remux path alike. Bounded 512-sector best-effort read; an empty/unreadable probe degrades to the original ordinal mapping (no regression on normal discs). The cell selection is left unchanged: the feature's cell 0 (cat=0x02, 302.4s) is chapter 1 of the movie (matches MakeMKV's chapter map and 1h53 duration exactly), so it must NOT be dropped — the perceived "wrong video at the start" was the wrong 2.0 audio over the opening, the same root cause. Diagnostics (--log-level 3): new tag=dvd.substream rows dump the ACTUAL acmod channel count of each physical 0x8x sub-stream read from the VOB, and the per-cell tag=dvd.cell verdict now spells out the keep/skip reason. With the existing tag=dvd.aattr (IFO declared sub_id + channels) a bug log alone now shows whether the ordinal 0x80 really carries the declared layout — no disc needed to diagnose this class. expose ac3::find_ac3_sync as pub(crate) for the probe.
This commit is contained in:
Matthew Jackson
+46
-3
@@ -134,6 +134,19 @@ pub fn sample_rate_hz(s: SampleRate) -> u32 {
|
||||
/// filter.
|
||||
pub fn dvd_cell_row(idx: usize, cell: &crate::ifo::DvdCell, dropped: bool) -> String {
|
||||
let c = CellCategory::decode(cell.category);
|
||||
// Per-cell keep/skip REASON (self-sufficient bug log): a dropped cell is a
|
||||
// leading secondary angle/interleave block piece; a kept cell is either the
|
||||
// first feature cell or genuine feature content. This makes the
|
||||
// leading-cell-filter decision auditable from the log without the disc.
|
||||
let verdict = if dropped {
|
||||
"DROP(leading-secondary-block-piece)"
|
||||
} else if c.is_secondary_block_piece() {
|
||||
// Kept despite being a secondary piece — only happens past the leading
|
||||
// run (the filter stops at the first plain feature cell).
|
||||
"keep(feature-body)"
|
||||
} else {
|
||||
"keep(plain-feature)"
|
||||
};
|
||||
format!(
|
||||
"tag=dvd.cell idx={idx} cat=0x{:02X} type={} block_mode={} block_type={} \
|
||||
seamless={} ilv={} plain={} first={} last={} dur={:.1}s {}",
|
||||
@@ -147,7 +160,7 @@ seamless={} ilv={} plain={} first={} last={} dur={:.1}s {}",
|
||||
cell.first_sector,
|
||||
cell.last_sector,
|
||||
cell.duration_secs,
|
||||
if dropped { "DROP(non-feature)" } else { "keep" },
|
||||
verdict,
|
||||
)
|
||||
}
|
||||
|
||||
@@ -229,6 +242,36 @@ pub fn dump_dvd_attrs(ts: &crate::ifo::DvdTitleSet) {
|
||||
}
|
||||
}
|
||||
|
||||
/// Emit the ACTUAL per-physical-sub-stream AC-3 channel counts read off the VOB
|
||||
/// during the mux-time sub-stream probe (the Silence-of-the-Lambs wrong-stream
|
||||
/// fix). This is the ground truth the IFO nibble is compared against: each row
|
||||
/// is `sub_id=0x8x channels=N` for a physical `private_stream_1` AC-3 sub-stream
|
||||
/// whose first frame was decoded. An empty probe (scrambled / unreadable / short
|
||||
/// VOB) logs a single `probed=0` line so the absence is explicit in a bug log.
|
||||
///
|
||||
/// Self-sufficiency: with `tag=dvd.aattr` (the IFO's declared sub_id + claimed
|
||||
/// channels) and these `tag=dvd.substream` rows (the physical reality), a bug
|
||||
/// log alone shows whether the ordinal `0x80` actually carries the declared
|
||||
/// channel layout — no disc needed to diagnose a wrong-substream rip.
|
||||
pub fn dump_dvd_substream_probe(title_id: u16, probed: &std::collections::BTreeMap<u8, u8>) {
|
||||
if !tracing::enabled!(target: DIAG, tracing::Level::DEBUG) {
|
||||
return;
|
||||
}
|
||||
if probed.is_empty() {
|
||||
tracing::debug!(
|
||||
target: DIAG,
|
||||
"tag=dvd.substream title={title_id} probed=0 (no AC-3 sync in feature head — scrambled/unreadable/none)",
|
||||
);
|
||||
return;
|
||||
}
|
||||
for (sub, ch) in probed {
|
||||
tracing::debug!(
|
||||
target: DIAG,
|
||||
"tag=dvd.substream title={title_id} sub_id=0x{sub:02X} channels={ch} (physical acmod read from VOB)",
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
// ── Disc-level dump (post-lowering: titles, streams, decisions, AACS) ────────
|
||||
|
||||
/// Emit the full scan diagnostic block for a built [`Disc`]. Terse, one line
|
||||
@@ -450,7 +493,7 @@ mod tests {
|
||||
assert!(row.contains("first=100"), "{row}");
|
||||
assert!(row.contains("last=199"), "{row}");
|
||||
assert!(row.contains("dur=12.5s"), "{row}");
|
||||
assert!(row.contains("keep"), "{row}");
|
||||
assert!(row.contains("keep(plain-feature)"), "{row}");
|
||||
assert!(!row.contains("DROP"), "{row}");
|
||||
|
||||
// 0x80 = middle-of-angle-block (cell_type=2), shown dropped.
|
||||
@@ -463,6 +506,6 @@ mod tests {
|
||||
let row = dvd_cell_row(0, &sec, true);
|
||||
assert!(row.contains("cat=0x80"), "{row}");
|
||||
assert!(row.contains("type=2"), "{row}");
|
||||
assert!(row.contains("DROP(non-feature)"), "{row}");
|
||||
assert!(row.contains("DROP(leading-secondary-block-piece)"), "{row}");
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,371 @@
|
||||
//! Physical AC-3 sub-stream probing for DVD audio routing.
|
||||
//!
|
||||
//! ## Why this exists (Silence-of-the-Lambs wrong-substream bug)
|
||||
//!
|
||||
//! A DVD VTS IFO declares its audio streams in a fixed table, and freemkv's
|
||||
//! scan assigns each declared stream a `private_stream_1` sub-stream id purely
|
||||
//! by per-codec ordinal — the first AC-3 stream becomes `0x80`, the second
|
||||
//! `0x81`, and so on (`ifo::assign_audio_sub_stream_ids`). That assumes the
|
||||
//! physical sub-stream order on the wire matches the IFO declaration order.
|
||||
//!
|
||||
//! On some discs it does NOT. The R2 PAL "The Silence of the Lambs" feature
|
||||
//! declares ONE AC-3 audio stream the IFO nibble marks as 5.1 (6 channels), but
|
||||
//! the physical VOB carries the 5.1 main mix and a 2.0 down-mix on DIFFERENT
|
||||
//! `0x8x` sub-stream ids, and the 2.0 is the one that happens to land at the
|
||||
//! ordinal `0x80` slot. Routing the declared 5.1 stream to `0x80` by ordinal
|
||||
//! therefore muxes the 2.0 down-mix while labelling it 5.1 — the wrong physical
|
||||
//! track.
|
||||
//!
|
||||
//! The robust fix is data-driven and codec/disc agnostic: read each physical
|
||||
//! AC-3 sub-stream's REAL channel count from the VOB (the `acmod`/`lfeon` of its
|
||||
//! first frame after the `0x0B77` sync) and route each IFO-declared AC-3 stream
|
||||
//! to the physical sub-stream whose actual channel count matches the IFO's
|
||||
//! declared count — instead of trusting the ordinal. This never re-reads the
|
||||
//! disc beyond a bounded head-of-feature probe and degrades to the original
|
||||
//! ordinal mapping when the probe yields nothing (unreadable/short VOB).
|
||||
|
||||
use crate::disc::Stream;
|
||||
use crate::mux::codec::ac3;
|
||||
use crate::mux::ps::PsDemuxer;
|
||||
use crate::sector::SectorSource;
|
||||
use std::collections::BTreeMap;
|
||||
|
||||
/// How many 2048-byte sectors of the first feature extent to probe. The first
|
||||
/// GOP of a DVD VOB interleaves every audio sub-stream within the first ~1 MiB,
|
||||
/// so 512 sectors (1 MiB) reliably contains at least one frame of every
|
||||
/// physical `0x8x` AC-3 sub-stream without an expensive read. Bounded so a live
|
||||
/// drive is never hammered (see the project "don't hammer the live drive"
|
||||
/// rule).
|
||||
const PROBE_SECTORS: u16 = 512;
|
||||
|
||||
/// Decode the real per-sub-stream AC-3 channel count from a buffer of decrypted
|
||||
/// MPEG-PS (DVD VOB) bytes.
|
||||
///
|
||||
/// Demuxes `private_stream_1` (0xBD), and for each AC-3 sub-stream id
|
||||
/// (`0x80..=0x87`) records the channel count of its FIRST decodable frame
|
||||
/// (`acmod` + `lfeon` at the `0x0B77` sync). Pure and unit-testable — takes the
|
||||
/// already-read bytes, never touches the disc.
|
||||
///
|
||||
/// Returns a map `sub_id -> channels`. Sub-streams whose first frame is too
|
||||
/// short to carry the BSI bits, or that never appear in the buffer, are absent
|
||||
/// from the map.
|
||||
pub fn probe_ac3_substream_channels(ps_bytes: &[u8]) -> BTreeMap<u8, u8> {
|
||||
let mut found: BTreeMap<u8, u8> = BTreeMap::new();
|
||||
let mut demux = PsDemuxer::new();
|
||||
let mut packets = demux.feed(ps_bytes);
|
||||
packets.extend(demux.flush());
|
||||
for p in packets {
|
||||
// Only private_stream_1 AC-3 sub-streams (0x80..=0x87).
|
||||
let Some(sub) = p.sub_stream_id else { continue };
|
||||
if !(0x80..=0x87).contains(&sub) {
|
||||
continue;
|
||||
}
|
||||
if found.contains_key(&sub) {
|
||||
continue; // first frame of this sub-stream already decoded
|
||||
}
|
||||
// The PS demux strips the 4-byte AC-3 sub-header but does not align to
|
||||
// the frame; locate the 0x0B77 sync, then decode acmod/lfeon.
|
||||
let Some(off) = ac3::find_ac3_sync(&p.data) else {
|
||||
continue;
|
||||
};
|
||||
if let Some(ch) = ac3::acmod_channels(&p.data[off..]) {
|
||||
if ch > 0 {
|
||||
found.insert(sub, ch);
|
||||
}
|
||||
}
|
||||
}
|
||||
found
|
||||
}
|
||||
|
||||
/// Re-route the title's declared AC-3 audio streams onto the physical
|
||||
/// sub-stream ids whose REAL channel counts match, using a probed
|
||||
/// `sub_id -> channels` map.
|
||||
///
|
||||
/// For each declared AC-3 audio stream (in IFO order), it picks the physical
|
||||
/// `0x8x` sub-stream whose probed channel count equals the stream's declared
|
||||
/// channel count, never re-using a sub-stream already claimed by an earlier
|
||||
/// stream. The chosen sub-stream's PID (`0xBD00 | sub_id`) is written back onto
|
||||
/// the `Stream::Audio` so BOTH mux demux paths (`DiscStream` and the file-backed
|
||||
/// highway) route by it.
|
||||
///
|
||||
/// Conservative — it only ever REASSIGNS among the physical sub-streams the
|
||||
/// probe actually saw, and only when a better (exact-channel) match exists than
|
||||
/// the stream's current assignment. A stream whose current sub-stream already
|
||||
/// matches is left alone; a stream with no matching physical sub-stream keeps
|
||||
/// its ordinal assignment. So a normal disc (physical order == IFO order) is a
|
||||
/// no-op.
|
||||
///
|
||||
/// Returns the number of streams whose PID was changed (for diagnostics).
|
||||
pub fn remap_audio_pids(streams: &mut [Stream], probed: &BTreeMap<u8, u8>) -> usize {
|
||||
if probed.is_empty() {
|
||||
return 0;
|
||||
}
|
||||
// Sub-streams already claimed by a remapped (or matching) earlier stream,
|
||||
// so two declared streams never collide on one physical sub-stream.
|
||||
let mut claimed: Vec<u8> = Vec::new();
|
||||
let mut changed = 0usize;
|
||||
|
||||
for s in streams.iter_mut() {
|
||||
let Stream::Audio(a) = s else { continue };
|
||||
if a.codec != crate::disc::Codec::Ac3 {
|
||||
continue;
|
||||
}
|
||||
let declared = a.channels.count();
|
||||
// The sub-id this stream currently routes by (low byte of its PID).
|
||||
let current_sub = (a.pid & 0x00FF) as u8;
|
||||
|
||||
// If the stream's current physical sub-stream already matches its
|
||||
// declared channel count, keep it and claim it.
|
||||
if probed.get(¤t_sub) == Some(&declared) {
|
||||
claimed.push(current_sub);
|
||||
continue;
|
||||
}
|
||||
|
||||
// Otherwise find an unclaimed physical sub-stream whose REAL channel
|
||||
// count equals the declared count.
|
||||
let pick = probed
|
||||
.iter()
|
||||
.find(|(sub, ch)| **ch == declared && !claimed.contains(*sub))
|
||||
.map(|(sub, _)| *sub);
|
||||
|
||||
if let Some(sub) = pick {
|
||||
let new_pid = 0xBD00 | sub as u16;
|
||||
if new_pid != a.pid {
|
||||
tracing::debug!(
|
||||
target: "freemkv::scan",
|
||||
old_pid = a.pid,
|
||||
new_pid,
|
||||
declared_channels = declared,
|
||||
"dvd: re-routed AC-3 audio to physical sub-stream matching channel count"
|
||||
);
|
||||
a.pid = new_pid;
|
||||
changed += 1;
|
||||
}
|
||||
claimed.push(sub);
|
||||
} else {
|
||||
// No physical match — leave the ordinal assignment, but claim its
|
||||
// current sub so later streams don't steal a slot it may still use.
|
||||
claimed.push(current_sub);
|
||||
}
|
||||
}
|
||||
changed
|
||||
}
|
||||
|
||||
/// Probe the first feature extent of a DVD title through a (decrypted) sector
|
||||
/// source and re-route its AC-3 audio PIDs to the physically-correct
|
||||
/// sub-streams. A bounded, best-effort scan: any read error or empty probe
|
||||
/// leaves the ordinal assignment untouched.
|
||||
///
|
||||
/// `reader` MUST yield PLAINTEXT VOB bytes (i.e. a `DecryptingSectorSource` on a
|
||||
/// CSS disc) — probing scrambled sectors yields no AC-3 syncs and is a safe
|
||||
/// no-op. Returns the number of audio streams whose PID changed.
|
||||
pub fn probe_and_remap<S: SectorSource + ?Sized>(
|
||||
reader: &mut S,
|
||||
title: &mut crate::disc::DiscTitle,
|
||||
) {
|
||||
// Only DVD (MPEG-PS) titles carry private_stream_1 AC-3 sub-streams.
|
||||
if title.content_format != crate::disc::ContentFormat::MpegPs {
|
||||
return;
|
||||
}
|
||||
// Nothing to disambiguate unless there is at least one AC-3 audio stream.
|
||||
let has_ac3 = title
|
||||
.streams
|
||||
.iter()
|
||||
.any(|s| matches!(s, Stream::Audio(a) if a.codec == crate::disc::Codec::Ac3));
|
||||
if !has_ac3 {
|
||||
return;
|
||||
}
|
||||
let Some(ext) = title.extents.first() else {
|
||||
return;
|
||||
};
|
||||
let count: u16 = ext.sector_count.min(PROBE_SECTORS as u32) as u16;
|
||||
if count == 0 {
|
||||
return;
|
||||
}
|
||||
let mut buf = vec![0u8; count as usize * 2048];
|
||||
// `recovery=false`: a single best-effort attempt — the probe must never
|
||||
// stall the mux or hammer a marginal drive. On any error, bail to ordinal.
|
||||
let n = match reader.read_sectors(ext.start_lba, count, &mut buf, false) {
|
||||
Ok(n) => n,
|
||||
Err(_) => return,
|
||||
};
|
||||
buf.truncate(n);
|
||||
let probed = probe_ac3_substream_channels(&buf);
|
||||
crate::diag::dump_dvd_substream_probe(title.playlist_id, &probed);
|
||||
remap_audio_pids(&mut title.streams, &probed);
|
||||
}
|
||||
|
||||
#[cfg(test)]
|
||||
mod tests {
|
||||
use super::*;
|
||||
use crate::disc::{AudioChannels, AudioStream, Codec, LabelPurpose, SampleRate};
|
||||
|
||||
/// Build a minimal MPEG-PS pack carrying one `private_stream_1` PES with the
|
||||
/// given AC-3 sub-stream id and a single AC-3 frame whose `acmod`/`lfeon`
|
||||
/// encode `channels`. Mirrors the on-disc layout the PS demux expects:
|
||||
/// pack header (0x000001BA) optional, then PES start `0x000001BD`, length,
|
||||
/// PES header (no PTS), sub-header `[sub_id, frame_count, ptr_hi, ptr_lo]`,
|
||||
/// then the AC-3 frame `[0x0B,0x77, crc16(2), byte4, bsid<<3, acmod-byte]`.
|
||||
fn ps_ac3(sub_id: u8, acmod: u8, lfeon: bool) -> Vec<u8> {
|
||||
// AC-3 BSI byte 6 onward: acmod(3) | optional cmixlev/surmixlev/dsurmod
|
||||
// (2 each) | lfeon(1). Assemble the bits with a writer so the test never
|
||||
// hand-miscomputes the lfeon offset, matching `acmod_channels`' reader.
|
||||
let mut bits: Vec<u8> = Vec::new();
|
||||
let push = |val: u32, n: usize, bits: &mut Vec<u8>| {
|
||||
for i in (0..n).rev() {
|
||||
bits.push(((val >> i) & 1) as u8);
|
||||
}
|
||||
};
|
||||
push(acmod as u32, 3, &mut bits);
|
||||
if (acmod & 0x1) != 0 && acmod != 0x1 {
|
||||
push(0, 2, &mut bits); // cmixlev
|
||||
}
|
||||
if (acmod & 0x4) != 0 {
|
||||
push(0, 2, &mut bits); // surmixlev
|
||||
}
|
||||
if acmod == 0x2 {
|
||||
push(0, 2, &mut bits); // dsurmod
|
||||
}
|
||||
push(lfeon as u32, 1, &mut bits);
|
||||
// Pack the bit vector MSB-first into bytes (byte6 onward).
|
||||
let mut tail = Vec::new();
|
||||
let mut cur = 0u8;
|
||||
for (i, b) in bits.iter().enumerate() {
|
||||
cur = (cur << 1) | b;
|
||||
if i % 8 == 7 {
|
||||
tail.push(cur);
|
||||
cur = 0;
|
||||
}
|
||||
}
|
||||
let rem = bits.len() % 8;
|
||||
if rem != 0 {
|
||||
cur <<= 8 - rem;
|
||||
tail.push(cur);
|
||||
}
|
||||
// AC-3 frame: 0x0B 0x77 crc(2) byte4 bsid<<3 then BSI bits.
|
||||
let mut frame = vec![0x0B, 0x77, 0x00, 0x00, 0x00, 8u8 << 3];
|
||||
frame.extend_from_slice(&tail);
|
||||
// Pad to >= 8 bytes so acmod_channels' length guard passes.
|
||||
while frame.len() < 16 {
|
||||
frame.push(0);
|
||||
}
|
||||
|
||||
// PES sub-header for AC-3: sub_id + frame_count + 2-byte access ptr.
|
||||
let mut payload = vec![sub_id, 0x01, 0x00, 0x00];
|
||||
payload.extend_from_slice(&frame);
|
||||
|
||||
// PES packet: start code 00 00 01 BD, length(2), flags(2), hdr_len(0).
|
||||
let pes_payload_len = 3 + payload.len(); // flags(2)+hdrlen(1)+payload
|
||||
let mut pkt = vec![0x00, 0x00, 0x01, 0xBD];
|
||||
pkt.extend_from_slice(&(pes_payload_len as u16).to_be_bytes());
|
||||
pkt.extend_from_slice(&[0x80, 0x00, 0x00]); // no PTS, header_data_len=0
|
||||
pkt.extend_from_slice(&payload);
|
||||
pkt
|
||||
}
|
||||
|
||||
fn ac3_stream(pid: u16, channels: AudioChannels) -> Stream {
|
||||
Stream::Audio(AudioStream {
|
||||
pid,
|
||||
codec: Codec::Ac3,
|
||||
channels,
|
||||
language: "en".into(),
|
||||
sample_rate: SampleRate::S48,
|
||||
secondary: false,
|
||||
purpose: LabelPurpose::Normal,
|
||||
label: String::new(),
|
||||
})
|
||||
}
|
||||
|
||||
/// The probe decodes the real channel count of each physical sub-stream.
|
||||
/// 0x80 carries a 2.0 frame (acmod=2,no lfe → 2ch); 0x81 carries 5.1
|
||||
/// (acmod=7 + lfe → 6ch).
|
||||
#[test]
|
||||
fn probe_decodes_per_substream_channels() {
|
||||
let mut bytes = ps_ac3(0x80, 2, false);
|
||||
bytes.extend(ps_ac3(0x81, 7, true));
|
||||
let probed = probe_ac3_substream_channels(&bytes);
|
||||
assert_eq!(probed.get(&0x80), Some(&2), "0x80 is the 2.0 down-mix");
|
||||
assert_eq!(probed.get(&0x81), Some(&6), "0x81 is the 5.1 main mix");
|
||||
}
|
||||
|
||||
/// SILENCE-OF-THE-LAMBS regression: the IFO declares ONE 5.1 AC-3 stream and
|
||||
/// the ordinal mapping put it at 0x80, but physically 0x80 is the 2.0
|
||||
/// down-mix and the 5.1 lives at 0x81. After probe+remap the declared 5.1
|
||||
/// stream must route to 0x81 (PID 0xBD81), NOT the ordinal 0x80.
|
||||
#[test]
|
||||
fn remap_routes_declared_51_to_physical_51_substream() {
|
||||
// Physical layout: 0x80 = 2.0, 0x81 = 5.1 (reversed vs ordinal).
|
||||
let mut probed = BTreeMap::new();
|
||||
probed.insert(0x80u8, 2u8);
|
||||
probed.insert(0x81u8, 6u8);
|
||||
|
||||
// Declared: one 5.1 stream, ordinally assigned 0x80 (PID 0xBD80).
|
||||
let mut streams = vec![ac3_stream(0xBD80, AudioChannels::Surround51)];
|
||||
let changed = remap_audio_pids(&mut streams, &probed);
|
||||
assert_eq!(changed, 1, "the one 5.1 stream must be re-routed");
|
||||
let Stream::Audio(a) = &streams[0] else {
|
||||
panic!("audio")
|
||||
};
|
||||
assert_eq!(
|
||||
a.pid, 0xBD81,
|
||||
"declared 5.1 must route to physical 0x81 (the real 5.1), not ordinal 0x80"
|
||||
);
|
||||
}
|
||||
|
||||
/// Conservative no-op: when the physical order already matches the IFO
|
||||
/// order (0x80 = 5.1 as declared), remap changes nothing.
|
||||
#[test]
|
||||
fn remap_noop_when_physical_matches_ordinal() {
|
||||
let mut probed = BTreeMap::new();
|
||||
probed.insert(0x80u8, 6u8); // 0x80 really is the 5.1
|
||||
let mut streams = vec![ac3_stream(0xBD80, AudioChannels::Surround51)];
|
||||
let changed = remap_audio_pids(&mut streams, &probed);
|
||||
assert_eq!(changed, 0, "matching physical order is a no-op");
|
||||
let Stream::Audio(a) = &streams[0] else {
|
||||
panic!()
|
||||
};
|
||||
assert_eq!(a.pid, 0xBD80);
|
||||
}
|
||||
|
||||
/// Two declared streams (5.1 + 2.0) where the physical order is reversed:
|
||||
/// 0x80=2.0, 0x81=5.1. The 5.1 declaration must claim 0x81 and the 2.0
|
||||
/// declaration must claim 0x80 — no collision, both correct.
|
||||
#[test]
|
||||
fn remap_two_streams_no_collision() {
|
||||
let mut probed = BTreeMap::new();
|
||||
probed.insert(0x80u8, 2u8);
|
||||
probed.insert(0x81u8, 6u8);
|
||||
// Declared order: 5.1 first (ordinal 0x80), 2.0 second (ordinal 0x81).
|
||||
let mut streams = vec![
|
||||
ac3_stream(0xBD80, AudioChannels::Surround51),
|
||||
ac3_stream(0xBD81, AudioChannels::Stereo),
|
||||
];
|
||||
remap_audio_pids(&mut streams, &probed);
|
||||
let pids: Vec<u16> = streams
|
||||
.iter()
|
||||
.filter_map(|s| match s {
|
||||
Stream::Audio(a) => Some(a.pid),
|
||||
_ => None,
|
||||
})
|
||||
.collect();
|
||||
assert_eq!(
|
||||
pids,
|
||||
vec![0xBD81, 0xBD80],
|
||||
"5.1→0x81, 2.0→0x80, no collision"
|
||||
);
|
||||
}
|
||||
|
||||
/// Empty probe (unreadable / scrambled VOB) is a no-op — the ordinal
|
||||
/// assignment survives so behaviour never regresses below today's.
|
||||
#[test]
|
||||
fn remap_empty_probe_is_noop() {
|
||||
let probed = BTreeMap::new();
|
||||
let mut streams = vec![ac3_stream(0xBD80, AudioChannels::Surround51)];
|
||||
let changed = remap_audio_pids(&mut streams, &probed);
|
||||
assert_eq!(changed, 0);
|
||||
let Stream::Audio(a) = &streams[0] else {
|
||||
panic!()
|
||||
};
|
||||
assert_eq!(a.pid, 0xBD80, "no probe data → keep ordinal");
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,7 @@
|
||||
|
||||
mod bluray;
|
||||
mod dvd;
|
||||
pub mod dvd_audio_probe;
|
||||
mod encrypt;
|
||||
pub mod mapfile;
|
||||
mod patch;
|
||||
|
||||
@@ -337,7 +337,7 @@ pub(crate) fn acmod_channels(data: &[u8]) -> Option<u8> {
|
||||
}
|
||||
|
||||
/// Find AC3/E-AC-3 syncword (0x0B77) in data.
|
||||
fn find_ac3_sync(data: &[u8]) -> Option<usize> {
|
||||
pub(crate) fn find_ac3_sync(data: &[u8]) -> Option<usize> {
|
||||
(0..data.len().saturating_sub(1)).find(|&i| data[i] == 0x0B && data[i + 1] == 0x77)
|
||||
}
|
||||
|
||||
|
||||
+16
-4
@@ -210,6 +210,7 @@ impl DiscStream {
|
||||
batch_sectors: u16,
|
||||
content_format: crate::disc::ContentFormat,
|
||||
) -> Self {
|
||||
let mut title = title;
|
||||
let extents = title.extents.clone();
|
||||
let bytes_total_extents: u64 = extents.iter().map(|e| e.sector_count as u64 * 2048).sum();
|
||||
|
||||
@@ -224,6 +225,16 @@ impl DiscStream {
|
||||
std::any::type_name_of_val(&*reader)
|
||||
);
|
||||
|
||||
// CSS/unencrypted content needs a decrypting wrapper to yield plaintext
|
||||
// VOB bytes before the AC-3 sub-stream probe can read real `acmod`s.
|
||||
let mut reader = DecryptingSectorSource::new(reader, decrypt_keys.clone());
|
||||
|
||||
// Wrong-substream fix (Silence-of-the-Lambs): re-route the title's
|
||||
// declared AC-3 audio onto the physically-correct `0x8x` sub-streams by
|
||||
// probing their real channel counts off the head of the feature. No-op
|
||||
// for non-DVD or when the probe yields nothing.
|
||||
crate::disc::dvd_audio_probe::probe_and_remap(&mut reader, &mut title);
|
||||
|
||||
let mut pids = Vec::new();
|
||||
let mut parsers = Vec::new();
|
||||
let mut pid_to_track = Vec::new();
|
||||
@@ -262,10 +273,11 @@ impl DiscStream {
|
||||
_ => 1,
|
||||
};
|
||||
|
||||
// Wrap the input reader in DecryptingSectorSource so the internal
|
||||
// fill_extents path sees plaintext bytes. For DecryptKeys::None
|
||||
// (unencrypted / raw / test fixtures) the decorator is a pass-through.
|
||||
let reader = DecryptingSectorSource::new(reader, decrypt_keys.clone());
|
||||
// `reader` is already wrapped in DecryptingSectorSource above (so the
|
||||
// internal fill_extents path sees plaintext bytes; for DecryptKeys::None
|
||||
// the decorator is a pass-through). Reset the unit base the probe read
|
||||
// advanced so the first fill_extents read starts cleanly.
|
||||
reader.set_unit_base(0);
|
||||
// Clone the shared loss counter once here so `lost_bytes()` never
|
||||
// clones an Arc per frame on the mux hot path.
|
||||
let decrypt_loss = reader.decrypt_loss();
|
||||
|
||||
+11
-1
@@ -558,7 +558,7 @@ pub fn build_iso_pipeline<S: SectorSource + Send + 'static>(
|
||||
crate::decrypt::DecryptKeys::Aacs { .. } => 3,
|
||||
_ => 1,
|
||||
};
|
||||
let decrypting =
|
||||
let mut decrypting =
|
||||
crate::sector::DecryptingSectorSource::new(Box::new(reader) as Box<dyn SectorSource>, keys);
|
||||
// Grab the decrypt-loss counter before the decorator is moved into the
|
||||
// producer thread. It tracks bytes of scrambled AACS units no key could
|
||||
@@ -566,6 +566,16 @@ pub fn build_iso_pipeline<S: SectorSource + Send + 'static>(
|
||||
// through `lost_bytes()` so the mux abort gate sees a partial decrypt
|
||||
// failure rather than a clean rip.
|
||||
let decrypt_loss = decrypting.decrypt_loss();
|
||||
|
||||
// Wrong-substream fix (Silence-of-the-Lambs): before the prefetcher takes
|
||||
// the reader, probe the feature head through the (plaintext) decrypting
|
||||
// source and re-route the title's declared AC-3 audio onto the physically
|
||||
// correct `0x8x` sub-streams. No-op for non-DVD or an empty probe. Reset the
|
||||
// unit base afterward so the prefetcher's first batch starts clean.
|
||||
let mut title = title;
|
||||
crate::disc::dvd_audio_probe::probe_and_remap(&mut decrypting, &mut title);
|
||||
decrypting.set_unit_base(0);
|
||||
|
||||
let prefetched = crate::sector::PrefetchedSectorSource::new_with_events(
|
||||
decrypting,
|
||||
extents,
|
||||
|
||||
Reference in New Issue
Block a user