Matthew Jackson
46eb88c51f
Seven defects in the code the test suite executes least — 913 lines of disc/mod.rs alone are run by no test at all, which is why this round scoped from coverage rather than from what previous rounds said they had read. Disc::scan_image kept its own copy of the crack's extent ordering and fed crack_key_outcome largest-cell-first. That is the fifth instance in this audit of a local reimplementation drifting from the canonical one, and the cost here is a key that does not descramble the feature: picking by sector count bypasses the capacity gate and can select a different VTS entirely. The copy is gone — which title comes from the canonical order the scan already applied, and the extents are handed over in playback order, exactly as decrypt_keys_for_title does. Its doc records why the duplicate existed so it cannot grow back. Resolution::pixels returned 1920x1080 for Unknown. That is the FOURTH instance of one trap and the other three were in this same file, two of them fixed hours earlier — without sweeping for siblings, which is the whole reason this one survived. It now returns (0, 0), and the sweep was done properly this time: every remaining Unknown arm across the crate is honest, and the two ColorSpace sites that look like fabrication are emitting H.273 code point 2, which is the spec's own "unspecified". Two callers carried local Unknown-to-zero workarounds — precisely the cost of making callers responsible for a lie — and one is now redundant. BD-ROM Part 3 code 0xA2 is the lossy secondary DTS stream, not lossless Master Audio. A test asserted the wrong mapping as intended behaviour, so correcting the code failed it; the test is deleted with a note pointing at its replacement. That is a NEW failure mode for this audit: not a test that cannot fail, but one that locks the defect in. There is no DtsExpress variant to map to, so it takes the lossy DTS-HD member and the approximation is documented. Also: DiscSession::identify could panic through drive_mut once the public API allows an absent drive — two siblings were converted in an earlier round and this one was missed; an extent end that added without saturating where the rest of the crate saturates; a diag reason string restating the comparator's sort keys and drifting from them, now derived from them; and a short read that advanced the offset by the full request, silently skipping the gap. That last one existed twice, in two reads with the same shape, now merged so they cannot drift apart. The short-read policy is a judgement call I could not derive from a spec: no skip_errors is a hard error, with skip_errors zero-fills and charges the loss. It deliberately does not retry mid-unit, because resuming inside an AACS aligned unit would trade a silent gap for a silent decrypt desync — the worse of the two.
134 lines
6.9 KiB
Rust
134 lines
6.9 KiB
Rust
//! Physical media constants — the single source of truth.
|
|
//!
|
|
//! Naming convention: a constant is prefixed by the **narrowest scope where it
|
|
//! is valid**. A value common to all optical media carries no prefix; a value
|
|
//! specific to a container/format/disc-type is prefixed by it
|
|
//! (`TS_`, `BD_`, …). Define each physical quantity here exactly once and import
|
|
//! it — never re-declare a bare literal or a local copy.
|
|
|
|
/// Bytes per logical sector on every optical medium freemkv reads
|
|
/// (Blu-ray, DVD-Video, CD-ROM Mode 1). Universal — hence unprefixed.
|
|
///
|
|
/// `usize` because its dominant use is buffer sizing and slice indexing, where
|
|
/// Rust *requires* `usize` (`vec![0u8; SECTOR_BYTES]`, `buf.len() < SECTOR_BYTES`).
|
|
/// For byte-offset / capacity arithmetic — which is `u64` because a disc can
|
|
/// exceed 4 GiB — use [`SECTOR_BYTES_U64`] instead of casting at each site.
|
|
pub const SECTOR_BYTES: usize = 2048;
|
|
|
|
/// [`SECTOR_BYTES`] as `u64`, for byte-offset and capacity arithmetic. The
|
|
/// single `usize → u64` boundary cast lives here, once, so offset math across
|
|
/// the workspace reads as `sectors * SECTOR_BYTES_U64` with no per-site cast.
|
|
pub const SECTOR_BYTES_U64: u64 = SECTOR_BYTES as u64;
|
|
|
|
/// Milliseconds per second. For turning a byte count ÷ bytes-per-second into a
|
|
/// movie-time figure (`bytes / bps * MILLIS_PER_SEC`) without a bare `1000.0`.
|
|
pub const MILLIS_PER_SEC: f64 = 1_000.0;
|
|
|
|
/// Bytes per MPEG-2 transport-stream packet. Common to all MPEG-TS, not just
|
|
/// Blu-ray — prefixed by the format, not a disc type.
|
|
pub const TS_PACKET_BYTES: usize = 188;
|
|
|
|
/// Bytes in an MPEG-2 transport-stream packet header: sync byte, the
|
|
/// flags/PID word, and the adaptation/continuity byte.
|
|
pub const TS_HEADER_BYTES: usize = 4;
|
|
|
|
/// Bytes in the arrival-timestamp prefix a Blu-ray M2TS prepends to each TS
|
|
/// packet to form a source packet. Same width as a TS header but a distinct
|
|
/// quantity ([`TS_HEADER_BYTES`]) — do not conflate.
|
|
pub const BD_TIMESTAMP_PREFIX_BYTES: usize = 4;
|
|
|
|
/// Bytes of payload in an MPEG-2 transport-stream packet:
|
|
/// [`TS_PACKET_BYTES`] minus the [`TS_HEADER_BYTES`] header.
|
|
pub const TS_PAYLOAD_BYTES: usize = TS_PACKET_BYTES - TS_HEADER_BYTES;
|
|
|
|
/// Bytes per Blu-ray M2TS *source packet*: a TS packet ([`TS_PACKET_BYTES`])
|
|
/// prefixed with the [`BD_TIMESTAMP_PREFIX_BYTES`] arrival-timestamp header.
|
|
/// A BDAV/M2TS construct only — DVD VOBs have no source packets — hence `BD_`.
|
|
pub const BD_SOURCE_PACKET_BYTES: usize = TS_PACKET_BYTES + BD_TIMESTAMP_PREFIX_BYTES;
|
|
|
|
/// Elementary-stream coding-type codes — the single source of truth for the
|
|
/// byte that identifies a stream's codec.
|
|
///
|
|
/// This is one registry used in two places that share the same value space:
|
|
/// the MPEG-TS PMT `stream_type` (ISO/IEC 13818-1 Table 2-34) and the Blu-ray
|
|
/// STN/CLPI `stream_coding_type` (BD-ROM Part 3). The standardized video codes
|
|
/// (`0x02`, `0x1B`, `0x24`) are ISO assignments (ISO/IEC 13818-1 Table 2-34);
|
|
/// `0xEA` (VC-1) is a BD-ROM convention in the ISO user-private range. The
|
|
/// `0x80..=0xA2` audio/graphics codes also sit in the user-private range and follow the
|
|
/// Blu-ray Disc Association / ATSC A/52 convention. Because every consumer
|
|
/// reads or writes this single byte, the family is unprefixed — the scope is
|
|
/// "any elementary stream freemkv parses or muxes".
|
|
///
|
|
/// Each constant is `u8`: the spec defines an 8-bit field and the code compares
|
|
/// it directly against a byte read from the buffer, so no casts are needed.
|
|
pub mod coding_type {
|
|
/// MPEG-2 video (ISO/IEC 13818-1 Table 2-34).
|
|
pub const MPEG2_VIDEO: u8 = 0x02;
|
|
/// H.264 / AVC video (ISO/IEC 13818-1 Table 2-34).
|
|
pub const H264: u8 = 0x1B;
|
|
/// H.264 / MVC dependent view (Blu-ray 3D right-eye substream). Carried in
|
|
/// the SSIF interleaved stream under its own PID; the base view is [`H264`].
|
|
/// ISO/IEC 13818-1 stream_type 0x20 (MVC video sub-bitstream).
|
|
pub const H264_MVC: u8 = 0x20;
|
|
/// HEVC / H.265 video (ISO/IEC 13818-1 Table 2-34, 2015 amendment).
|
|
pub const HEVC: u8 = 0x24;
|
|
/// SMPTE VC-1 video (BD-ROM convention, ISO user-private range).
|
|
pub const VC1: u8 = 0xEA;
|
|
|
|
/// LPCM audio (BD-ROM convention).
|
|
pub const LPCM: u8 = 0x80;
|
|
/// Dolby Digital (AC-3) audio (BD-ROM / ATSC A/52 convention).
|
|
pub const AC3: u8 = 0x81;
|
|
/// DTS audio (BD-ROM convention).
|
|
pub const DTS: u8 = 0x82;
|
|
/// Dolby TrueHD audio (BD-ROM convention).
|
|
pub const TRUEHD: u8 = 0x83;
|
|
/// Dolby Digital Plus (E-AC-3 / AC-3+) audio (BD-ROM convention).
|
|
pub const AC3_PLUS: u8 = 0x84;
|
|
/// DTS-HD High Resolution audio (BD-ROM Part 3-1).
|
|
pub const DTS_HD_HR: u8 = 0x85;
|
|
/// DTS-HD Master Audio (lossless) (BD-ROM Part 3-1).
|
|
pub const DTS_HD_MA: u8 = 0x86;
|
|
|
|
/// Presentation Graphics — PG subtitle stream (BD-ROM HDMV).
|
|
pub const PG: u8 = 0x90;
|
|
/// Interactive Graphics — IG / BD-J menu overlay, NOT a subtitle (BD-ROM HDMV).
|
|
pub const IG: u8 = 0x91;
|
|
/// Text subtitle stream (BD-ROM HDMV).
|
|
pub const TEXT_SUBTITLE: u8 = 0x92;
|
|
|
|
/// Secondary Dolby Digital Plus audio (BD-ROM convention).
|
|
pub const AC3_PLUS_SECONDARY: u8 = 0xA1;
|
|
/// Secondary DTS-HD audio — DTS Express / DTS-HD LBR, a LOSSY low-bitrate
|
|
/// stream for picture-in-picture and BD-J mixing (BD-ROM Part 3
|
|
/// `stream_coding_type` table). The lossless primary is [`DTS_HD_MA`]
|
|
/// (0x86); this code is its lossy secondary counterpart, parallel to
|
|
/// [`AC3_PLUS_SECONDARY`] (0xA1) on the Dolby side.
|
|
pub const DTS_HD_SECONDARY: u8 = 0xA2;
|
|
}
|
|
|
|
/// MPEG PES `stream_id` codes — the byte after the `00 00 01` start-code prefix
|
|
/// that identifies an elementary stream's role in a PES packet (ISO/IEC
|
|
/// 13818-1 Table 2-22). Shared by the program-stream demuxer and the TS/M2TS
|
|
/// muxers, so defined here once. Each is `u8` (matches the byte on the wire).
|
|
pub mod pes_stream_id {
|
|
/// Video stream (`110x xxxx`; freemkv emits the base id `0xE0`).
|
|
pub const VIDEO: u8 = 0xE0;
|
|
/// private_stream_1 — AC-3 / DTS / LPCM / PGS subtitle payloads.
|
|
pub const PRIVATE_STREAM_1: u8 = 0xBD;
|
|
/// padding_stream — stuffing bytes only, no payload to demux.
|
|
pub const PADDING_STREAM: u8 = 0xBE;
|
|
/// private_stream_2 — DVD navigation (PCI/DSI); carries no muxable ES.
|
|
pub const PRIVATE_STREAM_2: u8 = 0xBF;
|
|
|
|
/// Highest video stream_id — the `110x xxxx` video range tops out at 0xEF.
|
|
pub const VIDEO_MAX: u8 = 0xEF;
|
|
|
|
/// Inclusive range of every PES `stream_id` that carries demuxable payload:
|
|
/// [`PRIVATE_STREAM_1`] (0xBD) through [`VIDEO_MAX`] (0xEF) — i.e. private
|
|
/// stream 1/2, padding, MPEG audio (0xC0-0xDF) and video (0xE0-0xEF). The
|
|
/// pack (0xBA), system-header (0xBB) and program-end (0xB9) codes sit below
|
|
/// this range and are deliberately excluded: they're structural, not ES.
|
|
pub const PAYLOAD_RANGE: core::ops::RangeInclusive<u8> = PRIVATE_STREAM_1..=VIDEO_MAX;
|
|
}
|