Matthew Jackson
9f25a4c454
Resolution::pixels() returned (0, 0) for Unknown, and the MP4 sink wrote it verbatim into tkhd (ISO/IEC 14496-12 8.3.2) and VisualSampleEntry (12.1.3). Both fields are MANDATORY there, so unlike Matroska — which omits the optional PixelWidth/PixelHeight elements — MP4 has nothing to leave out. The result was a structurally complete file that passes every container check, declares a 0x0 video track, cannot be rendered, and is written with no error anywhere. WHY IT WAS POSSIBLE, which is the part worth keeping: pixels() previously fabricated 1920x1080 for Unknown. That was wrong but playable, so this sink never needed a guard and the absence of one was invisible. Changing the sentinel to (0, 0) moved the defect instead of removing it — a zero PAIR still reads as a usable value, so the sink stored it and serialised it. The accessor's doc comment then ENUMERATED the callers it believed were safe: "the Matroska sink omits the optional elements, the VobSub writer omits its size: line, and no caller divides by either dimension." Two of those three are true. MP4 was not on the list because MP4 has no guard at all, and a prose list cannot enforce itself. mkv.rs's own comment even states the principle — "the check belongs in the one accessor rather than in each caller that remembered to write it" — and labels/mod.rs still carried its own duplicate Unknown test long after the accessor took that job over. So: pixels() now returns Option. Not because Option is tidier, but because every caller genuinely needs a DIFFERENT answer and the compiler is the only thing that reliably makes them choose one. Matroska and the metadata sinks take unwrap_or((0, 0)) with the reason stated at each site; the VobSub path degrades to a palette-only .idx; MP4 fails with E_MP4_UNKNOWN_RESOLUTION (9055). Six call sites, not the five my first grep showed — I piped it through `head` and acted on a truncated list. The compiler caught the sixth. That is the same mistake as trusting a lens that reported silence.
1374 lines
56 KiB
Rust
1374 lines
56 KiB
Rust
//! DVD title scanning — IFO parsing, stream mapping, VOB extent building.
|
||
|
||
use super::*;
|
||
use crate::ifo;
|
||
use crate::sector::SectorSource;
|
||
use crate::udf;
|
||
|
||
impl Disc {
|
||
/// Scan DVD titles from IFO files (VIDEO_TS.IFO + VTS_XX_0.IFO).
|
||
pub(super) fn scan_dvd_titles(
|
||
reader: &mut dyn SectorSource,
|
||
udf_fs: &udf::UdfFs,
|
||
) -> Vec<DiscTitle> {
|
||
let dvd_info = match ifo::parse_vmg(reader, udf_fs) {
|
||
Ok(info) => info,
|
||
Err(_) => return Vec::new(),
|
||
};
|
||
|
||
let mut titles = Vec::new();
|
||
let mut title_number: u16 = 0;
|
||
|
||
for ts in &dvd_info.title_sets {
|
||
// Diagnostic dump (--log-level 3): IFO video/audio attrs for this
|
||
// title set. No-op unless the freemkv::diag target is enabled.
|
||
crate::diag::dump_dvd_attrs(ts);
|
||
|
||
let video_stream = Stream::Video(VideoStream {
|
||
pid: 0xE0, // DVD video PID (standard MPEG PS video stream)
|
||
codec: ts.video.codec,
|
||
resolution: ts.video.resolution,
|
||
frame_rate: match ts.video.standard {
|
||
crate::ifo::TvSystem::Pal => FrameRate::F25,
|
||
crate::ifo::TvSystem::Ntsc => FrameRate::F29_97,
|
||
},
|
||
hdr: HdrFormat::Sdr,
|
||
// DVD is SD, not HD: PAL is BT.470BG, NTSC is SMPTE-170M.
|
||
// Stamping BT.709 (HD) mis-tags the colour primaries/transfer.
|
||
color_space: match ts.video.standard {
|
||
crate::ifo::TvSystem::Pal => ColorSpace::Bt470bg,
|
||
crate::ifo::TvSystem::Ntsc => ColorSpace::Smpte170m,
|
||
},
|
||
// DVD pixels are anamorphic 720x480/576; the real display shape
|
||
// is the IFO aspect flag, not the pixel grid. Carry it so the
|
||
// MKV muxer writes a correct 16:9 / 4:3 DisplayWidth/Height
|
||
// instead of the square-pixel 3:2 / 5:4 it would otherwise emit.
|
||
display_aspect: Some(match ts.video.aspect {
|
||
crate::ifo::DvdAspect::R16x9 => (16, 9),
|
||
crate::ifo::DvdAspect::R4x3 => (4, 3),
|
||
}),
|
||
secondary: false,
|
||
label: String::new(),
|
||
// TODO(spec): populate from the MPEG-2 picture coding extension
|
||
// once the codec parser surfaces it. `Mpeg2Parser` already reads
|
||
// `top_field_first` (mux/codec/mpeg2.rs `picture_nb_fields`) but
|
||
// tracks are built from the IFO scan BEFORE any frame is parsed;
|
||
// wiring it requires a CodecParser accessor surfaced through
|
||
// PipelinedPesStream/DiscStream into the output title (mirroring
|
||
// the existing `codec_private` handshake). Until then `None`
|
||
// means the muxer falls back to TFF (correct for ~all DVDs).
|
||
// TODO(spec): DVD MPEG-2 carries no VUI; the colour signalling is
|
||
// the sequence_display_extension colour_description when present.
|
||
// Surface it from `Mpeg2Parser` (same handshake as above) and set
|
||
// this so a disc that states e.g. BT.601-625 colour overrides the
|
||
// PAL/NTSC guess in `color_space`. `None` uses the enum fallback.
|
||
measured_cicp: None,
|
||
});
|
||
// TODO(spec): DefaultDuration is derived from the declared IFO
|
||
// frame_rate (25 / 29.97). A soft-telecined 23.976-in-29.97 DVD then
|
||
// reports 29.97 fps instead of the true 23.976 film rate. The pulldown
|
||
// cadence is detectable from the parser's per-picture `nb_fields`
|
||
// (repeat_first_field) — when most frames are 3-field-then-2-field
|
||
// 2:3 pulldown the film rate is frame_rate × 4/5. Emitting the film
|
||
// DefaultDuration needs the parser to report the measured cadence
|
||
// through the same parser→title channel as `top_field_first` above;
|
||
// left as a follow-up to avoid a speculative rate change here.
|
||
|
||
// Map DvdAudioAttr to Stream::Audio. The PID is derived from the
|
||
// stream's REAL on-wire private_stream_1 sub-stream id (assigned
|
||
// by per-codec ordinal in the IFO scan) via the same
|
||
// `dvd_audio_pid` table the demuxer's `PsPacket::dvd_pid` uses,
|
||
// so a mixed-codec title (AC-3 + DTS + LPCM) routes correctly
|
||
// instead of colliding on 0xBD00. Streams carried as a regular
|
||
// MPEG-audio PES (MP1/MP2, no sub-id) fall back to a distinct
|
||
// 0xBD00+ordinal PID — disjoint from the 0xBD80+ canonical audio
|
||
// space — though they are not routed via `dvd_pid` today.
|
||
let audio_streams: Vec<Stream> = ts
|
||
.audio_streams
|
||
.iter()
|
||
.enumerate()
|
||
.map(|(i, a)| {
|
||
let codec = a.codec;
|
||
let pid = a
|
||
.sub_stream_id
|
||
.and_then(crate::mux::ps::dvd_audio_pid)
|
||
.unwrap_or(0xBD00 + i as u16);
|
||
Stream::Audio(AudioStream {
|
||
pid,
|
||
codec,
|
||
channels: AudioChannels::from_count(a.channels),
|
||
language: a.language.clone(),
|
||
sample_rate: SampleRate::from_hz(a.sample_rate),
|
||
secondary: false,
|
||
purpose: crate::disc::LabelPurpose::Normal,
|
||
label: String::new(),
|
||
})
|
||
})
|
||
.collect();
|
||
|
||
for (vts_title_idx, dvd_title) in ts.titles.iter().enumerate() {
|
||
title_number += 1;
|
||
|
||
// Diagnostic dump (--log-level 3): per-cell category table +
|
||
// chapter map for this title, BEFORE lowering drops the
|
||
// per-cell IFO detail. No-op unless freemkv::diag is enabled.
|
||
crate::diag::dump_dvd_cells(ts.vts_number, title_number, dvd_title);
|
||
|
||
// Feature start cell. Prefer the DVD nav-VM resolver, which
|
||
// PARKED (#40, menu-at-start playback). The "menu at the start"
|
||
// symptom (e.g. SOTL) was a sector-mapping fault — the absolute
|
||
// VOB rebase in `ifo::parse_vts` (`vob_start_sector =
|
||
// file_start_lba + vtstt_vobs`) — NOT a navigation problem, so
|
||
// feature-start resolution is unnecessary for correct rips. The
|
||
// nav resolver + verified VM decoder (`dvdnav`) are kept compiled
|
||
// but deliberately bypassed; flip `USE_NAV_RESOLVER` to re-enable
|
||
// once the nav executor is finished. The fallback is the
|
||
// structural leading-cell filter (`feature_start_cell`), which
|
||
// drops leading scene-index / interleaved-angle sub-block cells
|
||
// and is a no-op for a normal feature (category 0x00 on cell 0).
|
||
// See `dvdnav::resolve_feature_start`.
|
||
const USE_NAV_RESOLVER: bool = false;
|
||
let feature_start = if USE_NAV_RESOLVER {
|
||
crate::dvdnav::resolve_feature_start(
|
||
reader,
|
||
udf_fs,
|
||
ts.vts_number as u16,
|
||
(vts_title_idx + 1) as u16,
|
||
)
|
||
.unwrap_or_else(|| dvd_title.feature_start_cell())
|
||
} else {
|
||
dvd_title.feature_start_cell()
|
||
}
|
||
.min(dvd_title.cells.len());
|
||
let dropped_secs: f64 = dvd_title.cells[..feature_start]
|
||
.iter()
|
||
.map(|c| c.duration_secs)
|
||
.sum();
|
||
if feature_start > 0 {
|
||
tracing::debug!(
|
||
target: "freemkv::scan",
|
||
vts = ts.vts_number,
|
||
title = title_number,
|
||
dropped_cells = feature_start,
|
||
dropped_secs,
|
||
"dvd: dropped leading non-feature cell(s)"
|
||
);
|
||
}
|
||
|
||
// Build extents from cell sector ranges (absolute = vob_start + cell offset),
|
||
// starting at the resolved feature-start cell.
|
||
let extents: Vec<Extent> = dvd_title.cells[feature_start..]
|
||
.iter()
|
||
.map(|cell| {
|
||
let start = ts.vob_start_sector.saturating_add(cell.first_sector);
|
||
let count = cell
|
||
.last_sector
|
||
.saturating_sub(cell.first_sector)
|
||
.saturating_add(1);
|
||
Extent {
|
||
start_lba: start,
|
||
sector_count: count,
|
||
}
|
||
})
|
||
.collect();
|
||
|
||
let size_bytes: u64 = extents.iter().map(|e| e.sector_count as u64 * 2048).sum();
|
||
|
||
// Build pre-formatted VobSub `.idx` codec_data (size: + palette:
|
||
// lines) for VobSub subtitle streams. The `size:` line carries
|
||
// the coded video frame the subpicture was authored against
|
||
// (720x480 NTSC / 720x576 PAL) so players place and scale the
|
||
// bitmap correctly.
|
||
// format_palette guards on (0, 0) and omits its `size:` line,
|
||
// so an unresolved resolution degrades to a palette-only .idx
|
||
// rather than one claiming a 0x0 frame.
|
||
let (vid_w, vid_h) = ts.video.resolution.pixels().unwrap_or((0, 0));
|
||
let codec_data = dvd_title
|
||
.palette
|
||
.as_ref()
|
||
.map(|pal| crate::mux::codec::dvdsub::format_palette(pal, vid_w, vid_h));
|
||
|
||
// Map DvdSubtitleAttr to Stream::Subtitle
|
||
let subtitle_streams: Vec<Stream> = ts
|
||
.subtitle_streams
|
||
.iter()
|
||
.enumerate()
|
||
.map(|(i, s)| {
|
||
// VobSub sub-stream ids run 0x20..=0x3F; PID = sub-id
|
||
// (identity), shared with the demuxer via
|
||
// `dvd_subtitle_pid`.
|
||
let sub_id = 0x20u8.saturating_add(i.min(0x1F) as u8);
|
||
let pid = crate::mux::ps::dvd_subtitle_pid(sub_id).unwrap_or(sub_id as u16);
|
||
Stream::Subtitle(SubtitleStream {
|
||
pid,
|
||
codec: Codec::DvdSub,
|
||
language: s.language.clone(),
|
||
forced: false,
|
||
qualifier: crate::disc::LabelQualifier::None,
|
||
codec_data: codec_data.clone(),
|
||
})
|
||
})
|
||
.collect();
|
||
|
||
let mut streams = vec![video_stream.clone()];
|
||
streams.extend(audio_streams.iter().cloned());
|
||
streams.extend(subtitle_streams);
|
||
|
||
// Chapter times are absolute from the PGC start. When leading
|
||
// cells are dropped the muxed video shifts earlier by exactly
|
||
// their total duration, so shift the chapter marks too (clamping
|
||
// any that fell inside the dropped head to 0).
|
||
let chapters: Vec<Chapter> = dvd_title
|
||
.chapter_times
|
||
.iter()
|
||
.enumerate()
|
||
.map(|(i, &t)| Chapter {
|
||
time_secs: (t - dropped_secs).max(0.0),
|
||
name: chapter_name(i),
|
||
})
|
||
.collect();
|
||
|
||
titles.push(DiscTitle {
|
||
playlist: format!("VTS_{:02}_{}.VOB", ts.vts_number, title_number),
|
||
playlist_id: title_number,
|
||
duration_secs: dvd_title.duration_secs,
|
||
size_bytes,
|
||
clips: Vec::new(),
|
||
streams,
|
||
chapters,
|
||
extents,
|
||
content_format: ContentFormat::MpegPs,
|
||
codec_privates: Vec::new(),
|
||
});
|
||
}
|
||
}
|
||
|
||
titles
|
||
}
|
||
}
|
||
|
||
#[cfg(test)]
|
||
mod tests {
|
||
use super::*;
|
||
use crate::sector::SectorSource;
|
||
use std::collections::HashMap;
|
||
|
||
// ---------------------------------------------------------------
|
||
// In-memory disc + minimal UDF image (single physical partition,
|
||
// metadata_start == partition_start). Offsets cited against
|
||
// udf.rs::read_filesystem / ECMA-167.
|
||
// ---------------------------------------------------------------
|
||
|
||
const PART_START: u32 = 3000;
|
||
|
||
struct MemDisc {
|
||
sectors: HashMap<u32, [u8; 2048]>,
|
||
}
|
||
impl MemDisc {
|
||
fn new() -> Self {
|
||
Self {
|
||
sectors: HashMap::new(),
|
||
}
|
||
}
|
||
fn put(&mut self, lba: u32, data: [u8; 2048]) {
|
||
self.sectors.insert(lba, data);
|
||
}
|
||
fn put_bytes(&mut self, lba: u32, bytes: &[u8]) {
|
||
for (i, chunk) in bytes.chunks(2048).enumerate() {
|
||
let mut s = [0u8; 2048];
|
||
s[..chunk.len()].copy_from_slice(chunk);
|
||
self.put(lba + i as u32, s);
|
||
}
|
||
}
|
||
}
|
||
impl SectorSource for MemDisc {
|
||
fn read_sectors(
|
||
&mut self,
|
||
lba: u32,
|
||
count: u16,
|
||
buf: &mut [u8],
|
||
_recovery: bool,
|
||
) -> crate::error::Result<usize> {
|
||
let need = count as usize * 2048;
|
||
for i in 0..count as u32 {
|
||
let off = i as usize * 2048;
|
||
let s = self.sectors.get(&(lba + i)).copied().unwrap_or([0u8; 2048]);
|
||
buf[off..off + 2048].copy_from_slice(&s);
|
||
}
|
||
Ok(need)
|
||
}
|
||
}
|
||
|
||
/// Extended File Entry ICB (tag 266) with one Short AD. info_length@56,
|
||
/// l_ea@208, l_ad@212, AD len(4)@216 | lba(4)@220.
|
||
fn build_file_icb(size: u32, data_lba: u32) -> [u8; 2048] {
|
||
let mut s = [0u8; 2048];
|
||
s[0..2].copy_from_slice(&266u16.to_le_bytes());
|
||
s[56..64].copy_from_slice(&(size as u64).to_le_bytes());
|
||
s[208..212].copy_from_slice(&0u32.to_le_bytes());
|
||
s[212..216].copy_from_slice(&8u32.to_le_bytes());
|
||
s[216..220].copy_from_slice(&(size & 0x3FFF_FFFF).to_le_bytes());
|
||
s[220..224].copy_from_slice(&data_lba.to_le_bytes());
|
||
s
|
||
}
|
||
|
||
/// One FID (tag 257). file_chars@18, l_fi@19, ICB LBA@24, l_iu@36,
|
||
/// name@(38). Name compression-id 8 (ASCII).
|
||
fn push_fid(buf: &mut Vec<u8>, name: &str, icb_lba: u32, is_dir: bool, is_parent: bool) {
|
||
let start = buf.len();
|
||
let name_field: Vec<u8> = if is_parent {
|
||
Vec::new()
|
||
} else {
|
||
let mut v = vec![0x08u8];
|
||
v.extend_from_slice(name.as_bytes());
|
||
v
|
||
};
|
||
let mut fid = vec![0u8; 38];
|
||
fid[0..2].copy_from_slice(&257u16.to_le_bytes());
|
||
let mut fc = 0u8;
|
||
if is_dir {
|
||
fc |= 0x02;
|
||
}
|
||
if is_parent {
|
||
fc |= 0x08;
|
||
}
|
||
fid[18] = fc;
|
||
fid[19] = name_field.len() as u8;
|
||
fid[24..28].copy_from_slice(&icb_lba.to_le_bytes());
|
||
fid[36..38].copy_from_slice(&0u16.to_le_bytes());
|
||
buf.extend_from_slice(&fid);
|
||
buf.extend_from_slice(&name_field);
|
||
let used = buf.len() - start;
|
||
buf.resize(start + ((used + 3) & !3), 0);
|
||
}
|
||
|
||
struct FileSpec {
|
||
name: String,
|
||
icb_lba: u32,
|
||
data_lba: u32,
|
||
contents: Vec<u8>,
|
||
}
|
||
|
||
fn build_udf_skeleton(disc: &mut MemDisc, root_icb_lba: u32) {
|
||
let mut avdp = [0u8; 2048];
|
||
avdp[0..2].copy_from_slice(&2u16.to_le_bytes());
|
||
disc.put(256, avdp);
|
||
let mut pd = [0u8; 2048];
|
||
pd[0..2].copy_from_slice(&5u16.to_le_bytes());
|
||
pd[188..192].copy_from_slice(&PART_START.to_le_bytes());
|
||
disc.put(32, pd);
|
||
let mut lvd = [0u8; 2048];
|
||
lvd[0..2].copy_from_slice(&6u16.to_le_bytes());
|
||
lvd[268..272].copy_from_slice(&1u32.to_le_bytes());
|
||
disc.put(33, lvd);
|
||
let mut td = [0u8; 2048];
|
||
td[0..2].copy_from_slice(&8u16.to_le_bytes());
|
||
disc.put(34, td);
|
||
let mut fsd = [0u8; 2048];
|
||
fsd[0..2].copy_from_slice(&256u16.to_le_bytes());
|
||
fsd[404..408].copy_from_slice(&root_icb_lba.to_le_bytes());
|
||
disc.put(PART_START, fsd);
|
||
}
|
||
|
||
/// Build a UDF tree with a single VIDEO_TS directory holding the given
|
||
/// files, and return the navigable UdfFs over `disc`.
|
||
fn build_video_ts_fs(disc: &mut MemDisc, files: &[FileSpec]) -> crate::udf::UdfFs {
|
||
let mut fids = Vec::new();
|
||
push_fid(&mut fids, "", 50, true, true);
|
||
for f in files {
|
||
push_fid(&mut fids, &f.name, f.icb_lba, false, false);
|
||
disc.put(
|
||
PART_START + f.icb_lba,
|
||
build_file_icb(f.contents.len() as u32, f.data_lba),
|
||
);
|
||
disc.put_bytes(PART_START + f.data_lba, &f.contents);
|
||
}
|
||
// VIDEO_TS dir ICB + data.
|
||
disc.put(PART_START + 50, build_file_icb(fids.len() as u32, 51));
|
||
disc.put_bytes(PART_START + 51, &fids);
|
||
// Root dir referencing VIDEO_TS.
|
||
let mut root_fids = Vec::new();
|
||
push_fid(&mut root_fids, "", 10, true, true);
|
||
push_fid(&mut root_fids, "VIDEO_TS", 50, true, false);
|
||
disc.put(PART_START + 10, build_file_icb(root_fids.len() as u32, 11));
|
||
disc.put_bytes(PART_START + 11, &root_fids);
|
||
build_udf_skeleton(disc, 10);
|
||
crate::udf::read_filesystem(disc).expect("fs")
|
||
}
|
||
|
||
// ---------------------------------------------------------------
|
||
// IFO builders (DVD-Video spec). Offsets cited against ifo.rs.
|
||
// ---------------------------------------------------------------
|
||
|
||
/// VMG (VIDEO_TS.IFO): magic "DVDVIDEO-VMG"@0, TT_SRPT sector ptr@0xC4.
|
||
/// TT_SRPT lives at tt_srpt_sector*2048: num_titles(u16)@0, then 12-byte
|
||
/// entries from +8. Each entry: num_chapters(u16)@+2, vts_number@+6,
|
||
/// vts_title_num@+7.
|
||
fn build_vmg(
|
||
titles: &[(
|
||
u16, /*chapters*/
|
||
u8, /*vts*/
|
||
u8, /*vts_title*/
|
||
)],
|
||
) -> Vec<u8> {
|
||
// Put TT_SRPT at sector 1 (offset 2048).
|
||
let tt_srpt_sector = 1u32;
|
||
let mut d = vec![0u8; 2 * 2048];
|
||
d[0..12].copy_from_slice(b"DVDVIDEO-VMG");
|
||
d[0xC4..0xC8].copy_from_slice(&tt_srpt_sector.to_be_bytes());
|
||
let base = tt_srpt_sector as usize * 2048;
|
||
d[base..base + 2].copy_from_slice(&(titles.len() as u16).to_be_bytes());
|
||
for (i, (chapters, vts, vts_title)) in titles.iter().enumerate() {
|
||
let e = base + 8 + i * 12;
|
||
d[e + 2..e + 4].copy_from_slice(&chapters.to_be_bytes());
|
||
d[e + 6] = *vts;
|
||
d[e + 7] = *vts_title;
|
||
}
|
||
d
|
||
}
|
||
|
||
/// Cell playback info entry (24 bytes): category byte@0, BCD time@4..8,
|
||
/// first_sector(u32 BE)@8, last_sector(u32 BE)@20.
|
||
fn write_cell(buf: &mut [u8], off: usize, first_sector: u32, last_sector: u32) {
|
||
buf[off + 8..off + 12].copy_from_slice(&first_sector.to_be_bytes());
|
||
buf[off + 20..off + 24].copy_from_slice(&last_sector.to_be_bytes());
|
||
}
|
||
|
||
/// Like [`write_cell`] but also stamps the cell-category byte (`+0`) so a
|
||
/// test can build a leading scene-index / interleaved-angle sub-block cell.
|
||
fn write_cell_cat(buf: &mut [u8], off: usize, first: u32, last: u32, category: u8) {
|
||
write_cell(buf, off, first, last);
|
||
buf[off] = category;
|
||
}
|
||
|
||
/// Build a VTS_XX_0.IFO. Layout per ifo.rs:
|
||
/// magic "DVDVIDEO-VTS"@0
|
||
/// vtstt_vobs (Title VOBS start sector, u32 BE)@0xC4 — the production
|
||
/// `vob_start_sector` the cell sectors are relative to. (0xC0 is
|
||
/// `vtsm_vobs`, the menu VOBS, which the scan must NOT use.)
|
||
/// VTS_PGCIT sector ptr(u32 BE)@0xCC
|
||
/// video attr byte@0x200
|
||
/// num_audio(u16 BE)@0x202, audio blocks (8B) @0x204
|
||
/// num_subs(u16 BE)@0x254, subtitle blocks (6B) @0x256
|
||
/// PGCIT (at pgcit_sector*2048): num_pgcs(u16)@0, PGC info entries (8B)
|
||
/// from +8 with PGC byte offset(u32 BE)@+4.
|
||
/// PGC: nr_programs@0x02, nr_cells@0x03, BCD time@0x04, pgm_map ptr@0xE6,
|
||
/// cell_playback ptr@0xE8 (both u16 BE rel to PGC start).
|
||
#[allow(clippy::too_many_arguments)]
|
||
fn build_vts(
|
||
vob_start: u32,
|
||
video_b0: u8,
|
||
audio: &[(
|
||
u8, /*b0 coding/sr*/
|
||
u8, /*b1 channels*/
|
||
[u8; 2], /*lang*/
|
||
)],
|
||
subs: &[[u8; 2]],
|
||
cells: &[(u32, u32)],
|
||
palette_nonzero: bool,
|
||
) -> Vec<u8> {
|
||
// Total file: header sector(s) + PGCIT at sector 2.
|
||
let pgcit_sector = 2u32;
|
||
let mut d = vec![0u8; 4 * 2048];
|
||
d[0..12].copy_from_slice(b"DVDVIDEO-VTS");
|
||
d[0xC4..0xC8].copy_from_slice(&vob_start.to_be_bytes()); // vtstt_vobs (Title VOBS)
|
||
d[0xCC..0xD0].copy_from_slice(&pgcit_sector.to_be_bytes());
|
||
d[0x200] = video_b0;
|
||
d[0x202..0x204].copy_from_slice(&(audio.len() as u16).to_be_bytes());
|
||
for (i, (b0, b1, lang)) in audio.iter().enumerate() {
|
||
let a = 0x204 + i * 8;
|
||
d[a] = *b0;
|
||
d[a + 1] = *b1;
|
||
d[a + 2] = lang[0];
|
||
d[a + 3] = lang[1];
|
||
}
|
||
d[0x254..0x256].copy_from_slice(&(subs.len() as u16).to_be_bytes());
|
||
for (i, lang) in subs.iter().enumerate() {
|
||
let s = 0x256 + i * 6;
|
||
d[s + 2] = lang[0];
|
||
d[s + 3] = lang[1];
|
||
}
|
||
|
||
// PGCIT: one PGC.
|
||
let pg = pgcit_sector as usize * 2048;
|
||
d[pg..pg + 2].copy_from_slice(&1u16.to_be_bytes()); // num_pgcs = 1
|
||
// PGC info entry 0 at pg+8; PGC byte offset (rel to PGCIT) at +4.
|
||
let pgc_rel: u32 = 0x100; // PGC body 256 bytes into the PGCIT
|
||
d[pg + 8 + 4..pg + 8 + 8].copy_from_slice(&pgc_rel.to_be_bytes());
|
||
let pgc = pg + pgc_rel as usize;
|
||
// Ensure room for PGC (needs >= 0xEA past pgc, plus cell table).
|
||
d[pgc + 0x02] = 1; // nr_of_programs
|
||
d[pgc + 0x03] = cells.len() as u8; // nr_of_cells
|
||
// BCD playback time 00:00:30:00 → 30 s, frame-rate bits 0b01 (25fps)
|
||
// not needed; keep simple 30s. BCD: hh,mm,ss,frame|rate.
|
||
d[pgc + 0x04] = 0x00;
|
||
d[pgc + 0x05] = 0x00;
|
||
d[pgc + 0x06] = 0x30; // 30 seconds BCD
|
||
d[pgc + 0x07] = 0b0100_0000; // rate bits = 01 (25fps); 0 frames
|
||
// pgm map ptr @0xE6, cell playback ptr @0xE8 (rel to PGC start).
|
||
let cell_tbl_rel: u16 = 0xF0;
|
||
let pgm_map_rel: u16 = 0xEC;
|
||
d[pgc + 0xE6..pgc + 0xE8].copy_from_slice(&pgm_map_rel.to_be_bytes());
|
||
d[pgc + 0xE8..pgc + 0xEA].copy_from_slice(&cell_tbl_rel.to_be_bytes());
|
||
// Program map: program 0 → first cell 1.
|
||
d[pgc + pgm_map_rel as usize] = 1;
|
||
// Cell playback table.
|
||
let cell_base = pgc + cell_tbl_rel as usize;
|
||
for (i, (first, last)) in cells.iter().enumerate() {
|
||
write_cell(&mut d, cell_base + i * 24, *first, *last);
|
||
}
|
||
// Palette at PGC+0xA4: 16 × [pad,Y,Cb,Cr]. Non-zero if requested.
|
||
if palette_nonzero {
|
||
d[pgc + 0xA4 + 1] = 0x40; // Y of color 0
|
||
}
|
||
d
|
||
}
|
||
|
||
// ---------------------------------------------------------------
|
||
// Tests
|
||
// ---------------------------------------------------------------
|
||
|
||
/// scan_dvd_titles returns empty when VIDEO_TS.IFO can't be parsed
|
||
/// (dvd.rs: `parse_vmg(...) Err → return Vec::new()`). Never panics.
|
||
#[test]
|
||
fn scan_dvd_titles_no_ifo_is_empty() {
|
||
let mut disc = MemDisc::new();
|
||
// VIDEO_TS exists but VIDEO_TS.IFO is missing.
|
||
let udf = build_video_ts_fs(&mut disc, &[]);
|
||
assert!(Disc::scan_dvd_titles(&mut disc, &udf).is_empty());
|
||
}
|
||
|
||
/// Single VTS, single title, one cell. Extent absolute LBA =
|
||
/// vob_start + cell.first_sector (dvd.rs); sector_count = last - first
|
||
/// + 1 (inclusive range); size_bytes = sectors * 2048 (DVD sector).
|
||
#[test]
|
||
fn scan_dvd_titles_single_cell_extent_math() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]); // 1 chapter, VTS 1, title 1
|
||
// vob_start 1000; one cell sectors [10..=109] → 100 sectors.
|
||
let vts = build_vts(
|
||
1000,
|
||
0x00, // NTSC, 4:3
|
||
&[],
|
||
&[],
|
||
&[(10, 109)],
|
||
false,
|
||
);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let titles = Disc::scan_dvd_titles(&mut disc, &udf);
|
||
assert_eq!(titles.len(), 1);
|
||
let t = &titles[0];
|
||
assert_eq!(t.extents.len(), 1);
|
||
// absolute start = ifo_lba + vtstt_vobs(1000) + first_sector(10).
|
||
// The IFO file sits at PART_START(3000) + data_lba(6000) = 9000, so
|
||
// 9000 + 1000 + 10 = 10010.
|
||
assert_eq!(t.extents[0].start_lba, 10010);
|
||
// inclusive: 109 - 10 + 1 = 100 sectors.
|
||
assert_eq!(t.extents[0].sector_count, 100);
|
||
// DVD sector = 2048 bytes.
|
||
assert_eq!(t.size_bytes, 100 * 2048);
|
||
// playlist field format VTS_XX_title.VOB; title_number is 1.
|
||
assert_eq!(t.playlist, "VTS_01_1.VOB");
|
||
assert_eq!(t.playlist_id, 1);
|
||
assert_eq!(t.content_format, ContentFormat::MpegPs);
|
||
}
|
||
|
||
/// Regression (first-play menu prepended to the feature): `vob_start` must
|
||
/// come from the **Title** VOBS pointer `vtstt_vobs` (VTS_IFO 0xC4), NOT the
|
||
/// **menu** VOBS pointer `vtsm_vobs` (0xC0). On discs with a per-title menu
|
||
/// — e.g. the Universal "the parental level has been set, press yes"
|
||
/// first-play still — `vtsm_vobs` points at that menu VOB, which sits just
|
||
/// before the title VOB. Cell `first_sector` values are relative to
|
||
/// `vtstt_vobs`; reading 0xC0 prepended the menu and shifted every extent
|
||
/// back by `vtstt_vobs - vtsm_vobs`, so the rip opened on the parental
|
||
/// prompt instead of the movie (Greenland NTSC R1: vtsm=44, vtstt=3640).
|
||
///
|
||
/// Here `build_vts` stamps `vtstt_vobs = 3640` (0xC4); we additionally stamp
|
||
/// a *different* `vtsm_vobs = 44` (0xC0). The extent must resolve from 3640.
|
||
#[test]
|
||
fn scan_dvd_titles_uses_title_vobs_not_menu_vobs() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]);
|
||
// vtstt_vobs (title) = 3640; cell 0 first_sector = 0.
|
||
let mut vts = build_vts(3640, 0x00, &[], &[], &[(0, 99)], false);
|
||
// Stamp a bogus vtsm_vobs (menu) at 0xC0 — the wrong pointer the bug
|
||
// used. It must be ignored.
|
||
vts[0xC0..0xC4].copy_from_slice(&44u32.to_be_bytes());
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let titles = Disc::scan_dvd_titles(&mut disc, &udf);
|
||
assert_eq!(titles.len(), 1);
|
||
let t = &titles[0];
|
||
assert_eq!(t.extents.len(), 1);
|
||
// ifo_lba(9000) + vtstt_vobs(3640) + first_sector(0) = 12640 — built
|
||
// from the Title VOBS (0xC4), NOT the menu VOBS (0xC0). The IFO file is
|
||
// at PART_START(3000) + data_lba(6000) = 9000.
|
||
assert_eq!(
|
||
t.extents[0].start_lba, 12640,
|
||
"extent must start at ifo_lba + vtstt_vobs (0xC4), not vtsm_vobs (0xC0)"
|
||
);
|
||
// Must not resolve from the menu VOBS (would be 9000 + 44 = 9044), nor
|
||
// use the raw IFO-relative vtstt_vobs (3640) without the absolute base.
|
||
assert_ne!(t.extents[0].start_lba, 9044, "must not use the menu VOBS");
|
||
assert_ne!(
|
||
t.extents[0].start_lba, 3640,
|
||
"must add the IFO's absolute disc LBA, not use the raw relative value"
|
||
);
|
||
}
|
||
|
||
/// ABSOLUTE-REBASE regression (THESILENCEOFTHELAMBS / Greenland fix):
|
||
/// `ifo::parse_vts` now sets `vob_start_sector = file_start_lba(IFO) +
|
||
/// vtstt_vobs`, so an extent's `start_lba` must equal the sum of THREE
|
||
/// independent terms — the IFO file's absolute on-disc LBA, the
|
||
/// IFO-relative `vtstt_vobs` (0xC4), and the cell's `first_sector` — none of
|
||
/// which may be dropped. The earlier code used the bare relative
|
||
/// `vtstt_vobs`, placing every extent `ifo_lba` sectors too early (the rip
|
||
/// opened in the VMGI/menu region before drifting into the movie). The
|
||
/// other tests fold two of the three terms together (zero cell offset, or
|
||
/// a single combined expectation); this one keeps all three distinct and
|
||
/// non-overlapping so a regression to ANY two-term combination is caught.
|
||
#[test]
|
||
fn scan_dvd_titles_extent_is_absolute_three_term_sum() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]);
|
||
// vtstt_vobs (Title VOBS, 0xC4) = 700; one cell first_sector = 33.
|
||
let vts = build_vts(700, 0x00, &[], &[], &[(33, 132)], false);
|
||
// IFO data at data_lba 6000 → absolute ifo_lba = PART_START(3000) + 6000.
|
||
let ifo_lba = PART_START + 6000; // 9000
|
||
let vtstt_vobs = 700u32;
|
||
let first_sector = 33u32;
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
assert_eq!(t.extents.len(), 1);
|
||
let got = t.extents[0].start_lba;
|
||
// The one correct answer: all three terms summed (9000 + 700 + 33).
|
||
assert_eq!(
|
||
got,
|
||
ifo_lba + vtstt_vobs + first_sector,
|
||
"extent start must be file_start_lba(IFO) + vtstt_vobs + cell.first_sector"
|
||
);
|
||
// Each wrong two-term combination must be rejected:
|
||
assert_ne!(
|
||
got,
|
||
vtstt_vobs + first_sector,
|
||
"must not use the bare relative vtstt_vobs (missing the IFO's absolute LBA)"
|
||
);
|
||
assert_ne!(
|
||
got,
|
||
ifo_lba + first_sector,
|
||
"must not drop vtstt_vobs (the Title VOBS pointer)"
|
||
);
|
||
assert_ne!(
|
||
got,
|
||
ifo_lba + vtstt_vobs,
|
||
"must not drop the cell's first_sector offset"
|
||
);
|
||
}
|
||
|
||
/// Multi-cell title: extents preserve cell order and each maps to its
|
||
/// own (vob_start + first .. last) range. mux reads cells in order.
|
||
#[test]
|
||
fn scan_dvd_titles_multi_cell_extents_in_order() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(2, 1, 1)]);
|
||
let vts = build_vts(
|
||
500,
|
||
0x00,
|
||
&[],
|
||
&[],
|
||
&[(0, 99), (200, 299)], // two cells
|
||
false,
|
||
);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
assert_eq!(t.extents.len(), 2);
|
||
assert_eq!(t.extents[0].start_lba, 9500); // ifo_lba(9000) + 500 + 0
|
||
assert_eq!(t.extents[0].sector_count, 100);
|
||
assert_eq!(t.extents[1].start_lba, 9700); // ifo_lba(9000) + 500 + 200
|
||
assert_eq!(t.extents[1].sector_count, 100);
|
||
assert_eq!(t.size_bytes, 200 * 2048);
|
||
}
|
||
|
||
/// PAL video standard (b0 low bits == 1) sets FrameRate::F25; NTSC sets
|
||
/// F29_97 (dvd.rs match on ts.video.standard). The video PID is the
|
||
/// fixed DVD MPEG-PS video stream id 0xE0.
|
||
#[test]
|
||
fn scan_dvd_titles_pal_frame_rate_and_video_pid() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]);
|
||
let vts = build_vts(
|
||
0,
|
||
crate::ifo::v_atr_byte(crate::ifo::VIDEO_FORMAT_PAL, crate::ifo::ASPECT_16X9),
|
||
&[],
|
||
&[],
|
||
&[(0, 9)],
|
||
false,
|
||
);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
let v = t
|
||
.streams
|
||
.iter()
|
||
.find_map(|s| match s {
|
||
Stream::Video(v) => Some(v),
|
||
_ => None,
|
||
})
|
||
.expect("video stream");
|
||
assert_eq!(v.pid, 0xE0, "DVD video PID is fixed 0xE0");
|
||
assert_eq!(v.frame_rate, FrameRate::F25, "PAL → 25 fps");
|
||
assert_eq!(v.resolution, Resolution::R576i, "PAL → 576i");
|
||
assert_eq!(
|
||
v.color_space,
|
||
ColorSpace::Bt470bg,
|
||
"PAL DVD is SD BT.470BG, not BT.709"
|
||
);
|
||
assert_eq!(
|
||
v.display_aspect,
|
||
Some((16, 9)),
|
||
"ASPECT_16X9 IFO byte must map to a 16:9 display aspect"
|
||
);
|
||
}
|
||
|
||
/// NTSC DVD video is SD SMPTE-170M colorimetry (not BT.709). Mirror of the
|
||
/// PAL test with `VIDEO_FORMAT_NTSC` → 480i / 29.97 / SMPTE-170M.
|
||
#[test]
|
||
fn scan_dvd_titles_ntsc_color_is_smpte170m() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]);
|
||
let vts = build_vts(
|
||
0,
|
||
crate::ifo::v_atr_byte(crate::ifo::VIDEO_FORMAT_NTSC, crate::ifo::ASPECT_4X3),
|
||
&[],
|
||
&[],
|
||
&[(0, 9)],
|
||
false,
|
||
);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
let v = t
|
||
.streams
|
||
.iter()
|
||
.find_map(|s| match s {
|
||
Stream::Video(v) => Some(v),
|
||
_ => None,
|
||
})
|
||
.expect("video stream");
|
||
assert_eq!(v.frame_rate, FrameRate::F29_97, "NTSC → 29.97 fps");
|
||
assert_eq!(v.resolution, Resolution::R480i, "NTSC → 480i");
|
||
assert_eq!(
|
||
v.color_space,
|
||
ColorSpace::Smpte170m,
|
||
"NTSC DVD is SD SMPTE-170M, not BT.709"
|
||
);
|
||
assert_eq!(
|
||
v.display_aspect,
|
||
Some((4, 3)),
|
||
"ASPECT_4X3 IFO byte must map to a 4:3 display aspect"
|
||
);
|
||
}
|
||
|
||
/// AC-3 audio gets sub_stream_id 0x80 → PID routed via dvd_audio_pid
|
||
/// (dvd.rs uses `a.sub_stream_id.and_then(dvd_audio_pid)`). A mixed
|
||
/// AC-3 + DTS title must NOT collide: AC-3 → 0x80 base, DTS → 0x88 base.
|
||
#[test]
|
||
fn scan_dvd_titles_mixed_audio_codecs_distinct_pids() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]);
|
||
// audio b0: coding_mode is (b0 >> 5) & 7. AC-3 = 0 → b0=0x00.
|
||
// DTS = 6 → b0 = 6<<5 = 0xC0. b1 channels nibble = (channels-1) in bits
|
||
// 2-0: a REAL 5.1 layout is 5 (0x05), a REAL 2.0 is 1 (0x01). The old
|
||
// fixture used 0x10/0x50 (both decode to 1 channel) — a placeholder that
|
||
// would pass even against code mishandling channel counts. Pin real
|
||
// layouts: AC-3 5.1 eng, DTS 2.0 fra.
|
||
let vts = build_vts(
|
||
0,
|
||
0x00,
|
||
&[(0x00, 0x05, *b"en"), (0xC0, 0x01, *b"fr")], // AC-3 5.1 eng, DTS 2.0 fra
|
||
&[],
|
||
&[(0, 9)],
|
||
false,
|
||
);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
let audios: Vec<_> = t
|
||
.streams
|
||
.iter()
|
||
.filter_map(|s| match s {
|
||
Stream::Audio(a) => Some(a),
|
||
_ => None,
|
||
})
|
||
.collect();
|
||
assert_eq!(audios.len(), 2);
|
||
assert_eq!(audios[0].codec, Codec::Ac3);
|
||
assert_eq!(audios[0].language, "en");
|
||
assert_eq!(audios[1].codec, Codec::Dts);
|
||
// Real channel layouts survive the scan (not a 1ch placeholder): the
|
||
// AC-3 is 5.1 (6ch), the DTS is 2.0 (2ch).
|
||
assert_eq!(
|
||
audios[0].channels.count(),
|
||
6,
|
||
"AC-3 5.1 nibble must decode to 6 channels"
|
||
);
|
||
assert_eq!(
|
||
audios[1].channels.count(),
|
||
2,
|
||
"DTS 2.0 nibble must decode to 2 channels"
|
||
);
|
||
// PIDs route via the positional sub-id table: AC-3 @ pos 0 → 0x80 →
|
||
// 0xBD80, DTS @ pos 1 → 0x89 → 0xBD89 (the shared audio-stream number
|
||
// in the low nibble, NOT a per-codec ordinal). Distinct AND the exact
|
||
// canonical wire PIDs the demux routes on.
|
||
assert_eq!(audios[0].pid, 0xBD80, "AC-3 @ pos 0 → 0xBD80");
|
||
assert_eq!(audios[1].pid, 0xBD89, "DTS @ pos 1 → 0xBD89");
|
||
assert_ne!(audios[0].pid, audios[1].pid);
|
||
}
|
||
|
||
/// LPCM SCAN ROUTING (audit §2 / §5 #6): the 0xA0..=0xA7 PID range was never
|
||
/// exercised in the dvd.rs scan. An LPCM stream (coding_mode 4) at audio
|
||
/// position 1 must get sub_stream_id 0xA1 → PID 0xBDA1 via `dvd_audio_pid`,
|
||
/// distinct from the AC-3 0xBD80 space, with its real channel count preserved.
|
||
#[test]
|
||
fn scan_dvd_titles_lpcm_routes_to_a0_pid_range() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]);
|
||
// b0 coding_mode = (b0 >> 5) & 7. LPCM = 4 → b0 = 4<<5 = 0x80.
|
||
// b1 channels nibble: 2.0 stereo LPCM → (2-1)=1 → 0x01. Plus an AC-3 5.1
|
||
// so we prove the two land in disjoint PID spaces (0xBD8x vs 0xBDAx).
|
||
let vts = build_vts(
|
||
0,
|
||
0x00,
|
||
&[(0x00, 0x05, *b"en"), (0x80, 0x01, *b"fr")], // AC-3 5.1 eng, LPCM 2.0 fra
|
||
&[],
|
||
&[(0, 9)],
|
||
false,
|
||
);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
let audios: Vec<_> = t
|
||
.streams
|
||
.iter()
|
||
.filter_map(|s| match s {
|
||
Stream::Audio(a) => Some(a),
|
||
_ => None,
|
||
})
|
||
.collect();
|
||
assert_eq!(audios.len(), 2);
|
||
assert_eq!(audios[0].codec, Codec::Ac3);
|
||
assert_eq!(audios[1].codec, Codec::Lpcm, "coding_mode 4 → LPCM");
|
||
assert_eq!(audios[0].pid, 0xBD80, "AC-3 @ pos 0 → 0xBD80");
|
||
assert_eq!(
|
||
audios[1].pid, 0xBDA1,
|
||
"LPCM @ pos 1 → 0xBDA1 (the 0xA0 sub-id range | position), NOT the AC-3 space"
|
||
);
|
||
assert_eq!(
|
||
audios[1].channels.count(),
|
||
2,
|
||
"LPCM 2.0 nibble must decode to 2 channels"
|
||
);
|
||
}
|
||
|
||
/// MULTI-VOBSUB SCAN (audit §2 / §5 #6): the single-subtitle test covered one
|
||
/// track; a multi-subtitle VTS must emit one Stream::Subtitle per entry with
|
||
/// distinct PIDs (0x20 + ordinal) and per-language tags, all sharing the PGC
|
||
/// palette codec_data.
|
||
#[test]
|
||
fn scan_dvd_titles_multiple_vobsub_tracks_distinct_pids() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]);
|
||
let vts = build_vts(
|
||
0,
|
||
0x00,
|
||
&[],
|
||
&[*b"en", *b"fr", *b"de"], // three VobSub tracks
|
||
&[(0, 9)],
|
||
true, // non-zero palette → codec_data on every track
|
||
);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
let subs: Vec<_> = t
|
||
.streams
|
||
.iter()
|
||
.filter_map(|s| match s {
|
||
Stream::Subtitle(s) => Some(s),
|
||
_ => None,
|
||
})
|
||
.collect();
|
||
assert_eq!(subs.len(), 3, "three VobSub tracks must all surface");
|
||
// Languages preserved in order.
|
||
assert_eq!(
|
||
subs.iter().map(|s| s.language.as_str()).collect::<Vec<_>>(),
|
||
vec!["en", "fr", "de"]
|
||
);
|
||
// PIDs are 0x20 + ordinal, all distinct.
|
||
let pids: Vec<u16> = subs.iter().map(|s| s.pid).collect();
|
||
assert_eq!(pids, vec![0x20, 0x21, 0x22], "VobSub PID = 0x20 + ordinal");
|
||
// Every track carries the palette codec_data.
|
||
for s in &subs {
|
||
assert_eq!(s.codec, Codec::DvdSub);
|
||
assert!(
|
||
s.codec_data.is_some(),
|
||
"each VobSub track shares the PGC palette codec_data"
|
||
);
|
||
}
|
||
}
|
||
|
||
/// Subtitle streams map to Codec::DvdSub with palette codec_data when a
|
||
/// non-zero palette is present (dvd.rs builds codec_data from
|
||
/// dvd_title.palette). VobSub sub-id 0x20+i.
|
||
#[test]
|
||
fn scan_dvd_titles_subtitle_palette_codec_data() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]);
|
||
let vts = build_vts(
|
||
0,
|
||
0x00,
|
||
&[],
|
||
&[*b"en"],
|
||
&[(0, 9)],
|
||
true, // non-zero palette
|
||
);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
let sub = t
|
||
.streams
|
||
.iter()
|
||
.find_map(|s| match s {
|
||
Stream::Subtitle(s) => Some(s),
|
||
_ => None,
|
||
})
|
||
.expect("subtitle stream");
|
||
assert_eq!(sub.codec, Codec::DvdSub);
|
||
assert_eq!(sub.language, "en");
|
||
assert!(
|
||
sub.codec_data.is_some(),
|
||
"non-zero palette must yield codec_data"
|
||
);
|
||
}
|
||
|
||
/// Multiple titles in one VTS each become their own DiscTitle with a
|
||
/// monotonically increasing title_number / playlist_id (dvd.rs
|
||
/// `title_number += 1` per dvd_title). Both share the VTS streams.
|
||
#[test]
|
||
fn scan_dvd_titles_numbering_increments_per_title() {
|
||
let mut disc = MemDisc::new();
|
||
// Two titles in VTS 1 (title nums 1 and 2). num_pgcs must cover
|
||
// pgc_index = vts_title - 1, so we need >=2 PGC entries; our
|
||
// build_vts only emits 1 PGC. So the second title's PGC index (1)
|
||
// exceeds num_pgcs (1) and is skipped. To exercise numbering we use
|
||
// two separate VTS sets instead.
|
||
let vmg = build_vmg(&[(1, 1, 1), (1, 2, 1)]);
|
||
let vts1 = build_vts(100, 0x00, &[], &[], &[(0, 9)], false);
|
||
let vts2 = build_vts(200, 0x00, &[], &[], &[(0, 19)], false);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts1,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_02_0.IFO".into(),
|
||
icb_lba: 64,
|
||
data_lba: 7000,
|
||
contents: vts2,
|
||
},
|
||
],
|
||
);
|
||
let titles = Disc::scan_dvd_titles(&mut disc, &udf);
|
||
assert_eq!(titles.len(), 2);
|
||
// title_number is a running counter across all title sets.
|
||
assert_eq!(titles[0].playlist_id, 1);
|
||
assert_eq!(titles[1].playlist_id, 2);
|
||
assert_eq!(titles[0].playlist, "VTS_01_1.VOB");
|
||
assert_eq!(titles[1].playlist, "VTS_02_2.VOB");
|
||
// Distinct vob_start → distinct extents.
|
||
// VTS_01 IFO @ PART_START(3000)+6000=9000; VTS_02 IFO @ 3000+7000=10000.
|
||
assert_eq!(titles[0].extents[0].start_lba, 9100); // 9000 + 100
|
||
assert_eq!(titles[1].extents[0].start_lba, 10200); // 10000 + 200
|
||
}
|
||
|
||
/// chapter_times from the IFO become Chapter entries with ordinal
|
||
/// names (dvd.rs maps chapter_times → Chapter{time_secs, chapter_name}).
|
||
#[test]
|
||
fn scan_dvd_titles_chapters_present() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]);
|
||
let vts = build_vts(0, 0x00, &[], &[], &[(0, 9)], false);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
// One program in the program map → one chapter time (0.0 for the
|
||
// first program). Name is the ordinal from chapter_name(0).
|
||
assert_eq!(t.chapters.len(), 1);
|
||
assert_eq!(t.chapters[0].name, chapter_name(0));
|
||
}
|
||
|
||
/// Build a VTS with explicit per-cell category bytes and an N-program map.
|
||
/// Returns the IFO bytes. Cells: `(first, last, category, dur_secs)`.
|
||
fn build_vts_cells(
|
||
vob_start: u32,
|
||
video_b0: u8,
|
||
cells: &[(u32, u32, u8, u8 /*BCD seconds*/)],
|
||
program_first_cells: &[u8],
|
||
) -> Vec<u8> {
|
||
let pgcit_sector = 2u32;
|
||
let mut d = vec![0u8; 4 * 2048];
|
||
d[0..12].copy_from_slice(b"DVDVIDEO-VTS");
|
||
d[0xC4..0xC8].copy_from_slice(&vob_start.to_be_bytes()); // vtstt_vobs (Title VOBS)
|
||
d[0xCC..0xD0].copy_from_slice(&pgcit_sector.to_be_bytes());
|
||
d[0x200] = video_b0;
|
||
// no audio / subs
|
||
let pg = pgcit_sector as usize * 2048;
|
||
d[pg..pg + 2].copy_from_slice(&1u16.to_be_bytes());
|
||
let pgc_rel: u32 = 0x100;
|
||
d[pg + 8 + 4..pg + 8 + 8].copy_from_slice(&pgc_rel.to_be_bytes());
|
||
let pgc = pg + pgc_rel as usize;
|
||
d[pgc + 0x02] = program_first_cells.len() as u8; // nr_of_programs
|
||
d[pgc + 0x03] = cells.len() as u8; // nr_of_cells
|
||
// Leave PGC-level BCD time zero → duration recomputed from cells.
|
||
let cell_tbl_rel: u16 = 0xF0;
|
||
let pgm_map_rel: u16 = 0xEC;
|
||
d[pgc + 0xE6..pgc + 0xE8].copy_from_slice(&pgm_map_rel.to_be_bytes());
|
||
d[pgc + 0xE8..pgc + 0xEA].copy_from_slice(&cell_tbl_rel.to_be_bytes());
|
||
for (i, &fc) in program_first_cells.iter().enumerate() {
|
||
d[pgc + pgm_map_rel as usize + i] = fc;
|
||
}
|
||
let cell_base = pgc + cell_tbl_rel as usize;
|
||
for (i, (first, last, cat, secs)) in cells.iter().enumerate() {
|
||
let off = cell_base + i * 24;
|
||
write_cell_cat(&mut d, off, *first, *last, *cat);
|
||
d[off + 6] = *secs; // BCD seconds in the cell time field
|
||
}
|
||
d
|
||
}
|
||
|
||
/// End-to-end bug-4 fix: a feature PGC that opens with a leading
|
||
/// interleaved-angle sub-block cell (category 0x90 = in-block cell of an
|
||
/// angle block) must have that cell DROPPED from the muxed extents, so the
|
||
/// rip starts at the real feature. Chapters shift earlier by the dropped duration.
|
||
#[test]
|
||
fn scan_dvd_titles_drops_leading_scene_index_cell() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(2, 1, 1)]);
|
||
// Cell 0: leading scene-index/angle sub-block (cat 0x90), 5s, sectors 0..9.
|
||
// Cell 1: feature start (cat 0x00), 59s, sectors 100..199.
|
||
// Cell 2: feature (cat 0x00), 59s, sectors 300..399.
|
||
// Programs: prog0 → cell 1 (feature start), prog1 → cell 3.
|
||
let vts = build_vts_cells(
|
||
1000,
|
||
0x00,
|
||
&[
|
||
(0, 9, 0x90, 0x05),
|
||
(100, 199, 0x00, 0x59),
|
||
(300, 399, 0x00, 0x59),
|
||
],
|
||
&[1, 3],
|
||
);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
// The leading 0x90 cell is dropped: 2 feature extents, not 3.
|
||
assert_eq!(t.extents.len(), 2, "leading angle sub-block cell dropped");
|
||
// First extent starts at the feature cell (vob 1000 + 100), not at 1000+0.
|
||
assert_eq!(t.extents[0].start_lba, 9000 + 1000 + 100); // ifo_lba + vtstt + first
|
||
assert_eq!(t.extents[1].start_lba, 9000 + 1000 + 300);
|
||
// Chapter times shift earlier by the dropped 5s. Program 0 was at the
|
||
// dropped head (clamped to 0); program 1 was at cell 3 =
|
||
// dur(cell0)+dur(cell1) = 5 + 59 = 64s, now 59s after the 5s shift.
|
||
assert_eq!(t.chapters.len(), 2);
|
||
assert!(
|
||
(t.chapters[0].time_secs - 0.0).abs() < 0.01,
|
||
"ch0 clamped to 0, got {}",
|
||
t.chapters[0].time_secs
|
||
);
|
||
assert!(
|
||
(t.chapters[1].time_secs - 59.0).abs() < 0.01,
|
||
"ch1 shifted by dropped 5s → 59s, got {}",
|
||
t.chapters[1].time_secs
|
||
);
|
||
}
|
||
|
||
/// Conservative guard end-to-end: a normal feature (every cell category
|
||
/// 0x00) is muxed in full — the filter drops nothing and chapters are
|
||
/// unshifted. This is the "Silence of the Lambs" case.
|
||
#[test]
|
||
fn scan_dvd_titles_plain_feature_untouched() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(2, 1, 1)]);
|
||
let vts = build_vts_cells(
|
||
1000,
|
||
crate::ifo::v_atr_byte(crate::ifo::VIDEO_FORMAT_PAL, crate::ifo::ASPECT_16X9),
|
||
&[(0, 99, 0x00, 0x30), (200, 299, 0x00, 0x30)],
|
||
&[1, 2],
|
||
);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let t = &Disc::scan_dvd_titles(&mut disc, &udf)[0];
|
||
// Nothing dropped: both cells become extents, starting at the very head.
|
||
assert_eq!(t.extents.len(), 2);
|
||
assert_eq!(t.extents[0].start_lba, 9000 + 1000); // ifo_lba + vtstt + 0, head intact
|
||
assert_eq!(t.extents[1].start_lba, 9000 + 1200);
|
||
// Chapter 0 stays at 0.0 (no shift).
|
||
assert!((t.chapters[0].time_secs - 0.0).abs() < 0.01);
|
||
}
|
||
|
||
/// Audio PID fallback (dvd.rs `Disc::scan_dvd_titles`): when an audio
|
||
/// stream has no on-wire private_stream_1 sub-stream id — MP1/MP2 audio,
|
||
/// per `ifo::assign_audio_sub_stream_ids` — the PID falls back to
|
||
/// `0xBD00 + i` where `i` is the stream's positional index in the IFO
|
||
/// audio-attribute table. Two MPEG-audio (coding_mode 2) streams must
|
||
/// land on two DISTINCT, correctly-offset PIDs: 0xBD00 and 0xBD01. This
|
||
/// pins the `+` (not `-`/`*`) so the second stream doesn't collide with,
|
||
/// or wrap under, the first.
|
||
#[test]
|
||
fn scan_dvd_titles_mp2_audio_pid_fallback_is_additive() {
|
||
let mut disc = MemDisc::new();
|
||
let vmg = build_vmg(&[(1, 1, 1)]);
|
||
// coding_mode bits are b0>>5 & 0x7; mode 2 = MPEG-1 Layer II (Mp2),
|
||
// which `assign_audio_sub_stream_ids` leaves at `sub_stream_id: None`.
|
||
// b0 = 0b010_00000 = 0x40. b1 = 0 (mono, sample rate 48k).
|
||
let audio = [(0x40u8, 0x00u8, [0u8, 0u8]), (0x40u8, 0x00u8, [0u8, 0u8])];
|
||
let vts = build_vts(1000, 0x00, &audio, &[], &[(10, 109)], false);
|
||
let udf = build_video_ts_fs(
|
||
&mut disc,
|
||
&[
|
||
FileSpec {
|
||
name: "VIDEO_TS.IFO".into(),
|
||
icb_lba: 60,
|
||
data_lba: 5000,
|
||
contents: vmg,
|
||
},
|
||
FileSpec {
|
||
name: "VTS_01_0.IFO".into(),
|
||
icb_lba: 62,
|
||
data_lba: 6000,
|
||
contents: vts,
|
||
},
|
||
],
|
||
);
|
||
let titles = Disc::scan_dvd_titles(&mut disc, &udf);
|
||
let t = &titles[0];
|
||
let audio_pids: Vec<u16> = t
|
||
.streams
|
||
.iter()
|
||
.filter_map(|s| match s {
|
||
Stream::Audio(a) => Some(a.pid),
|
||
_ => None,
|
||
})
|
||
.collect();
|
||
assert_eq!(audio_pids, vec![0xBD00u16, 0xBD01u16]);
|
||
}
|
||
}
|