Merge remote-tracking branch 'origin/main' into w-extract/sony-lut-readers

# Conflicts:
#	crates/cms/src/lib.rs
This commit is contained in:
FredApps committed 2026-11-16 00:22:05 +01:00
commit 38bf5e0ad0
149 files changed
+13032 -1383

No files matched your search

+2
View File
@@ -100,3 +100,5 @@ and the exact transfer revision are recorded in each vendored crate's SOURCE.jso
## Binary Apple property lists
`crates/plist` is extracted from `storytold/craft-anything` (`crates/formats/src/plist.rs` and checked byte reads), at source main `88d1d9cac852aec1c7fd97886db451e005e49d2a`. MIT OR Apache-2.0; source license texts are retained in the crate. Primary import Git authors preserve Brandon Thomas, BFlat, RRFZ and Afloat. Regression imports preserve BFlat. XML, JSON projection, calendar formatting and app policy were not imported into the public API.
The XML reader in `crates/plist/src/xml.rs` and its base64 compatibility helper are ported from Craft Anything `8f3b775157d331dd31cfa4da911e26d8856b8c77` (same MIT OR Apache-2.0 source licenses). Brandon Thomas is the primary import author; retained hardening credits include Afloat, BFlat, Rahul, RRFZ and NetterSilver. The finite-real fix preserves gmrmad1 as author from Craft Anything #1905 (`d85e104f`); quoted-attribute/line-ending regressions preserve RRFZ. Bounds/adaptation and bounded entity scanning are subsequent Dylan M. Taylor changes. App-specific JSON projections and keyed-archive interpretation remain outside this crate.
Generated
+80 -34
View File
@@ -222,16 +222,6 @@ version = "1.0.104"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "330a5ed07fa54e4702c9d6c4174f74427fc0ef6e214bbd677ae50a5099946470"
[[package]]
name = "aotuv_lancer_vorbis_sys"
version = "0.1.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5bc4fd1a61860d2f1198b60bedd30910eaffa978f1ee6214dfb24ac70d589225"
dependencies = [
"cc",
"ogg_next_sys",
]
[[package]]
name = "arbitrary"
version = "1.5.0"
@@ -340,6 +330,12 @@ dependencies = [
"syn 2.0.119",
]
[[package]]
name = "astc-decode"
version = "0.3.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2d6058e6202e20b7fa445692ec4b77ca8eb02508091fcd479ea753d9f60e376b"
[[package]]
name = "async-broadcast"
version = "0.7.2"
@@ -1414,7 +1410,6 @@ dependencies = [
"serde_json",
"symphonia",
"thiserror 2.0.21",
"vorbis_rs",
]
[[package]]
@@ -1456,6 +1451,14 @@ dependencies = [
"encoding_rs",
]
[[package]]
name = "craft-control-protocol"
version = "0.1.0"
dependencies = [
"serde_json",
"subtle",
]
[[package]]
name = "craft-crs"
version = "0.1.0"
@@ -1491,6 +1494,17 @@ dependencies = [
"proptest",
]
[[package]]
name = "craft-deckcraft-format"
version = "0.1.0"
dependencies = [
"craft-zip",
"serde",
"serde_json",
"thiserror 2.0.21",
"zip",
]
[[package]]
name = "craft-designcraft-format"
version = "0.1.0"
@@ -1671,6 +1685,15 @@ dependencies = [
"thiserror 2.0.21",
]
[[package]]
name = "craft-fcproj-format"
version = "0.1.0"
dependencies = [
"serde",
"serde_json",
"thiserror 2.0.21",
]
[[package]]
name = "craft-fig"
version = "0.1.0"
@@ -1762,6 +1785,7 @@ name = "craft-font-catalog"
version = "0.1.0"
dependencies = [
"fontique",
"kurbo 0.13.1",
"skrifa 0.47.0",
"thiserror 2.0.21",
"windows-registry",
@@ -1929,6 +1953,7 @@ dependencies = [
"craft-jpeg",
"craft-media-testkit",
"craft-metadata",
"craft-tiff",
"craft-video",
"crc32fast",
"exr",
@@ -2758,6 +2783,8 @@ dependencies = [
name = "craft-texture"
version = "0.1.0"
dependencies = [
"bytemuck",
"dds",
"rayon",
"thiserror 2.0.21",
]
@@ -2855,6 +2882,14 @@ dependencies = [
"zip",
]
[[package]]
name = "craft-usd"
version = "0.1.0"
dependencies = [
"lz4_flex",
"thiserror 2.0.21",
]
[[package]]
name = "craft-vcard"
version = "0.1.0"
@@ -3295,6 +3330,19 @@ dependencies = [
"generic-array",
]
[[package]]
name = "dds"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e917a58e17b27d2f15626c490754ccced7f46592dc5b5f39a3013b89cba5f068"
dependencies = [
"astc-decode",
"bitflags 2.13.2",
"glam",
"resize",
"zerocopy",
]
[[package]]
name = "der"
version = "0.7.10"
@@ -4543,6 +4591,12 @@ dependencies = [
"xml-rs",
]
[[package]]
name = "glam"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "151665d9be52f9bb40fc7966565d39666f2d1e69233571b71b87791c7e0528b3"
[[package]]
name = "glifo"
version = "0.1.1"
@@ -6054,6 +6108,12 @@ version = "0.1.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4050469837a6ff301cd14c1f8f24f88549e6d548f24f64e2148eb0f72cebc51f"
[[package]]
name = "lz4_flex"
version = "0.11.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "373f5eceeeab7925e0c1098212f2fbc4d416adec9d35051a6ab251e824c1854a"
[[package]]
name = "maybe-owned"
version = "0.3.4"
@@ -6812,15 +6872,6 @@ dependencies = [
"phf 0.11.3",
]
[[package]]
name = "ogg_next_sys"
version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed2d7a48e247c2bb07e633aefb65a38648ea58c7eedd4e4408a5861721ab049b"
dependencies = [
"cc",
]
[[package]]
name = "oid-registry"
version = "0.8.1"
@@ -8136,6 +8187,15 @@ dependencies = [
"web-sys",
]
[[package]]
name = "resize"
version = "0.8.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "71725ecd5e0197b54fe859055b108688472ab6a358f8fbe5cee4a556b1b5bfea"
dependencies = [
"rgb",
]
[[package]]
name = "resvg"
version = "0.45.1"
@@ -10639,20 +10699,6 @@ version = "0.9.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
[[package]]
name = "vorbis_rs"
version = "0.5.6"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "49c5da94d280f7a27e8c937e9b73df2da3e23a2583f48471fd8fb4c72f9c1933"
dependencies = [
"aotuv_lancer_vorbis_sys",
"errno",
"getrandom 0.4.3",
"ogg_next_sys",
"thiserror 2.0.21",
"tinyvec",
]
[[package]]
name = "wait-timeout"
version = "0.2.1"
+4
View File
@@ -11,6 +11,7 @@ rust-version = "1.95"
repository = "https://github.com/storytold/craft-libs"
[workspace.dependencies]
craft-usd = { path = "crates/usd" }
craft-smime = { path = "crates/smime" }
craft-ber = { path = "crates/ber" }
craft-proto = { path = "crates/proto" }
@@ -54,6 +55,7 @@ craft-doc-binary = { path = "crates/doc-binary" }
craft-docx = { path = "crates/docx" }
craft-document-bundle = { path = "crates/document-bundle" }
craft-mcmat = { path = "crates/mcmat" }
craft-deckcraft-format = { path = "crates/deckcraft-format" }
craft-designcraft-format = { path = "crates/designcraft-format" }
craft-dxf = { path = "crates/dxf" }
craft-drawingml = { path = "crates/drawingml" }
@@ -68,6 +70,7 @@ craft-doc = { path = "crates/doc" }
craft-docpath = { path = "crates/docpath" }
craft-dpx = { path = "crates/dpx" }
craft-dwg = { path = "crates/dwg" }
craft-fcproj-format = { path = "crates/fcproj-format" }
craft-ecproj-format = { path = "crates/ecproj-format" }
craft-figma-rest = { path = "crates/figma-rest" }
craft-exr = { path = "crates/exr" }
@@ -91,6 +94,7 @@ craft-indd = { path = "crates/indd" }
craft-jmap = { path = "crates/jmap" }
craft-ical = { path = "crates/ical" }
craft-jpeg = { path = "crates/jpeg" }
craft-control-protocol = { path = "crates/control-protocol" }
craft-jsonrpc = { path = "crates/jsonrpc" }
craft-mcp = { path = "crates/mcp" }
craft-jxl = { path = "crates/jxl" }
+4
View File
@@ -120,6 +120,10 @@ See the [release notes](CHANGELOG.md) for included functionality and known limit
pages and version detection, and written back; and `model`, the drawing above the tags (header
variables, tables, blocks, layouts, entities) and its writer (R12 to 2018), merged from CADCraft's and VectorCraft's readers. Bounded
on hostile input. Mapping the model onto a document stays in each app.
- [`craft-deckcraft-format`](crates/deckcraft-format/README.md): the DeckCraft `.deckcraft` package:
identity and sniffing, the `presentation.json` envelope with the presentation as a type
parameter, NaN-safe JSON and the reader for older files with `null` numbers, member names and
compression, and bounded, budgeted member reads. The presentation model and its mapping stay in DeckCraft.
- [`craft-dwg`](crates/dwg/README.md): bounded byte-level DWG↔DXF conversion with diagnostics,
capped output and an optional child-process worker; the `acadrust` dependency remains isolated
behind bytes and is unavailable on wasm32 and FreeBSD/aarch64.
+1 -1
View File
@@ -21,7 +21,7 @@
//! transition's name) are not in the specification; they were first written by FilmCraft and keep
//! their names so that existing files read back.
pub(crate) mod bento;
pub mod bento;
mod read;
mod write;
+18 -7
View File
@@ -35,8 +35,8 @@
use std::collections::{BTreeMap, HashMap};
pub(crate) const MAGIC: [u8; 8] = [0xA4, b'C', b'M', 0xA5, b'H', b'd', b'r', 0xD7];
pub(crate) const LABEL_SIZE: usize = 24;
pub const MAGIC: [u8; 8] = [0xA4, b'C', b'M', 0xA5, b'H', b'd', b'r', 0xD7];
pub const LABEL_SIZE: usize = 24;
// standard object ids
const TOC_OBJECT: u32 = 1;
@@ -82,7 +82,7 @@ const MAX_VALUE_BYTES: usize = 16 << 20;
const MAX_NAME_BYTES: usize = 4 << 20;
/// Builds a Bento container.
pub(crate) struct Writer {
pub struct Writer {
data: Vec<u8>,
names: HashMap<(u32, String), u32>,
next: u32,
@@ -90,6 +90,12 @@ pub(crate) struct Writer {
entries: Vec<(u32, u32, u32, Vec<Seg>)>,
}
impl Default for Writer {
fn default() -> Self {
Self::new()
}
}
impl Writer {
pub fn new() -> Writer {
Writer { data: Vec::new(), names: HashMap::new(), next: MIN_USER_ID, entries: Vec::new() }
@@ -217,9 +223,9 @@ pub(crate) struct Prop {
}
/// A parsed Bento container.
pub(crate) struct Container<'a> {
pub struct Container<'a> {
data: &'a [u8],
pub objects: BTreeMap<u32, Vec<Prop>>,
pub(crate) objects: BTreeMap<u32, Vec<Prop>>,
names: HashMap<u32, String>,
by_name: HashMap<String, u32>,
}
@@ -229,11 +235,16 @@ fn be32(b: &[u8], at: usize) -> Option<u32> {
}
/// Whether `b` ends with a Bento label.
pub(crate) fn sniff(b: &[u8]) -> bool {
pub fn sniff(b: &[u8]) -> bool {
b.len() >= LABEL_SIZE && b[b.len() - LABEL_SIZE..b.len() - LABEL_SIZE + 8] == MAGIC
}
impl<'a> Container<'a> {
/// Object identifiers in ascending order.
pub fn object_ids(&self) -> impl Iterator<Item = u32> + '_ {
self.objects.keys().copied()
}
pub fn open(data: &'a [u8]) -> Result<Container<'a>, String> {
if !sniff(data) {
return Err("no Bento label at the end of the file".into());
@@ -324,7 +335,7 @@ impl<'a> Container<'a> {
}
/// The bytes of a value.
pub fn value(&self, p: &Prop) -> Result<Vec<u8>, String> {
pub(crate) fn value(&self, p: &Prop) -> Result<Vec<u8>, String> {
let total = p.segs.iter().try_fold(0usize, |total, s| {
let len = match s {
Seg::Imm(b) => b.len(),
+27
View File
@@ -0,0 +1,27 @@
use craft_aaf::omf::bento::{Container, Writer, sniff};
#[test]
fn external_consumer_reads_named_values_and_references() {
let mut writer = Writer::new();
let first = writer.new_object();
let second = writer.new_object();
writer.set(first, "test:value", "test:type", b"long value");
writer.set_references(first, &[second]);
let bytes = writer.finish();
assert!(sniff(&bytes));
let container = Container::open(&bytes).unwrap();
assert!(container.object_ids().any(|id| id == first));
assert_eq!(container.get(first, "test:value").as_deref(), Some(b"long value".as_slice()));
assert_eq!(container.resolve(first, second), second);
assert!(Container::open(&bytes[..bytes.len() - 1]).is_err());
}
#[test]
fn default_writer_builds_a_readable_empty_container() -> Result<(), String> {
let bytes = Writer::default().finish();
let container = Container::open(&bytes)?;
let ids: Vec<_> = container.object_ids().collect();
assert!(!ids.is_empty());
assert!(ids.windows(2).all(|pair| pair[0] < pair[1]));
Ok(())
}
+10 -6
View File
@@ -1,6 +1,6 @@
[package]
name = "craft-audio"
description = "Audio file I/O and codecs: WAV/AIFF read and write, FLAC encoder, AAC and ALAC decoders and encoders, AC-3/E-AC-3 decoder and encoder, MP3 decoder and encoder, Opus decoder and encoder, MP1/MP2 decoders."
description = "Audio file I/O and codecs: WAV/AIFF read and write, FLAC encoder, AAC and ALAC decoders and encoders, AC-3/E-AC-3 decoder and encoder, MP3 decoder and encoder, Opus decoder and encoder, Vorbis encoder, MP1/MP2 decoders."
version.workspace = true
edition.workspace = true
license.workspace = true
@@ -29,10 +29,13 @@ encode = ["lossless-encode", "aac-encode", "alac-encode", "ac3-encode", "eac3-en
lossless-encode = ["pcm-encode", "flac-encode"]
# Encode WAV/BWF/RF64 and AIFF/AIFF-C files.
pcm-encode = []
# Decode FLAC files and frames natively (`flac::decode`, `flac::Decoder`).
flac-decode = []
# Encode FLAC files.
flac-encode = ["craft-media/bitstream"]
# Encode Ogg Vorbis files (desktop only: builds the reference libvorbis from its C sources).
vorbis-encode = ["dep:vorbis_rs"]
# The pure-Rust Vorbis encoder (`vorbis::encoder`) and Ogg Vorbis files through `encode` and
# `encode_ogg_vorbis`.
vorbis-encode = ["craft-media/ogg"]
# Codec modules on their own, for packet-level use.
aac-decode = ["craft-media/bitstream"]
# The AAC encoder (`aac::Encoder`), and AAC in M4A through `encode` and `FileEncoder`.
@@ -72,9 +75,6 @@ rayon = { workspace = true, optional = true }
# symphonia keeps its AAC decoder for AAC in CAF, a container craft-media does not read.
symphonia = { version = "0.6.1", optional = true, default-features = false, features = ["mp3", "flac", "vorbis", "ogg", "wav", "pcm", "aiff", "isomp4", "aac", "alac", "adpcm", "caf", "mkv"] }
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
vorbis_rs = { version = "0.5", optional = true }
[dev-dependencies]
craft-media-testkit = { workspace = true }
proptest = { workspace = true }
@@ -88,6 +88,10 @@ required-features = ["decode", "lossless-encode", "peaks"]
name = "codecs"
required-features = ["decode", "encode"]
[[test]]
name = "flac_decode"
required-features = ["flac-decode", "flac-encode"]
[[test]]
name = "qoa_oracle"
required-features = ["qoa"]
+31 -3
View File
@@ -29,14 +29,16 @@ No default features. The shared types (`AudioBuffer`, `AudioInfo`, `ChannelLayou
| `decode` | `decode`, `probe`, `Decoder`, `tracks`, `TrackDecoder`; every format in [Format support](#format-support) | `decode-native`, `symphonia` |
| `decode-native` | the same, native formats only (others are `Unsupported`); `wav_pcm`, `aiff_pcm` (a file's integer PCM bit for bit, as `RawPcm`) | the six decoders below, craft-media `isobmff`/`matroska`/`ogg`, `log` |
| `symphonia` | the fallback for formats with no native decoder; turning it on is the same as `decode` | `decode-native`, symphonia |
| `encode` | every encoder, and every format of `encode` and `FileEncoder` | `lossless-encode`, `aac-encode`, `alac-encode`, `ac3-encode`, `eac3-encode`, `mp3-encode`, `opus-encode` |
| `encode` | every encoder, and every format of `encode` and `FileEncoder` | `lossless-encode`, `aac-encode`, `alac-encode`, `ac3-encode`, `eac3-encode`, `mp3-encode`, `opus-encode`, `vorbis-encode` |
| `lossless-encode` | WAV, AIFF and FLAC writing | `pcm-encode`, `flac-encode` |
| `pcm-encode` | `encode`, `FileEncoder` for WAV and AIFF; `wav_float_header`; `pcm_wav_file`, `pcm_wav_header`, `pcm_aiff_file`, `pcm_aiff_header` (minimal files around integer PCM bytes, for essence embedded in AAF / OMF) | none |
| `flac-decode` | `flac::decode` (whole `.flac` files) and `flac::Decoder` (single frames, for callers that demux FLAC themselves); native, CRC-checked, 4 to 32 bits. `decode` still uses symphonia for FLAC files | none |
| `flac-encode` | `encode`, `FileEncoder` for FLAC; `flac::Encoder`, the packet encoder for callers that mux FLAC themselves | craft-media `bitstream` |
| `aac-decode`, `aac-encode` | `aac::Decoder`, `aac::Encoder`; with `aac-decode`, `aac::latm_config` / `latm_split` for LOAS / LATM frames (AAC in MPEG transport streams); with `aac-encode`, `encode`, `FileEncoder` for AAC in M4A | craft-media `bitstream`; `aac-encode` also `isobmff` |
| `alac-decode` | `alac::Decoder` | none |
| `alac-encode` | `alac::Encoder`; `encode`, `FileEncoder` for ALAC in M4A | craft-media `isobmff` |
| `opus-decode`, `opus-encode` | `opus::Decoder`/`StreamDecoder`, `opus::Encoder` | none |
| `vorbis-encode` | `vorbis::encoder::Encoder` (pure Rust); `encode_ogg_vorbis`, `encode_ogg` and `encode` for Ogg Vorbis files (whole buffer; not `FileEncoder`) | craft-media `ogg` |
| `ac3-decode` | `ac3::Decoder`, `ac3::ProgrammeDecoder` | craft-media `bitstream` |
| `ac3-encode`, `eac3-encode` | `ac3::encoder::Encoder`; `encode`, `FileEncoder` for AC-3 and E-AC-3 streams | craft-media `bitstream` |
| `mpa-decode` | `mpa::Decoder` | craft-media `bitstream` |
@@ -355,8 +357,12 @@ let pre_skip = enc.pre_skip(); // samples the player drops at the start
The encoder takes 48 kHz only, and craft-audio has no resampler.
craft-media has no Ogg muxer, so `.opus` files cannot be written yet; Opus goes into
Matroska/WebM or MP4:
Opus goes into Ogg, Matroska/WebM or MP4:
- **Ogg (`.opus`):** `craft_media::ogg::PageWriter` with `head` and `opus_tags` as the two header
packets, each packet's granule position the samples decoded so far (pre-skip included, as
the input above starts with it), and `finish(Some(pre_skip + length))` to trim the end
(RFC 7845 §4).
- **Matroska/WebM:** `head` is the track's `CodecPrivate`, and the pre-skip goes in
`TrackSpec::codec_delay_ns` (in nanoseconds at 48 kHz). The Matroska muxer cannot write
@@ -368,6 +374,27 @@ Matroska/WebM or MP4:
timescale), `segment_duration` the audio's length (movie timescale), `media_rate`
`0x0001_0000`.
### Encode Ogg Vorbis
```rust
use craft_audio::{OggVorbisOptions, encode_ogg_vorbis};
// 1–8 channels in Vorbis order (5.1: L C R Ls Rs LFE), any sample rate.
let opts = OggVorbisOptions::new(6.0).with_tag("TITLE", "Take 3").with_tag("ARTIST", "Me");
let ogg: Vec<u8> = encode_ogg_vorbis(&buf, &opts)?;
```
The encoder is pure Rust (`vorbis::encoder`, from FilmCraft #4481) and builds for wasm32. Quality
runs from -1 to 10 at a variable bit rate: about 18 kbit/s per channel at -1, 100 at 6 and 140
at 10 on music. `encode` with `EncodeFormat::Ogg` takes a WAV-order layout and writes it in
Vorbis order; its `RateControl::Bitrate` (64–500 kbit/s) picks the quality whose nominal rate
that is (`quality_for_bitrate`), and `RateControl::Quality` 0.0–1.0 is quality -1 to 10. For
streaming, feed `vorbis::encoder::Encoder` and write its packets with `craft_media::ogg::PageWriter`
(identification, `vorbis_comment`, setup, then the audio with each packet's granule position).
Not yet: short blocks (transients may pre-echo), channel coupling (stereo costs
about twice mono) and bit-rate management.
### Waveform overviews
```rust
@@ -704,6 +731,7 @@ the full tests with ffmpeg and the vectors required.
| MP3 encoder | FilmCraft `filmcraft-mp3enc` [4bec22b](https://github.com/storytold/filmcraft/commit/4bec22bd03bd1d995c9cf72e02a284f96d3d72cd) |
| ALAC | Apple's reference implementation [macosforge/alac@c38887c](https://github.com/macosforge/alac/tree/c38887c5c5e64a4b31108733bd79ca9b2496d987/codec), Copyright © 2011 Apple Inc., Apache-2.0; ported to Rust and modified (see the `alac` module docs and [NOTICE](../../NOTICE)) |
| Opus encoder | EffectCraft `effectcraft-opusenc` [c618429](https://github.com/storytold/effectcraft/commit/c618429252587525a2a6d4b5bccbe4ec5261e1b9) |
| Vorbis encoder | FilmCraft `filmcraft-vorbis` by @JordyUSA ([storytold/filmcraft#4481](https://github.com/storytold/filmcraft/pull/4481)), with partitions of whole sample frames so libvorbis reads surround |
Where apps had overlapping implementations, the one that measured better was kept, with the
tests of both:
+603
View File
@@ -0,0 +1,603 @@
//! A native FLAC decoder (RFC 9639): [`decode`] for whole `.flac` files and [`Decoder`] for single
//! frames (the packets of FLAC in MP4, Matroska or Ogg).
//!
//! Every frame is checked against its CRC-8 and CRC-16. Subframe types constant, verbatim, fixed
//! and LPC; Rice partitions with 4- and 5-bit parameters and escaped partitions; wasted bits;
//! left/side, side/right and mid/side stereo; fixed and variable block sizes; 4 to 32 bits per
//! sample. The STREAMINFO MD5 is not verified.
//!
//! Samples come back as `i32`, one `Vec` per channel, in the FLAC channel order.
/// What went wrong decoding FLAC.
#[non_exhaustive]
#[derive(Debug, Clone, PartialEq, Eq, thiserror::Error)]
pub enum DecodeError {
/// The data ends early.
#[error("truncated FLAC data")]
Truncated,
/// The data is not valid FLAC.
#[error("invalid FLAC data: {0}")]
Invalid(&'static str),
/// A frame or header failed its CRC.
#[error("FLAC CRC mismatch in {0}")]
Crc(&'static str),
/// Valid FLAC that is not decoded.
#[error("unsupported FLAC feature: {0}")]
Unsupported(&'static str),
/// The stream is longer than the sample limit.
#[error("FLAC stream exceeds the sample limit")]
TooLarge,
}
/// `Result` of this module.
pub type Result<T> = std::result::Result<T, DecodeError>;
/// The STREAMINFO metadata block (RFC 9639 section 8.2).
#[derive(Debug, Clone, Copy, PartialEq, Eq)]
pub struct StreamInfo {
/// Smallest block size in samples.
pub min_block_size: u16,
/// Largest block size in samples.
pub max_block_size: u16,
/// Smallest frame in bytes, 0 if unknown.
pub min_frame_size: u32,
/// Largest frame in bytes, 0 if unknown.
pub max_frame_size: u32,
/// Sample rate in Hz.
pub sample_rate: u32,
/// Channel count, 1 to 8.
pub channels: u8,
/// Bits per sample, 4 to 32.
pub bits_per_sample: u8,
/// Samples per channel in the stream, 0 if unknown.
pub total_samples: u64,
/// MD5 of the unencoded audio, all zero if not set.
pub md5: [u8; 16],
}
impl StreamInfo {
/// Parse the 34 bytes of a STREAMINFO block body.
pub fn parse(b: &[u8]) -> Result<StreamInfo> {
let b = b.get(..34).ok_or(DecodeError::Truncated)?;
let packed = u64::from_be_bytes([b[10], b[11], b[12], b[13], b[14], b[15], b[16], b[17]]);
let info = StreamInfo {
min_block_size: u16::from_be_bytes([b[0], b[1]]),
max_block_size: u16::from_be_bytes([b[2], b[3]]),
min_frame_size: u32::from_be_bytes([0, b[4], b[5], b[6]]),
max_frame_size: u32::from_be_bytes([0, b[7], b[8], b[9]]),
sample_rate: (packed >> 44) as u32,
channels: ((packed >> 41) & 7) as u8 + 1,
bits_per_sample: ((packed >> 36) & 31) as u8 + 1,
total_samples: packed & 0xF_FFFF_FFFF,
md5: b[18..34].try_into().map_err(|_| DecodeError::Truncated)?,
};
if info.bits_per_sample < 4 {
return Err(DecodeError::Invalid("bits per sample below 4"));
}
if info.min_block_size != 0
&& (info.min_block_size < 16 && info.min_block_size != info.max_block_size || info.max_block_size < info.min_block_size)
{
return Err(DecodeError::Invalid("inconsistent block sizes"));
}
Ok(info)
}
}
/// One decoded frame.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Frame {
/// Sample rate in Hz.
pub sample_rate: u32,
/// Bits per sample.
pub bits_per_sample: u8,
/// `true` when `number` is the first sample's index (variable block size), `false` when it is
/// the frame's index (fixed block size).
pub variable_block_size: bool,
/// The coded number of the frame header.
pub number: u64,
/// Samples per channel in the frame.
pub block_size: usize,
/// One `Vec` per channel, after undoing any stereo decorrelation.
pub channels: Vec<Vec<i32>>,
/// Bytes the frame took, including the header and CRC footer.
pub size: usize,
}
// ---- checksums ----
fn crc8(data: &[u8]) -> u8 {
let mut crc = 0u8;
for &b in data {
crc ^= b;
for _ in 0..8 {
crc = if crc & 0x80 != 0 { crc << 1 ^ 0x07 } else { crc << 1 };
}
}
crc
}
fn crc16(data: &[u8]) -> u16 {
let mut crc = 0u16;
for &b in data {
crc ^= u16::from(b) << 8;
for _ in 0..8 {
crc = if crc & 0x8000 != 0 { crc << 1 ^ 0x8005 } else { crc << 1 };
}
}
crc
}
// ---- bits ----
struct Bits<'a> {
data: &'a [u8],
/// Position in bits.
pos: usize,
}
impl<'a> Bits<'a> {
fn new(data: &'a [u8]) -> Self {
Bits { data, pos: 0 }
}
fn left(&self) -> usize {
self.data.len() * 8 - self.pos
}
fn bit(&mut self) -> Result<u32> {
let byte = *self.data.get(self.pos / 8).ok_or(DecodeError::Truncated)?;
let v = (byte >> (7 - self.pos % 8)) & 1;
self.pos += 1;
Ok(u32::from(v))
}
/// `n` bits (0 to 32) as an unsigned number.
fn bits(&mut self, n: u32) -> Result<u64> {
if n as usize > self.left() {
return Err(DecodeError::Truncated);
}
let mut v = 0u64;
let mut n = n as usize;
while n > 0 {
let byte = u64::from(self.data[self.pos / 8]);
let avail = 8 - self.pos % 8;
let take = avail.min(n);
v = v << take | (byte >> (avail - take)) & ((1 << take) - 1);
self.pos += take;
n -= take;
}
Ok(v)
}
/// `n` bits (0 to 33) as a two's complement number.
fn signed(&mut self, n: u32) -> Result<i64> {
if n == 0 {
return Ok(0);
}
let v = self.bits(n)? as i64;
Ok(if v >> (n - 1) & 1 == 1 { v - (1 << n) } else { v })
}
/// Zero bits up to the next one bit (which is consumed).
fn unary(&mut self) -> Result<u64> {
let mut n = 0u64;
loop {
// Skip whole zero bytes when aligned.
if self.pos.is_multiple_of(8) {
while self.data.get(self.pos / 8) == Some(&0) {
self.pos += 8;
n += 8;
}
}
if self.bit()? == 1 {
return Ok(n);
}
n += 1;
}
}
fn align(&mut self) {
self.pos = self.pos.div_ceil(8) * 8;
}
}
// ---- frame ----
const BLOCK_SIZES: [usize; 16] = [0, 192, 576, 1152, 2304, 4608, 0, 0, 256, 512, 1024, 2048, 4096, 8192, 16384, 32768];
/// A frame decoder. `info` supplies what a frame header leaves to the STREAMINFO.
#[derive(Debug, Clone, Copy, Default)]
pub struct Decoder {
info: Option<StreamInfo>,
}
impl Decoder {
/// A decoder with the stream's STREAMINFO (needed for frames whose header defers the sample
/// rate or bit depth to it).
pub fn new(info: StreamInfo) -> Decoder {
Decoder { info: Some(info) }
}
/// A decoder without STREAMINFO: frames that defer to it are an error.
pub fn without_streaminfo() -> Decoder {
Decoder { info: None }
}
/// Decode the frame at the start of `data`.
pub fn decode_frame(&self, data: &[u8]) -> Result<Frame> {
// StreamInfo has public fields: container callers can construct it without
// parse(), so validate before it can control shifts and sample reads.
if self.info.is_some_and(|i| !(4..=32).contains(&i.bits_per_sample) || !(1..=8).contains(&i.channels) || i.sample_rate == 0) {
return Err(DecodeError::Invalid("invalid decoder STREAMINFO"));
}
let mut r = Bits::new(data);
if r.bits(15)? != 0x7FFC {
return Err(DecodeError::Invalid("missing frame sync code"));
}
let variable = r.bit()? == 1;
let (bs_code, sr_code) = (r.bits(4)? as usize, r.bits(4)? as usize);
let (ch_code, bps_code) = (r.bits(4)? as usize, r.bits(3)? as usize);
if r.bit()? != 0 {
return Err(DecodeError::Invalid("reserved bit set"));
}
let number = coded_number(&mut r)?;
let block_size = match bs_code {
0 => return Err(DecodeError::Invalid("reserved block size")),
6 => r.bits(8)? as usize + 1,
7 => r.bits(16)? as usize + 1,
c => BLOCK_SIZES[c],
};
let sample_rate = match sr_code {
0 => self.info.map(|i| i.sample_rate).ok_or(DecodeError::Invalid("sample rate only in STREAMINFO"))?,
1 => 88_200,
2 => 176_400,
3 => 192_000,
4 => 8_000,
5 => 16_000,
6 => 22_050,
7 => 24_000,
8 => 32_000,
9 => 44_100,
10 => 48_000,
11 => 96_000,
12 => r.bits(8)? as u32 * 1000,
13 => r.bits(16)? as u32,
14 => r.bits(16)? as u32 * 10,
_ => return Err(DecodeError::Invalid("forbidden sample rate code")),
};
let header_len = r.pos.div_ceil(8);
let stored_crc = r.bits(8)? as u8;
if crc8(&data[..header_len]) != stored_crc {
return Err(DecodeError::Crc("a frame header"));
}
let bits = match bps_code {
0 => self.info.map(|i| u32::from(i.bits_per_sample)).ok_or(DecodeError::Invalid("bit depth only in STREAMINFO"))?,
1 => 8,
2 => 12,
4 => 16,
5 => 20,
6 => 24,
7 => 32,
_ => return Err(DecodeError::Invalid("reserved bit depth")),
};
let (channels, mode) = match ch_code {
0..=7 => (ch_code + 1, Stereo::Independent),
8 => (2, Stereo::LeftSide),
9 => (2, Stereo::SideRight),
10 => (2, Stereo::MidSide),
_ => return Err(DecodeError::Invalid("reserved channel assignment")),
};
let mut out: Vec<Vec<i64>> = Vec::with_capacity(channels);
for c in 0..channels {
let extra = match (mode, c) {
(Stereo::LeftSide, 1) | (Stereo::SideRight, 0) | (Stereo::MidSide, 1) => 1,
_ => 0,
};
out.push(subframe(&mut r, block_size, bits + extra)?);
}
r.align();
let size = r.pos / 8;
let crc = r.bits(16)? as u16;
if crc16(&data[..size]) != crc {
return Err(DecodeError::Crc("a frame"));
}
let size = size + 2;
if mode != Stereo::Independent {
let (first, rest) = out.split_at_mut(1);
let (a, b) = (&mut first[0], &mut rest[0]);
for (x, y) in a.iter_mut().zip(b.iter_mut()) {
match mode {
Stereo::LeftSide => *y = x.wrapping_sub(*y),
Stereo::SideRight => *x = x.wrapping_add(*y),
_ => {
let m = x.wrapping_shl(1) | (*y & 1);
let side = *y;
*x = m.wrapping_add(side) >> 1;
*y = m.wrapping_sub(side) >> 1;
}
}
}
}
let mut chans = Vec::with_capacity(channels);
for c in out {
let v: Result<Vec<i32>> = c.into_iter().map(|s| checked_sample(s, bits)).collect();
chans.push(v?);
}
Ok(Frame { sample_rate, bits_per_sample: bits as u8, variable_block_size: variable, number, block_size, channels: chans, size })
}
}
#[derive(Clone, Copy, PartialEq, Eq)]
enum Stereo {
Independent,
LeftSide,
SideRight,
MidSide,
}
/// The UTF-8-like coded number of a frame header (up to 36 bits, 7 bytes).
fn coded_number(r: &mut Bits) -> Result<u64> {
let first = r.bits(8)? as u8;
let extra = match first {
0x00..=0x7F => return Ok(u64::from(first)),
0xC0..=0xDF => 1,
0xE0..=0xEF => 2,
0xF0..=0xF7 => 3,
0xF8..=0xFB => 4,
0xFC..=0xFD => 5,
0xFE => 6,
_ => return Err(DecodeError::Invalid("bad coded number")),
};
let mut v = if extra == 6 { 0 } else { u64::from(first & (0x3F >> extra)) };
for _ in 0..extra {
let b = r.bits(8)?;
if b & 0xC0 != 0x80 {
return Err(DecodeError::Invalid("bad coded number"));
}
v = v << 6 | (b & 0x3F);
}
Ok(v)
}
/// One subframe: `bits` is the frame bit depth (plus 1 for a side channel).
fn subframe(r: &mut Bits, n: usize, bits: u32) -> Result<Vec<i64>> {
if r.bit()? != 0 {
return Err(DecodeError::Invalid("subframe header padding bit set"));
}
let kind = r.bits(6)? as u32;
let wasted = if r.bit()? == 1 { r.unary()? as u32 + 1 } else { 0 };
if wasted >= bits {
return Err(DecodeError::Invalid("wasted bits leave no sample bits"));
}
let bps = bits - wasted;
let mut s = vec![0i64; n];
match kind {
0 => {
let v = r.signed(bps)?;
s.fill(v);
}
1 => {
for v in s.iter_mut() {
*v = r.signed(bps)?;
}
}
8..=12 => {
let order = (kind - 8) as usize;
warmup(r, &mut s, order, bps)?;
residual(r, &mut s, order)?;
for i in order..n {
let at = |k: usize| s[i - k];
// Wrapping: hostile residuals can overflow; such samples fail the range check later.
let p = match order {
0 => 0,
1 => at(1),
2 => at(1).wrapping_mul(2).wrapping_sub(at(2)),
3 => at(1).wrapping_mul(3).wrapping_sub(at(2).wrapping_mul(3)).wrapping_add(at(3)),
_ => at(1).wrapping_mul(4).wrapping_sub(at(2).wrapping_mul(6)).wrapping_add(at(3).wrapping_mul(4)).wrapping_sub(at(4)),
};
s[i] = s[i].wrapping_add(p);
}
}
32..=63 => {
let order = (kind - 31) as usize;
warmup(r, &mut s, order, bps)?;
let precision = r.bits(4)? as u32 + 1;
if precision == 16 {
return Err(DecodeError::Invalid("forbidden coefficient precision"));
}
let shift = r.signed(5)?;
if shift < 0 {
return Err(DecodeError::Invalid("negative prediction shift"));
}
let mut coefs = [0i64; 32];
for c in coefs.iter_mut().take(order) {
*c = r.signed(precision)?;
}
residual(r, &mut s, order)?;
for i in order..n {
let mut sum = 0i64;
for (k, &c) in coefs.iter().take(order).enumerate() {
sum = sum.wrapping_add(c.wrapping_mul(s[i - 1 - k]));
}
s[i] = s[i].wrapping_add(sum >> shift);
}
}
_ => return Err(DecodeError::Invalid("reserved subframe type")),
}
if wasted > 0 {
for v in s.iter_mut() {
*v = v.wrapping_shl(wasted);
}
}
Ok(s)
}
fn warmup(r: &mut Bits, s: &mut [i64], order: usize, bps: u32) -> Result<()> {
if order > s.len() {
return Err(DecodeError::Invalid("predictor order above the block size"));
}
for v in s.iter_mut().take(order) {
*v = r.signed(bps)?;
}
Ok(())
}
/// The coded residual (RFC 9639 section 9.2.7), into `s[order..]`.
fn residual(r: &mut Bits, s: &mut [i64], order: usize) -> Result<()> {
let method = r.bits(2)?;
let (param_bits, escape) = match method {
0 => (4, 15),
1 => (5, 31),
_ => return Err(DecodeError::Invalid("reserved residual coding method")),
};
let part_order = r.bits(4)? as u32;
let n = s.len();
let parts = 1usize << part_order;
if !n.is_multiple_of(parts) {
return Err(DecodeError::Invalid("partition order does not divide the block size"));
}
let per = n >> part_order;
if per < order {
return Err(DecodeError::Invalid("partition shorter than the predictor order"));
}
let mut i = order;
for p in 0..parts {
let count = if p == 0 { per - order } else { per };
let k = r.bits(param_bits)? as u32;
if k == escape {
let width = r.bits(5)? as u32;
for v in s[i..i + count].iter_mut() {
*v = r.signed(width)?;
}
} else {
for v in s[i..i + count].iter_mut() {
let q = r.unary()?;
if q > (1 << 32) {
return Err(DecodeError::Invalid("Rice quotient too large"));
}
let low = r.bits(k)?;
let folded = q << k | low;
*v = if folded & 1 == 0 { (folded >> 1) as i64 } else { -((folded >> 1) as i64) - 1 };
}
}
i += count;
}
Ok(())
}
// ---- files ----
/// A decoded file.
#[derive(Debug, Clone, PartialEq, Eq)]
pub struct Decoded {
/// The STREAMINFO block.
pub info: StreamInfo,
/// One `Vec` of samples per channel.
pub channels: Vec<Vec<i32>>,
}
/// Most sample values (samples x channels) [`decode`] will produce.
pub const DEFAULT_MAX_VALUES: u64 = 1 << 28;
/// Decode a whole `.flac` file (an ID3v2 tag in front is skipped).
pub fn decode(bytes: &[u8]) -> Result<Decoded> {
decode_with_limit(bytes, DEFAULT_MAX_VALUES)
}
/// [`decode`] with a limit on the sample values (samples x channels) produced.
pub fn decode_with_limit(bytes: &[u8], max_values: u64) -> Result<Decoded> {
let mut pos = 0usize;
if bytes.starts_with(b"ID3") {
let size = bytes.get(6..10).ok_or(DecodeError::Truncated)?;
if size.iter().any(|&b| b & 0x80 != 0) {
return Err(DecodeError::Invalid("bad ID3v2 size"));
}
pos = 10 + size.iter().fold(0usize, |a, &b| a << 7 | usize::from(b));
}
if bytes.get(pos..pos + 4) != Some(b"fLaC") {
return Err(DecodeError::Invalid("missing fLaC marker"));
}
pos += 4;
let mut info: Option<StreamInfo> = None;
loop {
let head = bytes.get(pos..pos + 4).ok_or(DecodeError::Truncated)?;
let last = head[0] & 0x80 != 0;
let kind = head[0] & 0x7F;
let len = usize::from(head[1]) << 16 | usize::from(head[2]) << 8 | usize::from(head[3]);
let body = bytes.get(pos + 4..pos + 4 + len).ok_or(DecodeError::Truncated)?;
match (kind, &info) {
(0, None) => info = Some(StreamInfo::parse(body)?),
(0, Some(_)) => return Err(DecodeError::Invalid("a second STREAMINFO block")),
(_, None) => return Err(DecodeError::Invalid("STREAMINFO is not the first block")),
(127, _) => return Err(DecodeError::Invalid("forbidden metadata block type")),
_ => {}
}
pos += 4 + len;
if last {
break;
}
}
let info = info.ok_or(DecodeError::Invalid("no STREAMINFO"))?;
let dec = Decoder::new(info);
let mut channels: Vec<Vec<i32>> = vec![Vec::new(); usize::from(info.channels)];
let mut total = 0u64;
while pos + 2 <= bytes.len() && bytes[pos] == 0xFF && bytes[pos + 1] & 0xFE == 0xF8 {
let frame = dec.decode_frame(&bytes[pos..])?;
if frame.channels.len() != channels.len() {
return Err(DecodeError::Invalid("the channel count changes inside the stream"));
}
// One file has one sample rate and depth. Otherwise callers would play
// samples under incompatible STREAMINFO metadata.
if frame.sample_rate != info.sample_rate || frame.bits_per_sample != info.bits_per_sample {
return Err(DecodeError::Invalid("frame format differs from STREAMINFO"));
}
total += frame.block_size as u64;
if total.saturating_mul(channels.len() as u64) > max_values {
return Err(DecodeError::TooLarge);
}
for (dst, src) in channels.iter_mut().zip(frame.channels) {
dst.extend_from_slice(&src);
}
pos += frame.size;
}
// Unknown total_samples must not turn a corrupt/truncated next frame into
// a successfully decoded shorter recording.
if pos != bytes.len() {
return Err(DecodeError::Invalid("trailing data or missing frame sync"));
}
if info.total_samples != 0 && total != info.total_samples {
return Err(DecodeError::Truncated);
}
Ok(Decoded { info, channels })
}
// Validate the advertised precision, not just the storage type. Malformed
// predictors may produce an i32 that is still invalid for 4–24-bit audio.
fn checked_sample(sample: i64, bits: u32) -> Result<i32> {
if !(4..=32).contains(&bits) {
return Err(DecodeError::Invalid("invalid sample bit depth"));
}
let bound = 1i64 << (bits - 1);
if !(-bound..bound).contains(&sample) {
return Err(DecodeError::Invalid("sample outside the bit depth"));
}
i32::try_from(sample).map_err(|_| DecodeError::Invalid("sample outside the bit depth"))
}
#[cfg(test)]
mod sample_bounds_tests {
use super::checked_sample;
#[test]
fn samples_must_fit_declared_precision() {
for bits in 4..=32 {
let bound = 1i64 << (bits - 1);
assert_eq!(checked_sample(-bound, bits).map(i64::from), Ok(-bound));
assert_eq!(checked_sample(bound - 1, bits).map(i64::from), Ok(bound - 1));
assert!(checked_sample(-bound - 1, bits).is_err());
assert!(checked_sample(bound, bits).is_err());
}
assert!(checked_sample(0, 0).is_err());
assert!(checked_sample(0, 255).is_err());
}
}
+34 -15
View File
@@ -13,6 +13,8 @@
//! demuxers and [`TrackDecoder`]; everything else (FLAC, Vorbis, CAF, ADPCM, A-law, µ-law) through
//! `symphonia`, which is to be replaced by native decoders. Feature `decode-native` is the
//! same without symphonia.
//! - [`encode_ogg_vorbis`] and [`vorbis::encoder`] (feature `vorbis-encode`): Ogg Vorbis files
//! and Vorbis packets from a pure-Rust encoder, 1 to 8 channels, quality -1 to 10, with tags.
//! - [`TrackDecoder`] (any decoder feature): one track's packets from any demuxer to planar
//! `f32` in WAV channel order.
//! - [`encode`], [`FileEncoder`]: WAV/BWF/RF64 and AIFF/AIFF-C (feature `pcm-encode`, which also
@@ -27,8 +29,8 @@
//! - Codec modules for packet-level use, each with its own features: [`aac`] (`aac-decode`,
//! `aac-encode`), [`alac`] (`alac-decode`, `alac-encode`), [`opus`] (`opus-decode`, and
//! [`opus::encoder`] with `opus-encode`), [`ac3`] (`ac3-decode`), [`mpa`] (`mpa-decode`), [`mp3`]
//! (`mp3-decode`, `mp3-encode`), [`flac`] (`flac-encode`: the packet encoder), [`qoa`]
//! (`qoa-decode`, `qoa-encode`: whole QOA files).
//! (`mp3-decode`, `mp3-encode`), [`flac`] (`flac-decode`: the frame and file decoder;
//! `flac-encode`: the packet encoder), [`qoa`] (`qoa-decode`, `qoa-encode`: whole QOA files).
//!
//! The shared types below build with no features.
@@ -56,8 +58,12 @@ pub mod qoa;
mod read;
#[cfg(any(feature = "aac-decode", feature = "alac-decode", feature = "opus-decode", feature = "ac3-decode", feature = "mpa-decode"))]
mod track;
#[cfg(feature = "vorbis-encode")]
pub mod vorbis;
#[cfg(any(feature = "decode-native", feature = "pcm-encode"))]
mod wav;
/// Bounded WAV/RF64 cue, adtl and XMP marker metadata, without audio decoding.
pub mod wav_markers;
#[cfg(any(
feature = "pcm-encode",
feature = "flac-encode",
@@ -70,10 +76,12 @@ mod wav;
))]
mod write;
/// Interleaved PCM packet decoding.
pub mod pcm_interleaved;
/// Range-backed PCM WAVE access and a 16-bit PCM writer.
pub mod wav_range;
#[cfg(feature = "vorbis-encode")]
pub use write::{OGG_BITRATES, encode_ogg};
pub use write::{OGG_BITRATES, OggVorbisOptions, encode_ogg, encode_ogg_vorbis, quality_for_bitrate};
/// The FLAC packet encoder (RFC 9639), for a caller that muxes FLAC itself (into MP4, Matroska or
/// its own `.flac` writer): planar integer samples in, frames out, and the STREAMINFO to patch in
@@ -94,10 +102,15 @@ pub use write::{OGG_BITRATES, encode_ogg};
/// assert!(file.len() < 48_000 * 2 * 2 / 2); // well under half of 16-bit PCM
/// # Ok::<(), craft_audio::flac::Error>(())
/// ```
#[cfg(feature = "flac-encode")]
#[cfg(any(feature = "flac-encode", feature = "flac-decode"))]
pub mod flac {
#[cfg(feature = "flac-decode")]
pub use crate::flac_decode::{DEFAULT_MAX_VALUES, DecodeError, Decoded, Decoder, Frame, StreamInfo, decode, decode_with_limit};
#[cfg(feature = "flac-encode")]
pub use crate::write::flac::encoder::{Encoder, EncoderConfig, Error, STREAMINFO_OFFSET};
}
#[cfg(feature = "flac-decode")]
mod flac_decode;
pub use buffer::AudioBuffer;
/// The craft-media this crate is built with, for its containers: using it rather than a separate
@@ -276,7 +289,9 @@ pub enum EncodeFormat {
Ac3,
/// An E-AC-3 stream: up to 7.1 at 32, 44.1 or 48 kHz.
Eac3,
/// Ogg Vorbis, whole-buffer encoding only.
/// Ogg Vorbis, 1–8 channels at any sample rate, whole-buffer encoding only. Variable bit
/// rate: a [`RateControl::Bitrate`] picks the quality whose nominal rate it is
/// ([`quality_for_bitrate`]), [`RateControl::Quality`] sets it directly.
Ogg,
}
@@ -377,7 +392,7 @@ impl EncodeFormat {
EncodeFormat::Mp3 => cfg!(feature = "mp3-encode"),
EncodeFormat::Ac3 => cfg!(feature = "ac3-encode"),
EncodeFormat::Eac3 => cfg!(feature = "eac3-encode"),
EncodeFormat::Ogg => cfg!(all(feature = "vorbis-encode", not(target_arch = "wasm32"))),
EncodeFormat::Ogg => cfg!(feature = "vorbis-encode"),
}
}
@@ -398,9 +413,9 @@ impl EncodeFormat {
pub fn max_channels(self) -> u16 {
match self {
EncodeFormat::Wav | EncodeFormat::Aiff => 32_767,
EncodeFormat::Flac | EncodeFormat::Aac | EncodeFormat::Alac | EncodeFormat::Eac3 => 8,
EncodeFormat::Flac | EncodeFormat::Aac | EncodeFormat::Alac | EncodeFormat::Eac3 | EncodeFormat::Ogg => 8,
EncodeFormat::Ac3 => 6,
EncodeFormat::Mp3 | EncodeFormat::Ogg => 2,
EncodeFormat::Mp3 => 2,
}
}
@@ -414,7 +429,10 @@ impl EncodeFormat {
EncodeFormat::Aac => &[&[0x4], &[0x3], &[0x7], &[0x107], &[0x607], &[0x60F], &[0x70F], &[0xFF]],
// Apple's layout tags for 1–8 channels, surrounds as back speakers.
EncodeFormat::Alac => &[&[0x4], &[0x3], &[0x7], &[0x107], &[0x37], &[0x3F], &[0x13F], &[0xFF]],
EncodeFormat::Mp3 | EncodeFormat::Ogg => &[&[0x4], &[0x3]],
EncodeFormat::Mp3 => &[&[0x4], &[0x3]],
// The Vorbis I §4.3.9 layouts for 1–8 channels (6.1 with a back centre and sides, 7.1
// with sides and backs), written in Vorbis order.
EncodeFormat::Ogg => &[&[0x4], &[0x3], &[0x7], &[0x33], &[0x37], &[0x3F], &[0x70F], &[0x63F]],
// The coding modes 1/0 to 3/2 with and without an LFE, by channel count.
EncodeFormat::Ac3 => &[&[0x4], &[0x3, 0xC], &[0x7, 0x103, 0xB], &[0x107, 0x603, 0xF, 0x10B], &[0x607, 0x10F, 0x60B], &[0x60F]],
// The same, and 7.1 with backs and sides.
@@ -456,10 +474,10 @@ impl EncodeFormat {
}
}
/// Whether the format takes [`RateControl::Quality`]: AAC. The other lossy formats are
/// written at a constant bit rate only.
/// Whether the format takes [`RateControl::Quality`]: AAC and Ogg Vorbis. The other lossy
/// formats are written at a constant bit rate only.
pub fn supports_quality(self) -> bool {
self == EncodeFormat::Aac
matches!(self, EncodeFormat::Aac | EncodeFormat::Ogg)
}
/// Whether the format loses audio: AAC, MP3, AC-3 and E-AC-3. These take
@@ -478,11 +496,12 @@ pub enum RateControl {
/// set of rates (MP3, AC-3) uses the highest one not above it; a rate outside what the
/// stream can carry is moved to the nearest one inside. AAC is written at 6 kbit/s or a
/// quarter of the sample rate per channel at least: from about half of that down its encoder
/// codes silence. Vorbis treats this as a VBR target (64–500 kbit/s), falling back to
/// a quality preset when that target is unsupported; it does not promise a constant bitrate.
/// codes silence. Vorbis takes 64–500 kbit/s and writes the quality whose nominal rate that is
/// ([`quality_for_bitrate`]); its rate varies with the audio.
Bitrate(u32),
/// A constant quality from 0.0 (smallest) to 1.0 (best), at whatever bit rate each frame
/// needs. AAC only; values outside the range are clamped, and NaN is an error.
/// needs. AAC and Vorbis (0.0 is Vorbis quality -1, 1.0 quality 10); values outside the range
/// are clamped, and NaN is an error.
Quality(f32),
}
+1 -135
View File
@@ -4,141 +4,7 @@
//! producing the N/2 "folded" time samples; the window overlap region is then unfolded against the
//! folded tail of the previous block, which the caller keeps in place in the output buffer.
#[derive(Clone, Copy, Default, Debug)]
pub struct Cpx {
pub re: f32,
pub im: f32,
}
impl Cpx {
#[inline]
fn mul(self, o: Cpx) -> Cpx {
Cpx { re: self.re * o.re - self.im * o.im, im: self.re * o.im + self.im * o.re }
}
#[inline]
fn add(self, o: Cpx) -> Cpx {
Cpx { re: self.re + o.re, im: self.im + o.im }
}
#[inline]
fn sub(self, o: Cpx) -> Cpx {
Cpx { re: self.re - o.re, im: self.im - o.im }
}
}
/// Mixed-radix (2, 3, 4, 5) forward complex FFT, unscaled. Radix 2, 3 and 4 use dedicated
/// butterflies; radix 5 uses a generic one.
pub struct Fft {
n: usize,
factors: Vec<usize>,
twiddle: Vec<Cpx>,
}
impl Fft {
pub fn new(n: usize) -> Fft {
let mut factors = Vec::new();
let mut m = n;
for p in [4usize, 2, 3, 5] {
while m.is_multiple_of(p) {
factors.push(p);
m /= p;
}
}
assert_eq!(m, 1, "unsupported FFT size {n}");
let twiddle = (0..n)
.map(|k| {
let ph = -2.0 * std::f64::consts::PI * k as f64 / n as f64;
Cpx { re: ph.cos() as f32, im: ph.sin() as f32 }
})
.collect();
Fft { n, factors, twiddle }
}
pub fn process(&self, data: &mut [Cpx], scratch: &mut Vec<Cpx>) {
scratch.clear();
scratch.extend_from_slice(&data[..self.n]);
self.rec(&mut data[..self.n], scratch, 1, self.n, 0, 1);
}
fn rec(&self, out: &mut [Cpx], inp: &[Cpx], in_stride: usize, n: usize, fi: usize, tw_stride: usize) {
let p = self.factors[fi];
let m = n / p;
if m == 1 {
for (i, o) in out.iter_mut().enumerate().take(p) {
*o = inp[i * in_stride];
}
} else {
for q in 0..p {
self.rec(&mut out[q * m..(q + 1) * m], &inp[q * in_stride..], in_stride * p, m, fi + 1, tw_stride * p);
}
}
let tw = &self.twiddle;
match p {
2 => {
for k in 0..m {
let a0 = out[k];
let a1 = out[m + k].mul(tw[k * tw_stride]);
out[k] = a0.add(a1);
out[m + k] = a0.sub(a1);
}
}
4 => {
for k in 0..m {
let t0 = out[k];
let t1 = out[m + k].mul(tw[k * tw_stride]);
let t2 = out[2 * m + k].mul(tw[2 * k * tw_stride]);
let t3 = out[3 * m + k].mul(tw[3 * k * tw_stride]);
let s0 = t0.add(t2);
let d0 = t0.sub(t2);
let s1 = t1.add(t3);
let d1 = t1.sub(t3);
out[k] = s0.add(s1);
out[2 * m + k] = s0.sub(s1);
// -j * d1 = (d1.im, -d1.re)
out[m + k] = Cpx { re: d0.re + d1.im, im: d0.im - d1.re };
out[3 * m + k] = Cpx { re: d0.re - d1.im, im: d0.im + d1.re };
}
}
3 => {
// sin(-2*pi/3) = -sqrt(3)/2
let h = tw[self.n / 3].im;
for k in 0..m {
let t0 = out[k];
let t1 = out[m + k].mul(tw[k * tw_stride]);
let t2 = out[2 * m + k].mul(tw[2 * k * tw_stride]);
let s = t1.add(t2);
let d = t1.sub(t2);
let a = Cpx { re: t0.re - 0.5 * s.re, im: t0.im - 0.5 * s.im };
out[k] = t0.add(s);
// j * h * d = (-h * d.im, h * d.re)
out[m + k] = Cpx { re: a.re - h * d.im, im: a.im + h * d.re };
out[2 * m + k] = Cpx { re: a.re + h * d.im, im: a.im - h * d.re };
}
}
_ => {
// Radix 5 (at most once per transform): generic butterfly with the five roots of
// unity looked up once.
let mut w5 = [Cpx::default(); 5];
for (q, w) in w5.iter_mut().enumerate() {
*w = tw[q * (self.n / p)];
}
let mut t = [Cpx::default(); 5];
for k in 0..m {
t[0] = out[k];
for q in 1..p {
t[q] = out[q * m + k].mul(tw[q * k * tw_stride]);
}
for q2 in 0..p {
let mut acc = t[0];
for q in 1..p {
acc = acc.add(t[q].mul(w5[(q * q2) % p]));
}
out[q2 * m + k] = acc;
}
}
}
}
}
}
use crate::opus::fft::{Cpx, Fft};
pub struct Imdct {
/// Full MDCT length (2x the number of coefficients).
+19 -327
View File
@@ -1,272 +1,45 @@
//! Pulse cache and bit allocation (RFC 6716 §4.3.3, §4.3.4.1).
use super::tables::{ALLOC, EBANDS, LOG2_FRAC_TABLE, MAX_LM, NB_EBANDS, OVERLAP};
use super::tables::{EBANDS, LOG2_FRAC_TABLE, MAX_LM, NB_EBANDS, OVERLAP};
use crate::opus::decode::range::{BITRES, RangeDecoder};
const MAX_PSEUDO: i32 = 40;
const LOG_MAX_PSEUDO: i32 = 6;
pub use crate::opus::rate_common::get_pulses;
#[cfg(test)]
use crate::opus::rate_common::log2_frac;
#[cfg(test)]
pub use crate::opus::rate_common::pvq_v;
pub const MAX_FINE_BITS: i32 = 8;
const FINE_OFFSET: i32 = 21;
pub const QTHETA_OFFSET: i32 = 4;
pub const QTHETA_OFFSET_TWOPHASE: i32 = 16;
const ALLOC_STEPS: i32 = 6;
/// Number of pulses represented by pseudo-pulse index `i`.
pub fn get_pulses(i: i32) -> i32 {
if i < 8 { i } else { (8 + (i & 7)) << ((i >> 3) - 1) }
}
/// Conservative (rounded up) log2 of `val` with `frac` fractional bits.
pub fn log2_frac(mut val: u32, mut frac: u32) -> i32 {
let mut l = crate::opus::decode::range::ilog(val);
if val & val.wrapping_sub(1) != 0 {
if l > 16 {
val = ((val - 1) >> (l - 16)) + 1;
} else {
val <<= 16 - l;
}
let mut l = (l - 1) << frac;
loop {
let b = (val >> 16) as i32;
l += b << frac;
val = (val + b as u32) >> b;
val = (val * val + 0x7FFF) >> 15;
if frac == 0 {
break;
}
frac -= 1;
}
l + (val > 0x8000) as i32
} else {
l -= 1;
l << frac
}
}
/// PVQ codebook size V(N, K) as u128 (saturating far above 2^32).
pub fn pvq_v(n: usize, k: usize) -> u128 {
// V(N,K) = V(N-1,K) + V(N,K-1) + V(N-1,K-1); computed row by row.
if k == 0 {
return 1;
}
if n == 0 {
return 0;
}
let mut row = vec![0u128; k + 1]; // V(0, k)
row[0] = 1;
for _ in 0..n {
let mut prev_diag = row[0]; // V(n-1, 0)
// V(n, 0) = 1
for kk in 1..=k {
let up = row[kk]; // V(n-1, kk)
let v = up.saturating_add(row[kk - 1]).saturating_add(prev_diag);
prev_diag = up;
row[kk] = v.min(u128::MAX >> 8);
}
row[0] = 1;
}
row[k]
}
fn fits_in32(n: usize, k: i32) -> bool {
pvq_v(n, k as usize) <= u32::MAX as u128
}
/// Precomputed per-mode data shared by all CELT decoders.
/// Decoder mode: shared allocation tables and decoder-specific inverse transforms.
pub struct Mode {
/// log2 of band width in 1/8 bits.
pub log_n: [i32; NB_EBANDS],
/// Index into `cache_bits` for `(LM+1)*NB_EBANDS + band` (-1 when unused).
pub cache_index: Vec<i16>,
/// `cache[0]` = max pseudo-pulses; `cache[k]` = bits(k) - 1 in 1/8 bits.
pub cache_bits: Vec<u8>,
/// Per-band maximum allocation: `[(2*LM + C-1)*NB_EBANDS + band]`.
pub caps: Vec<u8>,
core: crate::opus::rate_common::Mode,
pub window: [f32; OVERLAP],
pub mdct: [super::mdct::Imdct; MAX_LM + 1],
}
impl Mode {
pub fn new() -> Mode {
let mut log_n = [0i32; NB_EBANDS];
for (i, l) in log_n.iter_mut().enumerate() {
*l = log2_frac((EBANDS[i + 1] - EBANDS[i]) as u32, BITRES);
}
let (cache_index, cache_bits) = compute_pulse_cache(MAX_LM as i32);
let mut m = Mode {
log_n,
cache_index,
cache_bits,
caps: Vec::new(),
pub fn new() -> Self {
let mut mode = Self {
core: crate::opus::rate_common::Mode::new(),
window: [0.0; OVERLAP],
mdct: [super::mdct::Imdct::new(1920), super::mdct::Imdct::new(960), super::mdct::Imdct::new(480), super::mdct::Imdct::new(240)],
};
m.caps = compute_caps(&m);
for i in 0..OVERLAP {
let x = std::f64::consts::FRAC_PI_2 * (i as f64 + 0.5) / OVERLAP as f64;
let s = x.sin();
m.window[i] = (std::f64::consts::FRAC_PI_2 * s * s).sin() as f32;
mode.window[i] = (std::f64::consts::FRAC_PI_2 * s * s).sin() as f32;
}
m
}
#[inline]
pub fn cache(&self, lm: i32, band: usize) -> &[u8] {
let idx = self.cache_index[((lm + 1) as usize) * NB_EBANDS + band];
&self.cache_bits[idx.max(0) as usize..]
}
pub fn bits2pulses(&self, band: usize, lm: i32, bits: i32) -> i32 {
let cache = self.cache(lm, band);
let mut lo = 0i32;
let mut hi = cache[0] as i32;
let bits = bits - 1;
for _ in 0..LOG_MAX_PSEUDO {
let mid = (lo + hi + 1) >> 1;
if cache[mid as usize] as i32 >= bits {
hi = mid;
} else {
lo = mid;
}
}
let lo_bits = if lo == 0 { -1 } else { cache[lo as usize] as i32 };
if bits - lo_bits <= cache[hi as usize] as i32 - bits { lo } else { hi }
}
pub fn pulses2bits(&self, band: usize, lm: i32, pulses: i32) -> i32 {
if pulses == 0 { 0 } else { self.cache(lm, band)[pulses as usize] as i32 + 1 }
}
/// Per-band allocation caps for this frame (`init_caps`).
pub fn init_caps(&self, lm: usize, c: usize) -> [i32; NB_EBANDS] {
let mut cap = [0i32; NB_EBANDS];
for (i, cp) in cap.iter_mut().enumerate() {
let n = (EBANDS[i + 1] - EBANDS[i]) << lm;
*cp = ((self.caps[NB_EBANDS * (2 * lm + c - 1) + i] as i32 + 64) * c as i32 * n) >> 2;
}
cap
mode
}
}
fn compute_pulse_cache(lm_max: i32) -> (Vec<i16>, Vec<u8>) {
let nb = NB_EBANDS;
let rows = (lm_max + 2) as usize;
let mut index = vec![-1i16; nb * rows];
let mut entries: Vec<(usize, i32, usize)> = Vec::new(); // (N, K, offset)
let mut curr = 0usize;
for i in 0..rows {
for j in 0..nb {
let n = (((EBANDS[j + 1] - EBANDS[j]) << i) >> 1) as usize;
index[i * nb + j] = -1;
// Reuse the entry of an earlier band with the same size.
'search: for k in 0..=i {
for nn in 0..nb {
if k == i && nn >= j {
break;
}
if n == (((EBANDS[nn + 1] - EBANDS[nn]) << k) >> 1) as usize {
index[i * nb + j] = index[k * nb + nn];
break 'search;
}
}
}
if index[i * nb + j] == -1 && n != 0 {
let mut k = 0;
while k < MAX_PSEUDO && fits_in32(n, get_pulses(k + 1)) {
k += 1;
}
index[i * nb + j] = curr as i16;
entries.push((n, k, curr));
curr += (k + 1) as usize;
}
}
impl std::ops::Deref for Mode {
type Target = crate::opus::rate_common::Mode;
fn deref(&self) -> &Self::Target {
&self.core
}
let mut bits = vec![0u8; curr];
for &(n, k, off) in &entries {
let maxk = get_pulses(k) as usize;
let tmp = required_bits(n, maxk, BITRES);
for j in 1..=k {
bits[off + j as usize] = (tmp[get_pulses(j) as usize] - 1) as u8;
}
bits[off] = k as u8;
}
(index, bits)
}
/// Bits (1/2^frac units, rounded up) needed for each K in `0..=maxk` for dimension `n`.
fn required_bits(n: usize, maxk: usize, frac: u32) -> Vec<i32> {
let mut out = vec![0i32; maxk + 1];
if n == 1 {
for o in out.iter_mut().skip(1) {
*o = 1 << frac;
}
} else {
for (k, o) in out.iter_mut().enumerate().skip(1) {
let v = pvq_v(n, k);
*o = log2_frac(v as u32, frac);
}
}
out
}
fn compute_caps(m: &Mode) -> Vec<u8> {
let nb = NB_EBANDS;
let mut caps = vec![0u8; (MAX_LM + 1) * 2 * nb];
for i in 0..=MAX_LM as i32 {
for c in 1..=2i32 {
for j in 0..nb {
let mut n0 = EBANDS[j + 1] - EBANDS[j];
let max_bits = if n0 << i == 1 {
(c * (1 + MAX_FINE_BITS)) << BITRES
} else {
let mut lm0 = 0;
if n0 > 2 {
n0 >>= 1;
lm0 -= 1;
} else if n0 <= 1 {
lm0 = i.min(1);
n0 <<= lm0;
}
let pcache = m.cache(lm0, j);
let mut mb = pcache[pcache[0] as usize] as i32 + 1;
let mut n = n0;
for k in 0..(i - lm0) {
mb <<= 1;
let offset = ((m.log_n[j] + ((lm0 + k) << BITRES)) >> 1) - QTHETA_OFFSET;
let num = 459 * ((2 * n - 1) * offset + mb);
let den = ((2 * n - 1) << 9) - 459;
let qb = ((num + (den >> 1)) / den).min(57);
mb += qb;
n <<= 1;
}
if c == 2 {
mb <<= 1;
let offset = ((m.log_n[j] + (i << BITRES)) >> 1) - if n == 2 { QTHETA_OFFSET_TWOPHASE } else { QTHETA_OFFSET };
let ndof = 2 * n - 1 - (n == 2) as i32;
let p = if n == 2 { 512 } else { 487 };
let num = p * (mb + ndof * offset);
let den = (ndof << 9) - p;
let qb = ((num + (den >> 1)) / den).min(if n == 2 { 64 } else { 61 });
mb += qb;
}
let ndof = c * n + if c == 2 && n > 2 { 1 } else { 0 };
let mut offset = ((m.log_n[j] + (i << BITRES)) >> 1) - FINE_OFFSET;
if n == 2 {
offset += (1 << BITRES) >> 2;
}
let num = mb + ndof * offset;
let den = (ndof - 1) << BITRES;
let qb = ((num + (den >> 1)) / den).min(MAX_FINE_BITS);
mb += (c * qb) << BITRES;
mb
};
let w = c * ((EBANDS[j + 1] - EBANDS[j]) << i);
let v = (4 * max_bits / w) - 64;
caps[((i * 2 + c - 1) as usize) * nb + j] = v.clamp(0, 255) as u8;
}
}
}
caps
}
/// Result of the allocation process.
@@ -296,89 +69,8 @@ pub struct AllocationInput<'a, 'd> {
pub fn compute_allocation(input: AllocationInput<'_, '_>) -> Allocation {
let AllocationInput { mode: m, start, end, offsets, cap, trim: alloc_trim, total, channels: c, lm, decoder: dec } = input;
let ci = c as i32;
let lmi = lm as i32;
let mut total = total.max(0);
let mut skip_start = start;
let skip_rsv = if total >= 1 << BITRES { 1 << BITRES } else { 0 };
total -= skip_rsv;
let mut intensity_rsv = 0;
let mut dual_stereo_rsv = 0;
if c == 2 {
intensity_rsv = LOG2_FRAC_TABLE[end - start];
if intensity_rsv > total {
intensity_rsv = 0;
} else {
total -= intensity_rsv;
dual_stereo_rsv = if total >= 1 << BITRES { 1 << BITRES } else { 0 };
total -= dual_stereo_rsv;
}
}
let mut bits1 = [0i32; NB_EBANDS];
let mut bits2 = [0i32; NB_EBANDS];
let mut thresh = [0i32; NB_EBANDS];
let mut trim_offset = [0i32; NB_EBANDS];
for j in start..end {
let w = EBANDS[j + 1] - EBANDS[j];
thresh[j] = (ci << BITRES).max(((3 * w) << lmi << BITRES) >> 4);
trim_offset[j] = (ci * w * (alloc_trim - 5 - lmi) * (end as i32 - j as i32 - 1) * (1 << (lmi + BITRES as i32))) >> 6;
if w << lmi == 1 {
trim_offset[j] -= ci << BITRES;
}
}
let nb_alloc = ALLOC.len() as i32;
let mut lo = 1;
let mut hi = nb_alloc - 1;
loop {
let mut done = false;
let mut psum = 0;
let mid = (lo + hi) >> 1;
for j in (start..end).rev() {
let n = EBANDS[j + 1] - EBANDS[j];
let mut bitsj = (ci * n * (ALLOC[mid as usize][j] as i32)) << lmi >> 2;
if bitsj > 0 {
bitsj = (bitsj + trim_offset[j]).max(0);
}
bitsj += offsets[j];
if bitsj >= thresh[j] || done {
done = true;
psum += bitsj.min(cap[j]);
} else if bitsj >= ci << BITRES {
psum += ci << BITRES;
}
}
if psum > total {
hi = mid - 1;
} else {
lo = mid + 1;
}
if lo > hi {
break;
}
}
hi = lo;
lo -= 1;
for j in start..end {
let n = EBANDS[j + 1] - EBANDS[j];
let mut bits1j = (ci * n * (ALLOC[lo as usize][j] as i32)) << lmi >> 2;
let mut bits2j = if hi >= nb_alloc { cap[j] } else { (ci * n * (ALLOC[hi as usize][j] as i32)) << lmi >> 2 };
if bits1j > 0 {
bits1j = (bits1j + trim_offset[j]).max(0);
}
if bits2j > 0 {
bits2j = (bits2j + trim_offset[j]).max(0);
}
if lo > 0 {
bits1j += offsets[j];
}
bits2j += offsets[j];
if offsets[j] > 0 {
skip_start = j;
}
bits2j = (bits2j - bits1j).max(0);
bits1[j] = bits1j;
bits2[j] = bits2j;
}
let crate::opus::rate_common::Bracket { skip_start, bits1, bits2, thresh, total, skip_rsv, intensity_rsv, dual_stereo_rsv } =
crate::opus::rate_common::bracket(start, end, offsets, cap, alloc_trim, total, c, lm);
interp_bits2pulses(InterpPulsesInput {
mode: m,
start,
@@ -14,6 +14,7 @@ pub const MAX_LM: usize = 3;
pub const PREEMPH: f32 = 0.850_006_1;
/// Static allocation table (Table 57), indexed `[quality][band]`, in 1/32 bit per MDCT bin.
#[cfg(not(feature = "opus-encode"))]
pub const ALLOC: [[u8; NB_EBANDS]; 11] = transpose([
[0, 90, 110, 118, 126, 134, 144, 152, 162, 172, 200],
[0, 80, 100, 110, 119, 127, 137, 145, 155, 165, 200],
@@ -38,6 +39,7 @@ pub const ALLOC: [[u8; NB_EBANDS]; 11] = transpose([
[0, 0, 0, 0, 0, 1, 1, 1, 1, 20, 104],
]);
#[cfg(not(feature = "opus-encode"))]
const fn transpose(t: [[u8; 11]; NB_EBANDS]) -> [[u8; NB_EBANDS]; 11] {
let mut out = [[0u8; NB_EBANDS]; 11];
let mut b = 0;
+1 -19
View File
@@ -4,25 +4,7 @@
//! RFC 6716 Table 54 (and the integer delays used when no rate conversion is needed), so that the
//! SILK output lines up with the CELT layer in Hybrid mode.
/// Dot product with eight independent partial sums, so the additions pipeline and the loop
/// vectorises instead of waiting on one 4-cycle add chain. Rounds differently from a
/// sequential sum (the resampler is not normative).
#[inline]
fn dot8(a: &[f32], b: &[f32]) -> f32 {
let mut s = [0f32; 8];
let (ca, ra) = a.as_chunks::<8>();
let (cb, rb) = b.as_chunks::<8>();
for (x, y) in ca.iter().zip(cb) {
for l in 0..8 {
s[l] += x[l] * y[l];
}
}
let mut acc = ((s[0] + s[4]) + (s[1] + s[5])) + ((s[2] + s[6]) + (s[3] + s[7]));
for (x, y) in ra.iter().zip(rb) {
acc += x * y;
}
acc
}
use crate::opus::dot::dot8;
#[derive(Clone)]
pub struct Resampler {
+20
View File
@@ -0,0 +1,20 @@
//! Shared fixed-order FIR dot product.
/// Dot product with eight independent partial sums, which the compiler can vectorise (a single
/// running sum is bound by the latency of the float addition). The sums are combined pairwise.
#[inline]
pub(super) fn dot8(a: &[f32], b: &[f32]) -> f32 {
let mut s = [0f32; 8];
let (ca, ra) = a.as_chunks::<8>();
let (cb, rb) = b.as_chunks::<8>();
for (x, y) in ca.iter().zip(cb) {
for l in 0..8 {
s[l] += x[l] * y[l];
}
}
let mut acc = ((s[0] + s[4]) + (s[1] + s[5])) + ((s[2] + s[6]) + (s[3] + s[7]));
for (x, y) in ra.iter().zip(rb) {
acc += x * y;
}
acc
}
+282 -59
View File
@@ -8,7 +8,8 @@
use crate::opus::encoder::range::{BITRES, RangeEncoder, ilog};
use crate::opus::encoder::rate::{Mode, QTHETA_OFFSET, get_pulses};
use crate::opus::encoder::tables::{EBANDS, NB_EBANDS};
use crate::opus::encoder::tables::EBANDS;
use crate::opus::encoder::{CeltFrame, rate::Allocation};
pub const SPREAD_NORMAL: usize = 2;
@@ -55,7 +56,7 @@ fn exp_rotation1_inv(x: &mut [f32], len: usize, stride: usize, c: f32, s: f32) {
if len <= stride {
return;
}
if len >= 2 * stride + 1 {
if len > 2 * stride {
for i in 0..=len - 2 * stride - 1 {
let x1 = x[i];
let x2 = x[i + stride];
@@ -96,12 +97,24 @@ pub fn exp_rotation_inv(x: &mut [f32], len: usize, k: usize, spread: usize) {
}
}
/// Relative slack for the pulse-candidate filter in [`pvq_search`]: far above the f32 rounding of
/// the filter score (a few 1e-7), far below the spread of real scores.
const PVQ_SCORE_SLACK: f32 = 1e-5;
/// Greedy PVQ search: the integer vector `y` with `sum |y| = k` closest in direction to `x`.
pub fn pvq_search(x: &[f32], k: usize, y: &mut [i32]) {
let n = x.len();
y[..n].fill(0);
let abs: Vec<f32> = x.iter().map(|v| v.abs()).collect();
let sum: f32 = abs.iter().sum();
// `abs`, `dy` (2 y + 1, infinite in the padding) and the per-pass scores `score`, each padded to
// whole 8-lane chunks.
let np = n.next_multiple_of(8);
let mut buf = vec![0f32; 3 * np];
let (abs, rest) = buf.split_at_mut(np);
let (dy, score) = rest.split_at_mut(np);
for (a, v) in abs.iter_mut().zip(x) {
*a = v.abs();
}
let sum: f32 = abs[..n].iter().sum();
if !sum.is_finite() || sum <= 1e-15 {
y[0] = k as i32;
return;
@@ -113,30 +126,69 @@ pub fn pvq_search(x: &[f32], k: usize, y: &mut [i32]) {
// Pre-project onto the pyramid (rounding down) and place the rest greedily.
let r = (k as f32 - 1.0) / sum;
for j in 0..n {
let p = (abs[j] * r).floor() as i32;
// Non-negative and at most k, so the truncating cast is the floor.
let p = (abs[j] * r) as i32;
y[j] = p;
placed += p as usize;
xy += abs[j] * p as f32;
yy += (p * p) as f32;
}
}
for j in 0..np {
dy[j] = if j < n { 2.0 * y[j] as f32 + 1.0 } else { f32::INFINITY };
}
while placed < k {
// Vectorisable scores (xy + |x_j|)^2 / (yy + 2 y_j + 1) and their maximum.
for ((sc, &a), &d) in score.iter_mut().zip(abs.iter()).zip(dy.iter()) {
let t = xy + a;
*sc = t * t / (yy + d);
}
let mut lane_max = [0f32; 8];
for c in score.as_chunks::<8>().0 {
for i in 0..8 {
lane_max[i] = if c[i] > lane_max[i] { c[i] } else { lane_max[i] };
}
}
let top = lane_max.iter().fold(0f32, |m, &v| if v > m { v } else { m });
// The exact cross-multiplied test below, in index order with the first maximum winning, only
// matters for entries within rounding distance of the top score: every other entry is beaten
// by the top one whenever it is reached and never beats it afterwards. Running the test on
// those alone therefore picks the same pulse as running it on all of them.
let filter = top > 1e-30 && top.is_finite();
let lo = top * (1.0 - PVQ_SCORE_SLACK);
// Usually exactly one entry qualifies; its index falls out of a lane-wise count.
let mut count = [0u32; 8];
let mut index = [0u32; 8];
for (ci, c) in score.as_chunks::<8>().0.iter().enumerate() {
for i in 0..8 {
let hit = u32::from(c[i] >= lo);
count[i] += hit;
index[i] += hit * (ci * 8 + i) as u32;
}
}
let mut best = 0usize;
let mut best_num = -1f32;
let mut best_den = 1f32;
for j in 0..n {
let num = xy + abs[j];
let num = num * num;
let den = yy + 2.0 * y[j] as f32 + 1.0;
if num * best_den > best_num * den {
best_num = num;
best_den = den;
best = j;
if filter && count.iter().sum::<u32>() == 1 {
best = index.iter().sum::<u32>() as usize;
} else {
let mut best_num = -1f32;
let mut best_den = 1f32;
for j in 0..n {
if !filter || score[j] >= lo {
let num = xy + abs[j];
let num = num * num;
let den = yy + 2.0 * y[j] as f32 + 1.0;
if num * best_den > best_num * den {
best_num = num;
best_den = den;
best = j;
}
}
}
}
xy += abs[best];
yy += 2.0 * y[best] as f32 + 1.0;
y[best] += 1;
dy[best] = 2.0 * y[best] as f32 + 1.0;
placed += 1;
}
for j in 0..n {
@@ -146,25 +198,45 @@ pub fn pvq_search(x: &[f32], k: usize, y: &mut [i32]) {
}
}
/// Encodes the PVQ codeword `y` (`sum |y| = k`) as the index the RFC 6716 §4.3.4.2 decoder maps
/// back to `y`.
pub fn encode_pulses(y: &[i32], k: usize, enc: &mut RangeEncoder, v: &mut Vec<u64>) {
let n = y.len();
let w = k + 1;
v.clear();
v.resize((n + 1) * w, 0);
/// Largest band width and pulse count the encoder codes (176 coefficients, `get_pulses(40)` = 128).
const PVQ_MAX_N: usize = 176;
const PVQ_MAX_K: usize = 128;
/// Row-major `V(n, k)` for `n <= max_n`, `k <= max_k` with row stride `max_k + 1`, saturated at
/// `u32::MAX` (a codebook that large is never coded, see `rate::fits_in32`).
fn build_pvq_table(max_n: usize, max_k: usize) -> Vec<u32> {
let w = max_k + 1;
let mut v = vec![0u32; (max_n + 1) * w];
v[0] = 1;
for nn in 1..=n {
for nn in 1..=max_n {
v[nn * w] = 1;
for kk in 1..=k {
let a = v[(nn - 1) * w + kk];
let b = v[nn * w + kk - 1];
let c = v[(nn - 1) * w + kk - 1];
v[nn * w + kk] = a.saturating_add(b).saturating_add(c);
for kk in 1..=max_k {
let sum = v[(nn - 1) * w + kk] as u64 + v[nn * w + kk - 1] as u64 + v[(nn - 1) * w + kk - 1] as u64;
v[nn * w + kk] = sum.min(u32::MAX as u64) as u32;
}
}
let total = v[n * w + k];
let vv = |nn: usize, kx: usize| v[nn * w + kx];
v
}
fn pvq_table() -> &'static [u32] {
static TABLE: std::sync::OnceLock<Vec<u32>> = std::sync::OnceLock::new();
TABLE.get_or_init(|| build_pvq_table(PVQ_MAX_N, PVQ_MAX_K))
}
/// Encodes the PVQ codeword `y` (`sum |y| = k`) as the index the RFC 6716 §4.3.4.2 decoder maps
/// back to `y`.
pub fn encode_pulses(y: &[i32], k: usize, enc: &mut RangeEncoder) {
let n = y.len();
// Shapes outside the coded range (never produced by the band layout) get a local table.
let local;
let (v, w) = if n <= PVQ_MAX_N && k <= PVQ_MAX_K {
(pvq_table(), PVQ_MAX_K + 1)
} else {
local = build_pvq_table(n, k);
(&local[..], k + 1)
};
let row = |nn: usize| &v[nn * w..(nn + 1) * w];
let total = row(n)[k] as u64;
let mut index = 0u64;
let mut kk = k;
for j in 0..n {
@@ -173,10 +245,11 @@ pub fn encode_pulses(y: &[i32], k: usize, enc: &mut RangeEncoder, v: &mut Vec<u6
}
let rem = n - j;
let t = y[j].unsigned_abs() as usize;
let below = row(rem - 1);
// Codewords with |y_j| = t start at sum_{m < kk - t} V(rem-1, m) within their sign half.
let mut base: u64 = (0..kk - t).map(|m| vv(rem - 1, m)).sum();
let mut base: u64 = below[..kk - t].iter().map(|&x| x as u64).sum();
if y[j] < 0 {
base += (vv(rem - 1, kk) + vv(rem, kk)) / 2;
base += (below[kk] as u64 + row(rem)[kk] as u64) / 2;
}
index += base;
kk -= t;
@@ -193,7 +266,6 @@ pub struct BandEnc<'m, 'e> {
pub i: usize,
pub spread: usize,
pub remaining_bits: i32,
pvq_v: Vec<u64>,
iy: Vec<i32>,
tmp: Vec<f32>,
}
@@ -217,7 +289,7 @@ impl BandEnc<'_, '_> {
let q = qn as u32;
let half = q >> 1;
let ft = (half + 1) * (half + 1);
let (fl, fs) = if it <= half { (it * (it + 1) >> 1, it + 1) } else { (ft - ((q + 1 - it) * (q + 2 - it) >> 1), q + 1 - it) };
let (fl, fs) = if it <= half { ((it * (it + 1)) >> 1, it + 1) } else { (ft - (((q + 1 - it) * (q + 2 - it)) >> 1), q + 1 - it) };
self.enc.encode(fl, fl + fs, ft);
itheta = ((it * 16384) / q) as i32;
}
@@ -287,36 +359,29 @@ impl BandEnc<'_, '_> {
iy.clear();
iy.resize(n, 0);
pvq_search(&tmp, k, &mut iy);
encode_pulses(&iy, k, self.enc, &mut self.pvq_v);
encode_pulses(&iy, k, self.enc);
self.iy = iy;
self.tmp = tmp;
}
}
}
/// Codes all band shapes (`quant_all_bands`, encoder side, long blocks). `x` holds `c` channels
/// of `n` normalised MDCT coefficients each.
#[allow(clippy::too_many_arguments)]
pub fn quant_all_bands(
m: &Mode,
start: usize,
end: usize,
x: &[f32],
n_total: usize,
c: usize,
pulses: &[i32; NB_EBANDS],
spread: usize,
dual_stereo: bool,
intensity: usize,
total_bits: i32,
mut balance: i32,
enc: &mut RangeEncoder,
lm: usize,
coded_bands: usize,
) {
/// Shape-coding controls, independent of the selected band allocation.
pub struct BandCoding {
pub spread: usize,
pub total_bits: i32,
}
/// Codes all band shapes (`quant_all_bands`, encoder side, long blocks). `x` holds
/// `frame.channels` channels of `n_total` normalised MDCT coefficients each.
pub fn quant_all_bands(m: &Mode, frame: CeltFrame, x: &[f32], n_total: usize, allocation: &Allocation, coding: BandCoding, enc: &mut RangeEncoder) {
let CeltFrame { start, end, channels: c, lm } = frame;
let Allocation { pulses, dual_stereo, intensity, coded_bands, balance, .. } = allocation;
let (dual_stereo, intensity, coded_bands, mut balance) = (*dual_stereo, *intensity, *coded_bands, *balance);
let BandCoding { spread, total_bits } = coding;
let mm = 1usize << lm;
debug_assert!(c == 1 || dual_stereo || intensity <= start, "stereo frames are coded as dual stereo");
let mut ctx = BandEnc { m, enc, i: 0, spread, remaining_bits: 0, pvq_v: Vec::new(), iy: Vec::new(), tmp: Vec::new() };
let mut ctx = BandEnc { m, enc, i: 0, spread, remaining_bits: 0, iy: Vec::new(), tmp: Vec::new() };
for i in start..end {
ctx.i = i;
let xo = mm * EBANDS[i] as usize;
@@ -362,7 +427,7 @@ mod tests {
x[i + stride] = c * x2 + s * x1;
x[i] = c * x1 + ms * x2;
}
if len >= 2 * stride + 1 {
if len > 2 * stride {
for i in (0..=len - 2 * stride - 1).rev() {
let x1 = x[i];
let x2 = x[i + stride];
@@ -466,12 +531,11 @@ mod tests {
#[test]
fn pvq_index_roundtrip_exhaustive() {
let mut v = Vec::new();
for n in 1..6usize {
for k in 1..6usize {
for y in all_codewords(n, k) {
let mut e = RangeEncoder::new();
encode_pulses(&y, k, &mut e, &mut v);
encode_pulses(&y, k, &mut e);
let buf = e.done(16);
let mut d = RangeDecoder::new(&buf);
assert_eq!(decode_pulses(n, k, &mut d), y, "n={n} k={k}");
@@ -480,6 +544,165 @@ mod tests {
}
}
/// The per-call table encoder this module used before the shared table.
fn encode_pulses_reference(y: &[i32], k: usize, enc: &mut RangeEncoder) {
let n = y.len();
let w = k + 1;
let mut v = vec![0u64; (n + 1) * w];
v[0] = 1;
for nn in 1..=n {
v[nn * w] = 1;
for kk in 1..=k {
let a = v[(nn - 1) * w + kk];
let b = v[nn * w + kk - 1];
let c = v[(nn - 1) * w + kk - 1];
v[nn * w + kk] = a.saturating_add(b).saturating_add(c);
}
}
let total = v[n * w + k];
let vv = |nn: usize, kx: usize| v[nn * w + kx];
let mut index = 0u64;
let mut kk = k;
for j in 0..n {
if kk == 0 {
break;
}
let rem = n - j;
let t = y[j].unsigned_abs() as usize;
let mut base: u64 = (0..kk - t).map(|m| vv(rem - 1, m)).sum();
if y[j] < 0 {
base += (vv(rem - 1, kk) + vv(rem, kk)) / 2;
}
index += base;
kk -= t;
}
if total >= 2 {
enc.uint(index as u32, total as u32);
}
}
#[test]
fn pvq_table_encode_matches_per_call_table() {
let mut seed = 0x9E37_79B9_7F4A_7C15u64;
let mut next = move |m: u64| {
seed ^= seed << 13;
seed ^= seed >> 7;
seed ^= seed << 17;
seed % m
};
let mut checked = 0;
for n in (1..=PVQ_MAX_N).step_by(5).chain([PVQ_MAX_N]) {
for k in (1..=PVQ_MAX_K).step_by(3).chain([PVQ_MAX_K]) {
if crate::opus::encoder::rate::pvq_v(n, k) > u32::MAX as u128 {
continue;
}
for _ in 0..4 {
let mut y = vec![0i32; n];
for _ in 0..k {
let at = next(n as u64) as usize;
y[at] += if next(2) == 0 { 1 } else { -1 };
}
// Opposite pulses cancel; top up so that sum |y| = k again.
let mut have: usize = y.iter().map(|v| v.unsigned_abs() as usize).sum();
while have < k {
let at = next(n as u64) as usize;
y[at] += if y[at] < 0 { -1 } else { 1 };
have += 1;
}
let (mut a, mut b) = (RangeEncoder::new(), RangeEncoder::new());
encode_pulses(&y, k, &mut a);
encode_pulses_reference(&y, k, &mut b);
assert_eq!(a.done(16), b.done(16), "n={n} k={k}");
checked += 1;
}
}
}
assert!(checked > 100, "{checked}");
}
/// The scalar greedy search the vectorised one replaced.
fn pvq_search_ref(x: &[f32], k: usize, y: &mut [i32]) {
let n = x.len();
y[..n].fill(0);
let abs: Vec<f32> = x.iter().map(|v| v.abs()).collect();
let sum: f32 = abs.iter().sum();
if !sum.is_finite() || sum <= 1e-15 {
y[0] = k as i32;
return;
}
let mut placed = 0usize;
let mut xy = 0f32;
let mut yy = 0f32;
if k > n / 2 {
let r = (k as f32 - 1.0) / sum;
for j in 0..n {
let p = (abs[j] * r).floor() as i32;
y[j] = p;
placed += p as usize;
xy += abs[j] * p as f32;
yy += (p * p) as f32;
}
}
while placed < k {
let mut best = 0usize;
let mut best_num = -1f32;
let mut best_den = 1f32;
for j in 0..n {
let num = xy + abs[j];
let num = num * num;
let den = yy + 2.0 * y[j] as f32 + 1.0;
if num * best_den > best_num * den {
best_num = num;
best_den = den;
best = j;
}
}
xy += abs[best];
yy += 2.0 * y[best] as f32 + 1.0;
y[best] += 1;
placed += 1;
}
for j in 0..n {
if x[j] < 0.0 {
y[j] = -y[j];
}
}
}
#[test]
fn pvq_search_matches_scalar_reference() {
let mut state = 0x9e3779b97f4a7c15u64;
let mut rnd = move || {
state ^= state << 13;
state ^= state >> 7;
state ^= state << 17;
(state >> 40) as f32 / (1u64 << 24) as f32 * 2.0 - 1.0
};
let mut a = vec![0i32; 200];
let mut b = vec![0i32; 200];
let mut cases = 0;
for round in 0..6000 {
let n = 1 + (round * 37 + (rnd().abs() * 176.0) as usize) % 176;
let k = 1 + (rnd().abs() * 127.0) as usize;
let scale = [1.0f32, 1e-9, 1e6, 3e-3][round % 4];
let x: Vec<f32> = (0..n)
.map(|_| match round % 6 {
0 => rnd(),
1 => if rnd() > 0.8 { rnd() } else { 0.0 },
2 => (rnd() * 4.0).round() / 4.0,
3 => if rnd() > 0.0 { 1.0 } else { -1.0 },
4 => rnd().powi(5),
_ => if rnd() > 0.95 { 3.0 * rnd() } else { 1e-4 * rnd() },
} * scale)
.collect();
pvq_search(&x, k, &mut a);
pvq_search_ref(&x, k, &mut b);
assert_eq!(a[..n], b[..n], "n={n} k={k} round={round}");
cases += 1;
}
assert_eq!(cases, 6000);
}
#[test]
fn pvq_search_finds_good_direction() {
let x: Vec<f32> = (0..32).map(|i| ((i as f32) * 0.7).sin()).collect();
+10 -15
View File
@@ -4,8 +4,9 @@
//! The quantised energies are updated with exactly the decoder's arithmetic so the prediction
//! state never drifts between encoder and decoder.
use crate::opus::encoder::CeltFrame;
use crate::opus::encoder::range::RangeEncoder;
use crate::opus::encoder::rate::MAX_FINE_BITS;
use crate::opus::encoder::rate::{Allocation, MAX_FINE_BITS};
use crate::opus::encoder::tables::{BETA_COEF, BETA_INTRA, E_PROB_MODEL, NB_EBANDS, PRED_COEF, SMALL_ENERGY_ICDF};
const LAPLACE_MINP: u32 = 1;
@@ -56,18 +57,15 @@ pub fn laplace_encode(enc: &mut RangeEncoder, value: i32, mut fs: u32, decay: u3
/// `quant_coarse_energy` for one prediction mode. `e` holds the target log2 energies (relative
/// to `E_MEANS`), `old_e` the quantised energies, updated in place. `budget` is the frame size in
/// bits.
#[allow(clippy::too_many_arguments)]
pub fn quant_coarse_energy(
start: usize,
end: usize,
frame: CeltFrame,
e: &[f32; 2 * NB_EBANDS],
old_e: &mut [f32; 2 * NB_EBANDS],
intra: bool,
enc: &mut RangeEncoder,
c: usize,
lm: usize,
budget: i32,
) {
let CeltFrame { start, end, channels: c, lm } = frame;
let prob = &E_PROB_MODEL[lm][intra as usize];
let (coef, beta) = if intra { (0.0, BETA_INTRA) } else { (PRED_COEF[lm], BETA_COEF[lm]) };
let mut prev = [0f32; 2];
@@ -112,14 +110,13 @@ pub fn quant_coarse_energy(
/// `quant_fine_energy`: raw bits refining each band's quantised energy.
pub fn quant_fine_energy(
start: usize,
end: usize,
frame: CeltFrame,
e: &[f32; 2 * NB_EBANDS],
old_e: &mut [f32; 2 * NB_EBANDS],
fine_quant: &[i32; NB_EBANDS],
enc: &mut RangeEncoder,
c: usize,
) {
let CeltFrame { start, end, channels: c, .. } = frame;
for i in start..end {
let fq = fine_quant[i];
if fq <= 0 {
@@ -139,18 +136,16 @@ pub fn quant_fine_energy(
/// `quant_energy_finalise`: spends the bits left at the end of the frame on one more bit of
/// energy resolution per band, in priority order.
#[allow(clippy::too_many_arguments)]
pub fn quant_energy_finalise(
start: usize,
end: usize,
frame: CeltFrame,
e: &[f32; 2 * NB_EBANDS],
old_e: &mut [f32; 2 * NB_EBANDS],
fine_quant: &[i32; NB_EBANDS],
fine_priority: &[i32; NB_EBANDS],
allocation: &Allocation,
mut bits_left: i32,
enc: &mut RangeEncoder,
c: usize,
) {
let CeltFrame { start, end, channels: c, .. } = frame;
let Allocation { fine_quant, fine_priority, .. } = allocation;
for prio in 0..2 {
let mut i = start;
while i < end && bits_left >= c as i32 {
+26 -78
View File
@@ -9,84 +9,7 @@
use crate::opus::encoder::tables::OVERLAP;
#[derive(Clone, Copy, Default, Debug)]
pub struct Cpx {
pub re: f32,
pub im: f32,
}
impl Cpx {
#[inline]
fn mul(self, o: Cpx) -> Cpx {
Cpx { re: self.re * o.re - self.im * o.im, im: self.re * o.im + self.im * o.re }
}
#[inline]
fn add(self, o: Cpx) -> Cpx {
Cpx { re: self.re + o.re, im: self.im + o.im }
}
}
/// Mixed-radix (2, 3, 4, 5) forward complex FFT, unscaled (decimation in time, recursive).
pub struct Fft {
n: usize,
factors: Vec<usize>,
twiddle: Vec<Cpx>,
}
impl Fft {
pub fn new(n: usize) -> Fft {
let mut factors = Vec::new();
let mut m = n;
for p in [4usize, 2, 3, 5] {
while m.is_multiple_of(p) {
factors.push(p);
m /= p;
}
}
assert_eq!(m, 1, "unsupported FFT size {n}");
let twiddle = (0..n)
.map(|k| {
let ph = -2.0 * std::f64::consts::PI * k as f64 / n as f64;
Cpx { re: ph.cos() as f32, im: ph.sin() as f32 }
})
.collect();
Fft { n, factors, twiddle }
}
pub fn process(&self, data: &mut [Cpx], scratch: &mut Vec<Cpx>) {
scratch.clear();
scratch.extend_from_slice(&data[..self.n]);
self.rec(&mut data[..self.n], scratch, 1, self.n, 0, 1);
}
fn rec(&self, out: &mut [Cpx], inp: &[Cpx], in_stride: usize, n: usize, fi: usize, tw_stride: usize) {
let p = self.factors[fi];
let m = n / p;
if m == 1 {
for (i, o) in out.iter_mut().enumerate().take(p) {
*o = inp[i * in_stride];
}
} else {
for q in 0..p {
self.rec(&mut out[q * m..(q + 1) * m], &inp[q * in_stride..], in_stride * p, m, fi + 1, tw_stride * p);
}
}
let big = self.n;
let mut t = [Cpx::default(); 5];
for k in 0..m {
for (q, tq) in t.iter_mut().enumerate().take(p) {
*tq = out[q * m + k].mul(self.twiddle[(q * k * tw_stride) % big]);
}
for q2 in 0..p {
let mut acc = Cpx::default();
for (q, tq) in t.iter().enumerate().take(p) {
acc = acc.add(tq.mul(self.twiddle[((q * q2) % p) * (big / p)]));
}
out[q2 * m + k] = acc;
}
}
}
}
use crate::opus::fft::{Cpx, Fft};
/// Forward MDCT producing `n` coefficients from a block of `n + OVERLAP` samples.
pub struct Mdct {
@@ -199,6 +122,31 @@ mod tests {
.collect()
}
#[test]
fn fft_matches_dft() {
// Every radix combination, including the 480-point size of the 20 ms frame.
for &n in &[2usize, 3, 4, 5, 6, 8, 12, 15, 16, 20, 24, 30, 48, 60, 120, 240, 480] {
let fft = Fft::new(n);
let x: Vec<Cpx> = (0..n).map(|i| Cpx { re: ((i * 37 % 101) as f32 - 50.0) / 7.0, im: ((i * 53 % 89) as f32 - 44.0) / 9.0 }).collect();
let mut y = x.clone();
fft.process(&mut y, &mut Vec::new());
for k in 0..n {
let (mut re, mut im) = (0f64, 0f64);
for (j, v) in x.iter().enumerate() {
let ph = -2.0 * std::f64::consts::PI * ((j * k) % n) as f64 / n as f64;
re += v.re as f64 * ph.cos() - v.im as f64 * ph.sin();
im += v.re as f64 * ph.sin() + v.im as f64 * ph.cos();
}
assert!(
(y[k].re as f64 - re).abs() < 2e-3 && (y[k].im as f64 - im).abs() < 2e-3,
"n={n} k={k}: ({}, {}) vs ({re}, {im})",
y[k].re,
y[k].im
);
}
}
}
#[test]
fn matches_direct_formula() {
for &n in &[240usize, 960] {
+36 -33
View File
@@ -10,8 +10,9 @@
//! above in the same range-coded frame; constant packet size.
//! - **CELT** (fullband): MDCT transform coding; constant packet size.
//!
//! From EffectCraft's `effectcraft-opusenc` (storytold/effectcraft@c618429). Public items keep their
//! names, so EffectCraft can re-export this module.
//! From EffectCraft's `effectcraft-opusenc` (storytold/effectcraft@c618429), with its later speed-ups
//! and CELT stage refactor up to storytold/effectcraft@d6c9ad66. Public items keep their names, so
//! EffectCraft can re-export this module.
//!
//! ```
//! # #[cfg(feature = "opus-encode")] {
@@ -26,6 +27,7 @@
//! # }
//! ```
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
// The bit-allocation code mirrors the normative integer arithmetic; keep C-like shift expressions.
#![allow(clippy::precedence, clippy::int_plus_one)]
@@ -36,19 +38,28 @@ mod range;
mod rate;
mod resample;
mod silk;
mod tables;
pub(super) mod tables;
use std::sync::OnceLock;
use bands::{SPREAD_NORMAL, quant_all_bands};
use bands::{BandCoding, SPREAD_NORMAL, quant_all_bands};
use energy::{quant_coarse_energy, quant_energy_finalise, quant_fine_energy};
use mdct::Mdct;
use range::{BITRES, RangeEncoder};
use rate::{Mode as CeltMode, compute_allocation};
use rate::{AllocationInput, Mode as CeltMode, compute_allocation};
use resample::Downsampler;
use silk::SilkEncoder;
use tables::{E_MEANS, EBANDS, NB_EBANDS, OVERLAP, PREEMPH, SPREAD_ICDF, TF_SELECT_TABLE, TRIM_ICDF};
/// Band range, channel count and transform size shared by CELT coding stages.
#[derive(Clone, Copy)]
struct CeltFrame {
start: usize,
end: usize,
channels: usize,
lm: usize,
}
/// Samples per channel in one 20 ms frame at 48 kHz.
const N: usize = 960;
/// LM of a 20 ms frame (8 short blocks).
@@ -338,7 +349,7 @@ impl Encoder {
Mode::Celt => {
let (log_e, silence) = self.celt_analysis(pcm);
let len = self.frame_bytes;
packet.extend_from_slice(&self.encode_celt(RangeEncoder::new(), len, 0, NB_EBANDS, &log_e, silence));
packet.extend_from_slice(&self.encode_celt(RangeEncoder::new(), len, 0..NB_EBANDS, &log_e, silence));
}
Mode::Silk => {
let x = self.silk_input(pcm);
@@ -368,7 +379,7 @@ impl Encoder {
}
let (log_e, _) = self.celt_analysis(pcm);
let end = if self.bandwidth == Bandwidth::SuperWideband { 19 } else { NB_EBANDS };
packet.extend_from_slice(&self.encode_celt(enc, len, HYBRID_START_BAND, end, &log_e, false));
packet.extend_from_slice(&self.encode_celt(enc, len, HYBRID_START_BAND..end, &log_e, false));
}
}
Ok(packet)
@@ -430,10 +441,18 @@ impl Encoder {
/// Codes one CELT frame (RFC 6716 §4.3, in bitstream order) of `len` bytes into `enc`
/// (which already holds the SILK frame in hybrid mode), coding bands `start..end`, and
/// finalises the frame.
#[allow(clippy::too_many_arguments)]
fn encode_celt(&mut self, mut enc: RangeEncoder, len: usize, start: usize, end: usize, log_e: &[f32; 2 * NB_EBANDS], silence: bool) -> Vec<u8> {
fn encode_celt(
&mut self,
mut enc: RangeEncoder,
len: usize,
bands: std::ops::Range<usize>,
log_e: &[f32; 2 * NB_EBANDS],
silence: bool,
) -> Vec<u8> {
let m = celt_mode();
let c = self.channels;
let frame = CeltFrame { start: bands.start, end: bands.end, channels: c, lm: LM };
let CeltFrame { start, end, .. } = frame;
if c == 1 {
for i in 0..NB_EBANDS {
self.old_band_e[i] = self.old_band_e[i].max(self.old_band_e[NB_EBANDS + i]);
@@ -462,10 +481,10 @@ impl Encoder {
let mut enc_intra = enc.clone();
let mut old_intra = self.old_band_e;
enc_intra.bit_logp(true, 3);
quant_coarse_energy(start, end, log_e, &mut old_intra, true, &mut enc_intra, c, LM, total_bits_raw);
quant_coarse_energy(frame, log_e, &mut old_intra, true, &mut enc_intra, total_bits_raw);
enc.bit_logp(false, 3);
let mut old_inter = self.old_band_e;
quant_coarse_energy(start, end, log_e, &mut old_inter, false, &mut enc, c, LM, total_bits_raw);
quant_coarse_energy(frame, log_e, &mut old_inter, false, &mut enc, total_bits_raw);
if enc_intra.tell_frac() < enc.tell_frac() {
enc = enc_intra;
self.old_band_e = old_intra;
@@ -473,14 +492,14 @@ impl Encoder {
self.old_band_e = old_inter;
}
} else {
quant_coarse_energy(start, end, log_e, &mut self.old_band_e, false, &mut enc, c, LM, total_bits_raw);
quant_coarse_energy(frame, log_e, &mut self.old_band_e, false, &mut enc, total_bits_raw);
}
// TF resolution: no changes.
{
let mut budget = total_bits_raw;
let mut tell = enc.tell();
let mut logp = 4;
let tf_select_rsv = LM > 0 && tell + logp + 1 <= budget;
let tf_select_rsv = LM > 0 && tell + logp < budget;
budget -= tf_select_rsv as i32;
for _ in start..end {
if tell + logp <= budget {
@@ -512,27 +531,11 @@ impl Encoder {
enc.icdf(alloc_trim as usize, &TRIM_ICDF, 7);
}
let bits = (total_bits_raw << BITRES) - enc.tell_frac() - 1;
let alloc = compute_allocation(m, start, end, &offsets, &cap, alloc_trim, bits, c, LM, &mut enc);
quant_fine_energy(start, end, log_e, &mut self.old_band_e, &alloc.fine_quant, &mut enc, c);
quant_all_bands(
m,
start,
end,
&self.freq,
N,
c,
&alloc.pulses,
SPREAD_NORMAL,
alloc.dual_stereo,
alloc.intensity,
total_bits_raw << BITRES,
alloc.balance,
&mut enc,
LM,
alloc.coded_bands,
);
let alloc = compute_allocation(m, frame, AllocationInput { offsets: &offsets, cap: &cap, trim: alloc_trim, bits }, &mut enc);
quant_fine_energy(frame, log_e, &mut self.old_band_e, &alloc.fine_quant, &mut enc);
quant_all_bands(m, frame, &self.freq, N, &alloc, BandCoding { spread: SPREAD_NORMAL, total_bits: total_bits_raw << BITRES }, &mut enc);
let bits_left = total_bits_raw - enc.tell();
quant_energy_finalise(start, end, log_e, &mut self.old_band_e, &alloc.fine_quant, &alloc.fine_priority, bits_left, &mut enc, c);
quant_energy_finalise(frame, log_e, &mut self.old_band_e, &alloc, bits_left, &mut enc);
debug_assert!(enc.tell() <= total_bits_raw, "frame overflow: {} > {}", enc.tell(), total_bits_raw);
if c == 1 {
let (a, b) = self.old_band_e.split_at_mut(NB_EBANDS);
+45 -363
View File
@@ -4,254 +4,18 @@
//! spec-derived `filmcraft-opus` decoder (first-party, MIT OR Apache-2.0) step by step; the only
//! difference is that the encoder *writes* the band-skip, intensity and dual-stereo symbols.
use crate::opus::encoder::range::{BITRES, RangeEncoder, ilog};
use crate::opus::encoder::tables::{ALLOC, EBANDS, LOG2_FRAC_TABLE, MAX_LM, NB_EBANDS};
use crate::opus::encoder::CeltFrame;
use crate::opus::encoder::range::{BITRES, RangeEncoder};
use crate::opus::encoder::tables::{EBANDS, LOG2_FRAC_TABLE, NB_EBANDS};
const MAX_PSEUDO: i32 = 40;
const LOG_MAX_PSEUDO: i32 = 6;
#[cfg(test)]
pub use crate::opus::rate_common::pvq_v;
pub use crate::opus::rate_common::{Mode, get_pulses};
pub const MAX_FINE_BITS: i32 = 8;
const FINE_OFFSET: i32 = 21;
pub const QTHETA_OFFSET: i32 = 4;
pub const QTHETA_OFFSET_TWOPHASE: i32 = 16;
const ALLOC_STEPS: i32 = 6;
/// Number of pulses represented by pseudo-pulse index `i`.
pub fn get_pulses(i: i32) -> i32 {
if i < 8 { i } else { (8 + (i & 7)) << ((i >> 3) - 1) }
}
/// Conservative (rounded up) log2 of `val` with `frac` fractional bits.
pub fn log2_frac(mut val: u32, mut frac: u32) -> i32 {
let mut l = ilog(val);
if val & val.wrapping_sub(1) != 0 {
if l > 16 {
val = ((val - 1) >> (l - 16)) + 1;
} else {
val <<= 16 - l;
}
let mut l = (l - 1) << frac;
loop {
let b = (val >> 16) as i32;
l += b << frac;
val = (val + b as u32) >> b;
val = (val * val + 0x7FFF) >> 15;
if frac == 0 {
break;
}
frac -= 1;
}
l + (val > 0x8000) as i32
} else {
l -= 1;
l << frac
}
}
/// PVQ codebook size V(N, K) (saturating far above 2^32).
pub fn pvq_v(n: usize, k: usize) -> u128 {
if k == 0 {
return 1;
}
if n == 0 {
return 0;
}
let mut row = vec![0u128; k + 1];
row[0] = 1;
for _ in 0..n {
let mut prev_diag = row[0];
for kk in 1..=k {
let up = row[kk];
let v = up.saturating_add(row[kk - 1]).saturating_add(prev_diag);
prev_diag = up;
row[kk] = v.min(u128::MAX >> 8);
}
row[0] = 1;
}
row[k]
}
fn fits_in32(n: usize, k: i32) -> bool {
pvq_v(n, k as usize) <= u32::MAX as u128
}
/// Precomputed per-mode data.
pub struct Mode {
/// log2 of band width in 1/8 bits.
pub log_n: [i32; NB_EBANDS],
cache_index: Vec<i16>,
cache_bits: Vec<u8>,
caps: Vec<u8>,
}
impl Mode {
pub fn new() -> Mode {
let mut log_n = [0i32; NB_EBANDS];
for (i, l) in log_n.iter_mut().enumerate() {
*l = log2_frac((EBANDS[i + 1] - EBANDS[i]) as u32, BITRES);
}
let (cache_index, cache_bits) = compute_pulse_cache(MAX_LM as i32);
let mut m = Mode { log_n, cache_index, cache_bits, caps: Vec::new() };
m.caps = compute_caps(&m);
m
}
#[inline]
pub fn cache(&self, lm: i32, band: usize) -> &[u8] {
let idx = self.cache_index[((lm + 1) as usize) * NB_EBANDS + band];
&self.cache_bits[idx.max(0) as usize..]
}
pub fn bits2pulses(&self, band: usize, lm: i32, bits: i32) -> i32 {
let cache = self.cache(lm, band);
let mut lo = 0i32;
let mut hi = cache[0] as i32;
let bits = bits - 1;
for _ in 0..LOG_MAX_PSEUDO {
let mid = (lo + hi + 1) >> 1;
if cache[mid as usize] as i32 >= bits {
hi = mid;
} else {
lo = mid;
}
}
let lo_bits = if lo == 0 { -1 } else { cache[lo as usize] as i32 };
if bits - lo_bits <= cache[hi as usize] as i32 - bits { lo } else { hi }
}
pub fn pulses2bits(&self, band: usize, lm: i32, pulses: i32) -> i32 {
if pulses == 0 { 0 } else { self.cache(lm, band)[pulses as usize] as i32 + 1 }
}
/// Per-band allocation caps for this frame (`init_caps`).
pub fn init_caps(&self, lm: usize, c: usize) -> [i32; NB_EBANDS] {
let mut cap = [0i32; NB_EBANDS];
for (i, cp) in cap.iter_mut().enumerate() {
let n = (EBANDS[i + 1] - EBANDS[i]) << lm;
*cp = (self.caps[NB_EBANDS * (2 * lm + c - 1) + i] as i32 + 64) * c as i32 * n >> 2;
}
cap
}
}
fn compute_pulse_cache(lm_max: i32) -> (Vec<i16>, Vec<u8>) {
let nb = NB_EBANDS;
let rows = (lm_max + 2) as usize;
let mut index = vec![-1i16; nb * rows];
let mut entries: Vec<(usize, i32, usize)> = Vec::new();
let mut curr = 0usize;
for i in 0..rows {
for j in 0..nb {
let n = (((EBANDS[j + 1] - EBANDS[j]) << i) >> 1) as usize;
index[i * nb + j] = -1;
'search: for k in 0..=i {
for nn in 0..nb {
if k == i && nn >= j {
break;
}
if n == (((EBANDS[nn + 1] - EBANDS[nn]) << k) >> 1) as usize {
index[i * nb + j] = index[k * nb + nn];
break 'search;
}
}
}
if index[i * nb + j] == -1 && n != 0 {
let mut k = 0;
while k < MAX_PSEUDO && fits_in32(n, get_pulses(k + 1)) {
k += 1;
}
index[i * nb + j] = curr as i16;
entries.push((n, k, curr));
curr += (k + 1) as usize;
}
}
}
let mut bits = vec![0u8; curr];
for &(n, k, off) in &entries {
let maxk = get_pulses(k) as usize;
let tmp = required_bits(n, maxk, BITRES);
for j in 1..=k {
bits[off + j as usize] = (tmp[get_pulses(j) as usize] - 1) as u8;
}
bits[off] = k as u8;
}
(index, bits)
}
fn required_bits(n: usize, maxk: usize, frac: u32) -> Vec<i32> {
let mut out = vec![0i32; maxk + 1];
if n == 1 {
for o in out.iter_mut().skip(1) {
*o = 1 << frac;
}
} else {
for (k, o) in out.iter_mut().enumerate().skip(1) {
*o = log2_frac(pvq_v(n, k) as u32, frac);
}
}
out
}
fn compute_caps(m: &Mode) -> Vec<u8> {
let nb = NB_EBANDS;
let mut caps = vec![0u8; (MAX_LM + 1) * 2 * nb];
for i in 0..=MAX_LM as i32 {
for c in 1..=2i32 {
for j in 0..nb {
let mut n0 = EBANDS[j + 1] - EBANDS[j];
let max_bits = if n0 << i == 1 {
c * (1 + MAX_FINE_BITS) << BITRES
} else {
let mut lm0 = 0;
if n0 > 2 {
n0 >>= 1;
lm0 -= 1;
} else if n0 <= 1 {
lm0 = i.min(1);
n0 <<= lm0;
}
let pcache = m.cache(lm0, j);
let mut mb = pcache[pcache[0] as usize] as i32 + 1;
let mut n = n0;
for k in 0..(i - lm0) {
mb <<= 1;
let offset = ((m.log_n[j] + ((lm0 + k) << BITRES)) >> 1) - QTHETA_OFFSET;
let num = 459 * ((2 * n - 1) * offset + mb);
let den = ((2 * n - 1) << 9) - 459;
let qb = ((num + (den >> 1)) / den).min(57);
mb += qb;
n <<= 1;
}
if c == 2 {
mb <<= 1;
let offset = ((m.log_n[j] + (i << BITRES)) >> 1) - if n == 2 { QTHETA_OFFSET_TWOPHASE } else { QTHETA_OFFSET };
let ndof = 2 * n - 1 - (n == 2) as i32;
let p = if n == 2 { 512 } else { 487 };
let num = p * (mb + ndof * offset);
let den = (ndof << 9) - p;
let qb = ((num + (den >> 1)) / den).min(if n == 2 { 64 } else { 61 });
mb += qb;
}
let ndof = c * n + if c == 2 && n > 2 { 1 } else { 0 };
let mut offset = ((m.log_n[j] + (i << BITRES)) >> 1) - FINE_OFFSET;
if n == 2 {
offset += (1 << BITRES) >> 2;
}
let num = mb + ndof * offset;
let den = (ndof - 1) << BITRES;
let qb = ((num + (den >> 1)) / den).min(MAX_FINE_BITS);
mb += c * qb << BITRES;
mb
};
let w = c * ((EBANDS[j + 1] - EBANDS[j]) << i);
let v = (4 * max_bits / w) - 64;
caps[((i * 2 + c - 1) as usize) * nb + j] = v.clamp(0, 255) as u8;
}
}
}
caps
}
/// Result of the allocation process.
pub struct Allocation {
pub coded_bands: usize,
@@ -263,125 +27,43 @@ pub struct Allocation {
pub fine_priority: [i32; NB_EBANDS],
}
/// `clt_compute_allocation`, encoder side. Stereo frames are always coded as dual (L/R) stereo
/// with no intensity bands, and no band is skipped voluntarily.
#[allow(clippy::too_many_arguments)]
pub fn compute_allocation(
m: &Mode,
start: usize,
end: usize,
offsets: &[i32; NB_EBANDS],
cap: &[i32; NB_EBANDS],
alloc_trim: i32,
total: i32,
c: usize,
lm: usize,
enc: &mut RangeEncoder,
) -> Allocation {
let ci = c as i32;
let lmi = lm as i32;
let mut total = total.max(0);
let mut skip_start = start;
let skip_rsv = if total >= 1 << BITRES { 1 << BITRES } else { 0 };
total -= skip_rsv;
let mut intensity_rsv = 0;
let mut dual_stereo_rsv = 0;
if c == 2 {
intensity_rsv = LOG2_FRAC_TABLE[end - start];
if intensity_rsv > total {
intensity_rsv = 0;
} else {
total -= intensity_rsv;
dual_stereo_rsv = if total >= 1 << BITRES { 1 << BITRES } else { 0 };
total -= dual_stereo_rsv;
}
}
let mut bits1 = [0i32; NB_EBANDS];
let mut bits2 = [0i32; NB_EBANDS];
let mut thresh = [0i32; NB_EBANDS];
let mut trim_offset = [0i32; NB_EBANDS];
for j in start..end {
let w = EBANDS[j + 1] - EBANDS[j];
thresh[j] = (ci << BITRES).max((3 * w << lmi << BITRES) >> 4);
trim_offset[j] = ci * w * (alloc_trim - 5 - lmi) * (end as i32 - j as i32 - 1) * (1 << (lmi + BITRES as i32)) >> 6;
if w << lmi == 1 {
trim_offset[j] -= ci << BITRES;
}
}
let nb_alloc = ALLOC.len() as i32;
let mut lo = 1;
let mut hi = nb_alloc - 1;
loop {
let mut done = false;
let mut psum = 0;
let mid = (lo + hi) >> 1;
for j in (start..end).rev() {
let n = EBANDS[j + 1] - EBANDS[j];
let mut bitsj = ci * n * (ALLOC[mid as usize][j] as i32) << lmi >> 2;
if bitsj > 0 {
bitsj = (bitsj + trim_offset[j]).max(0);
}
bitsj += offsets[j];
if bitsj >= thresh[j] || done {
done = true;
psum += bitsj.min(cap[j]);
} else if bitsj >= ci << BITRES {
psum += ci << BITRES;
}
}
if psum > total {
hi = mid - 1;
} else {
lo = mid + 1;
}
if lo > hi {
break;
}
}
hi = lo;
lo -= 1;
for j in start..end {
let n = EBANDS[j + 1] - EBANDS[j];
let mut bits1j = ci * n * (ALLOC[lo as usize][j] as i32) << lmi >> 2;
let mut bits2j = if hi >= nb_alloc { cap[j] } else { ci * n * (ALLOC[hi as usize][j] as i32) << lmi >> 2 };
if bits1j > 0 {
bits1j = (bits1j + trim_offset[j]).max(0);
}
if bits2j > 0 {
bits2j = (bits2j + trim_offset[j]).max(0);
}
if lo > 0 {
bits1j += offsets[j];
}
bits2j += offsets[j];
if offsets[j] > 0 {
skip_start = j;
}
bits2j = (bits2j - bits1j).max(0);
bits1[j] = bits1j;
bits2[j] = bits2j;
}
interp_bits2pulses(m, start, end, skip_start, &bits1, &bits2, &thresh, cap, total, skip_rsv, intensity_rsv, dual_stereo_rsv, c, lm, enc)
/// Per-band limits, boosts and available budget for the allocation search.
pub struct AllocationInput<'a> {
pub offsets: &'a [i32; NB_EBANDS],
pub cap: &'a [i32; NB_EBANDS],
pub trim: i32,
pub bits: i32,
}
#[allow(clippy::too_many_arguments)]
fn interp_bits2pulses(
m: &Mode,
start: usize,
end: usize,
/// `clt_compute_allocation`, encoder side. Stereo frames are always coded as dual (L/R) stereo
/// with no intensity bands, and no band is skipped voluntarily.
pub fn compute_allocation(m: &Mode, frame: CeltFrame, input: AllocationInput<'_>, enc: &mut RangeEncoder) -> Allocation {
let CeltFrame { start, end, channels: c, lm } = frame;
let AllocationInput { offsets, cap, trim: alloc_trim, bits: total } = input;
let crate::opus::rate_common::Bracket { skip_start, bits1, bits2, thresh, total, skip_rsv, intensity_rsv, dual_stereo_rsv } =
crate::opus::rate_common::bracket(start, end, offsets, cap, alloc_trim, total, c, lm);
let interpolation =
AllocationInterpolation { skip_start, bits1: &bits1, bits2: &bits2, thresh: &thresh, cap, total, skip_rsv, intensity_rsv, dual_stereo_rsv };
interp_bits2pulses(m, frame, interpolation, enc)
}
/// Bracketing allocation vectors and signalling reserves for the interpolation stage.
struct AllocationInterpolation<'a> {
skip_start: usize,
bits1: &[i32; NB_EBANDS],
bits2: &[i32; NB_EBANDS],
thresh: &[i32; NB_EBANDS],
cap: &[i32; NB_EBANDS],
mut total: i32,
bits1: &'a [i32; NB_EBANDS],
bits2: &'a [i32; NB_EBANDS],
thresh: &'a [i32; NB_EBANDS],
cap: &'a [i32; NB_EBANDS],
total: i32,
skip_rsv: i32,
mut intensity_rsv: i32,
mut dual_stereo_rsv: i32,
c: usize,
lm: usize,
enc: &mut RangeEncoder,
) -> Allocation {
intensity_rsv: i32,
dual_stereo_rsv: i32,
}
fn interp_bits2pulses(m: &Mode, frame: CeltFrame, interpolation: AllocationInterpolation<'_>, enc: &mut RangeEncoder) -> Allocation {
let CeltFrame { start, end, channels: c, lm } = frame;
let AllocationInterpolation { skip_start, bits1, bits2, thresh, cap, mut total, skip_rsv, mut intensity_rsv, mut dual_stereo_rsv } =
interpolation;
let ci = c as i32;
let alloc_floor = ci << BITRES;
let stereo = (c > 1) as i32;
@@ -393,7 +75,7 @@ fn interp_bits2pulses(
let mut psum = 0;
let mut done = false;
for j in (start..end).rev() {
let tmp = bits1[j] + (mid * bits2[j] >> ALLOC_STEPS);
let tmp = bits1[j] + ((mid * bits2[j]) >> ALLOC_STEPS);
if tmp >= thresh[j] || done {
done = true;
psum += tmp.min(cap[j]);
@@ -411,7 +93,7 @@ fn interp_bits2pulses(
let mut psum = 0;
let mut done = false;
for j in (start..end).rev() {
let mut tmp = bits1[j] + (lo * bits2[j] >> ALLOC_STEPS);
let mut tmp = bits1[j] + ((lo * bits2[j]) >> ALLOC_STEPS);
if tmp < thresh[j] && !done {
tmp = if tmp >= alloc_floor { alloc_floor } else { 0 };
} else {
@@ -500,9 +182,9 @@ fn interp_bits2pulses(
if n == 2 {
offset += (den << BITRES) >> 2;
}
if bits[j] + offset < den * 2 << BITRES {
if bits[j] + offset < (den * 2) << BITRES {
offset += nclogn >> 2;
} else if bits[j] + offset < den * 3 << BITRES {
} else if bits[j] + offset < (den * 3) << BITRES {
offset += nclogn >> 3;
}
let mut eb = (bits[j] + offset + (den << (BITRES - 1))).max(0);
@@ -513,7 +195,7 @@ fn interp_bits2pulses(
eb = eb.min(MAX_FINE_BITS);
ebits[j] = eb;
fine_priority[j] = (eb * (den << BITRES) >= bits[j] + offset) as i32;
bits[j] -= ci * eb << BITRES;
bits[j] -= (ci * eb) << BITRES;
} else {
excess = (bit - (ci << BITRES)).max(0);
bits[j] = bit - excess;
@@ -523,7 +205,7 @@ fn interp_bits2pulses(
if excess > 0 {
let extra_fine = (excess >> (stereo + BITRES as i32)).min(MAX_FINE_BITS - ebits[j]);
ebits[j] += extra_fine;
let extra_bits = extra_fine * ci << BITRES;
let extra_bits = (extra_fine * ci) << BITRES;
fine_priority[j] = (extra_bits >= excess - balance) as i32;
excess -= extra_bits;
}
+13 -1
View File
@@ -45,6 +45,8 @@ fn design(fc: f64, beta: f64, delay: usize) -> Vec<f32> {
h.iter().map(|&v| v as f32).collect()
}
use crate::opus::dot::dot8;
/// Decimates one channel of 48 kHz audio by 3, 4 or 6.
#[derive(Clone)]
pub struct Downsampler {
@@ -77,7 +79,7 @@ impl Downsampler {
let t = taps - 1 + self.factor * j;
let win = &self.buf[t + 1 - taps..=t];
// h is symmetric, so the window can be taken in forward order.
out.push(win.iter().zip(&self.h).map(|(a, b)| a * b).sum());
out.push(dot8(win, &self.h));
}
let n = self.buf.len();
self.buf.copy_within(n - (taps - 1).., 0);
@@ -97,6 +99,16 @@ mod tests {
(x.iter().map(|&v| (v as f64).powi(2)).sum::<f64>() / x.len() as f64).sqrt()
}
#[test]
fn dot8_matches_sequential_sum() {
for len in [0usize, 1, 7, 8, 9, 63, 167, 251] {
let a: Vec<f32> = (0..len).map(|i| ((i * 37 % 101) as f32 - 50.0) / 50.0).collect();
let b: Vec<f32> = (0..len).map(|i| ((i * 53 % 89) as f32 - 44.0) / 44.0).collect();
let exact: f64 = a.iter().zip(&b).map(|(&x, &y)| x as f64 * y as f64).sum();
assert!((dot8(&a, &b) as f64 - exact).abs() < 1e-4, "len {len}");
}
}
#[test]
fn passes_band_and_rejects_aliases() {
for &(fs, pass, stop) in &[(16_000u32, 6_000.0, 8_600.0), (12_000, 4_500.0, 6_500.0), (8_000, 3_000.0, 4_500.0)] {
+104 -8
View File
@@ -69,28 +69,55 @@ pub fn levinson(r: &[f64], order: usize) -> Vec<f64> {
}
/// Evaluates the symmetric polynomial `p` (length `d + 1`, `d` even) as the cosine series
/// `e^{jωd/2} P(e^{jω})`.
fn cos_series(p: &[f64], w: f64) -> f64 {
/// `e^{jωd/2} P(e^{jω})`, with `cos_m(m)` giving `cos(m ω)`.
#[inline]
fn cos_series_with(p: &[f64], cos_m: impl Fn(usize) -> f64) -> f64 {
let h = (p.len() - 1) / 2;
let mut s = p[h];
for k in 0..h {
s += 2.0 * p[k] * ((h - k) as f64 * w).cos();
s += 2.0 * p[k] * cos_m(h - k);
}
s
}
fn cos_series(p: &[f64], w: f64) -> f64 {
cos_series_with(p, |m| (m as f64 * w).cos())
}
/// Number of grid intervals the root search scans over `[0, π]`.
const GRID: usize = 1024;
/// Largest multiple of ω in the series (half the LPC order, at most 16 / 2).
const MAX_H: usize = 8;
/// Bisection steps per root: the bracket shrinks to 3e-9 rad, far below one Q15 NLSF step (9.6e-5 rad).
const BISECT_STEPS: usize = 20;
/// `cos(m · π g / GRID)` for every grid point `g` and `m` in `0..=MAX_H`, computed with the same
/// expression as [`cos_series`], so the table values are bit-identical to calling `cos` there.
fn grid_cos() -> &'static [[f64; MAX_H + 1]] {
static TABLE: std::sync::OnceLock<Vec<[f64; MAX_H + 1]>> = std::sync::OnceLock::new();
TABLE.get_or_init(|| {
(0..=GRID)
.map(|g| {
let w = std::f64::consts::PI * g as f64 / GRID as f64;
std::array::from_fn(|m| (m as f64 * w).cos())
})
.collect()
})
}
fn roots(p: &[f64], out: &mut Vec<f64>) {
const GRID: usize = 1024;
let grid = grid_cos();
let at_grid = |g: usize| cos_series_with(p, |m| grid[g][m]);
let mut w0 = 0.0;
let mut f0 = cos_series(p, w0);
let mut f0 = at_grid(0);
for g in 1..=GRID {
let w1 = std::f64::consts::PI * g as f64 / GRID as f64;
let f1 = cos_series(p, w1);
let f1 = at_grid(g);
if f0 == 0.0 {
out.push(w0);
} else if f0 * f1 < 0.0 {
let (mut lo, mut hi, mut flo) = (w0, w1, f0);
for _ in 0..40 {
for _ in 0..BISECT_STEPS {
let mid = 0.5 * (lo + hi);
let fm = cos_series(p, mid);
if fm * flo <= 0.0 {
@@ -111,6 +138,9 @@ fn roots(p: &[f64], out: &mut Vec<f64>) {
/// when the root search fails (unstable or degenerate filter).
pub fn a2nlsf(a: &[f64]) -> Option<Vec<f64>> {
let d = a.len();
if d > 2 * MAX_H {
return None;
}
let mut c = vec![0f64; d + 2];
c[0] = 1.0;
for k in 0..d {
@@ -199,9 +229,20 @@ pub fn pitch_search(x: &[f32], start: usize, len: usize, fs_khz: usize) -> Pitch
let score = full[(lag - min_lag) as usize];
// Contour: per-subframe lag offsets around the chosen lag.
let cb: &[[i32; 4]] = if fs_khz == 8 { &CB_NB_20 } else { &CB_WB_20 };
// The contour search revisits the same (subframe, lag) pairs for neighbouring base lags and
// codebook entries, so each correlation is computed once.
let span = (18 * fs - min_lag + 1) as usize;
let memo = std::cell::RefCell::new(vec![f64::NAN; 4 * span]);
let sub_score = |k: usize, l: i32| -> f64 {
let l = l.clamp(min_lag, 18 * fs);
ncorr(x, start + k * sub..start + (k + 1) * sub, l as usize)
let slot = k * span + (l - min_lag) as usize;
let cached = memo.borrow()[slot];
if !cached.is_nan() {
return cached;
}
let v = ncorr(x, start + k * sub..start + (k + 1) * sub, l as usize);
memo.borrow_mut()[slot] = v;
v
};
let mut best = (f64::MIN, lag, 0usize);
for l0 in (lag - 2).max(min_lag)..=(lag + 2).min(max_lag) {
@@ -319,4 +360,59 @@ mod tests {
}
}
}
/// The root search as it was before the grid table: `cos` called for every evaluation.
fn roots_reference(p: &[f64], out: &mut Vec<f64>) {
let mut w0 = 0.0;
let mut f0 = cos_series(p, w0);
for g in 1..=GRID {
let w1 = std::f64::consts::PI * g as f64 / GRID as f64;
let f1 = cos_series(p, w1);
if f0 == 0.0 {
out.push(w0);
} else if f0 * f1 < 0.0 {
let (mut lo, mut hi, mut flo) = (w0, w1, f0);
for _ in 0..BISECT_STEPS {
let mid = 0.5 * (lo + hi);
let fm = cos_series(p, mid);
if fm * flo <= 0.0 {
hi = mid;
} else {
lo = mid;
flo = fm;
}
}
out.push(0.5 * (lo + hi));
}
w0 = w1;
f0 = f1;
}
}
#[test]
fn grid_table_roots_are_bit_identical_to_direct_cos() {
let mut seed = 7u64;
let mut rnd = move || {
seed ^= seed << 13;
seed ^= seed >> 7;
seed ^= seed << 17;
(seed >> 11) as f64 / (1u64 << 53) as f64 * 2.0 - 1.0
};
let mut found = 0;
for len in [11usize, 17] {
for _ in 0..300 {
let mut p = vec![0f64; len];
for k in 0..len / 2 + 1 {
p[k] = rnd();
p[len - 1 - k] = p[k];
}
let (mut a, mut b) = (Vec::new(), Vec::new());
roots(&p, &mut a);
roots_reference(&p, &mut b);
assert_eq!(a.iter().map(|v| v.to_bits()).collect::<Vec<_>>(), b.iter().map(|v| v.to_bits()).collect::<Vec<_>>());
found += a.len();
}
}
assert!(found > 1000, "{found}");
}
}
+158 -10
View File
@@ -129,6 +129,48 @@ struct Coded {
pulses: Vec<i32>,
}
/// Noise-feedback history (decoded − input), most recent first, as a double-length ring: each
/// sample is stored at `pos` and `pos + MAX_LPC_ORDER`, so `buf[pos..pos + MAX_LPC_ORDER]` is
/// always the contiguous window and a push costs two stores instead of a shift.
struct NfRing {
buf: [f64; 2 * MAX_LPC_ORDER],
/// Index of the most recent sample, always below `MAX_LPC_ORDER`.
pos: usize,
}
impl NfRing {
fn new(hist: &[f64; MAX_LPC_ORDER]) -> Self {
let mut buf = [0.0; 2 * MAX_LPC_ORDER];
buf[..MAX_LPC_ORDER].copy_from_slice(hist);
buf[MAX_LPC_ORDER..].copy_from_slice(hist);
NfRing { buf, pos: 0 }
}
/// The history, most recent first.
fn window(&self) -> &[f64] {
self.buf.get(self.pos..self.pos + MAX_LPC_ORDER).unwrap_or(&[])
}
/// Makes `v` the most recent sample and drops the oldest.
fn push(&mut self, v: f64) {
self.pos = self.pos.checked_sub(1).unwrap_or(MAX_LPC_ORDER - 1);
for i in [self.pos, self.pos + MAX_LPC_ORDER] {
if let Some(slot) = self.buf.get_mut(i) {
*slot = v;
}
}
}
/// The history as a plain array, most recent first.
fn to_array(&self) -> [f64; MAX_LPC_ORDER] {
let mut out = [0.0; MAX_LPC_ORDER];
for (o, v) in out.iter_mut().zip(self.window()) {
*o = *v;
}
out
}
}
#[derive(Clone)]
struct Channel {
fs_khz: usize,
@@ -237,7 +279,7 @@ impl Channel {
let sub = self.sub;
let order = self.order;
let st = &mut self.dec;
let nf = &mut self.nf;
let mut ring = NfRing::new(&self.nf);
let off = if p.signal_type == 0 { offset + INACTIVE_OFFSET } else { offset };
let gamma = nf_gamma(off);
let mut nf_c = [0f64; MAX_LPC_ORDER];
@@ -355,7 +397,7 @@ impl Channel {
}
let lpc_q14 = lpc_pred.saturating_mul(16);
// Target excitation (Q14) for this sample.
let fb: f64 = (0..order).map(|j| nf_c[j] * nf[j]).sum();
let fb: f64 = nf_c.iter().zip(ring.window()).take(order).map(|(c, e)| c * e).sum();
let tgt = (x[n] as f64 + fb).clamp(-32768.0, 32767.0) * inv_g - lpc_q14 as f64 - ltp_q14 as f64;
let sgn = if seed_v < 0 { -1.0 } else { 1.0 };
let u = sgn * tgt;
@@ -394,11 +436,11 @@ impl Channel {
let v = res.saturating_add(lpc_q14);
s_lpc[MAX_LPC_ORDER + i] = v;
xq[n] = sat16(rshift_round(smulww(v, gain_q10), 8)) as i16;
nf.copy_within(0..MAX_LPC_ORDER - 1, 1);
nf[0] = xq[n] as f64 - x[n] as f64;
ring.push(xq[n] as f64 - x[n] as f64);
}
s_lpc.copy_within(sub..sub + MAX_LPC_ORDER, 0);
}
self.nf = ring.to_array();
st.s_lpc_q14.copy_from_slice(&s_lpc[..MAX_LPC_ORDER]);
st.out_buf[..l].copy_from_slice(&xq);
(Coded { gain_ix, gains_q16, seed, pulses }, xq)
@@ -485,6 +527,14 @@ struct Prep {
pred_q13: [i32; 2],
}
/// One rate-loop trial: the frame coded at gain offset `offset`.
struct Trial {
offset: f64,
bits: i32,
state: SilkEncoder,
coder: RangeEncoder,
}
/// SILK encoder for one mono or stereo (mid/side) stream.
#[derive(Clone)]
pub struct SilkEncoder {
@@ -635,11 +685,20 @@ impl SilkEncoder {
pub fn encode(&mut self, input: &[Vec<f32>], target_bits: f64, max_bits: i32, enc: &mut RangeEncoder) {
let prep = self.prepare(input);
let start_bits = enc.tell();
let trial = |s: &Self, o: f64| -> i32 {
let mut t = s.clone();
let mut e = enc.clone();
t.code(&prep, o, &mut e);
e.tell() - start_bits
// Every trial codes the frame into a clone of the encoder and the range coder. The result
// is kept per offset: the hard-limit check below hits the memo for the chosen offset, and
// the final step adopts that trial instead of coding the frame once more.
let mut trials: Vec<Trial> = Vec::new();
let mut trial = |s: &Self, o: f64| -> i32 {
if let Some(t) = trials.iter().find(|t| t.offset == o) {
return t.bits;
}
let mut state = s.clone();
let mut coder = enc.clone();
state.code(&prep, o, &mut coder);
let bits = coder.tell() - start_bits;
trials.push(Trial { offset: o, bits, state, coder });
bits
};
// Bisection on the gain offset: the smallest offset (finest quantisation) within budget.
let target = target_bits.min(max_bits as f64);
@@ -701,8 +760,20 @@ impl SilkEncoder {
while trial(self, o) > max_bits && o < 12.0 {
o += 1.0;
}
match trials.iter().position(|t| t.offset == o) {
Some(i) => {
let t = trials.swap_remove(i);
*self = t.state;
*enc = t.coder;
}
None => self.code(&prep, o, enc),
}
self.end_frame(&prep, o);
}
/// Advances the input history and the frame counter after frame `prep` was coded at `o`.
fn end_frame(&mut self, prep: &Prep, o: f64) {
self.last_offset = o;
self.code(&prep, o, enc);
for ch in 0..self.channels {
self.ch[ch].push_history(&prep.x[ch]);
}
@@ -712,3 +783,80 @@ impl SilkEncoder {
self.frame += 1;
}
}
#[cfg(test)]
mod tests {
use super::*;
/// Deterministic speech-like test input: two harmonics with a moving pitch, a syllable
/// envelope, noise and short silences, at the internal rate and 16-bit scale.
fn signal(len: usize, fs_khz: usize, seed: u32) -> Vec<f32> {
let mut s = seed;
let fs = (fs_khz * 1000) as f64;
(0..len)
.map(|i| {
s = s.wrapping_mul(1_664_525).wrapping_add(1_013_904_223);
let noise = (s >> 8) as f64 / (1u32 << 24) as f64 - 0.5;
let t = i as f64 / fs;
let f0 = 140.0 + 40.0 * (t * 1.3).sin();
let env = ((t * 4.0).sin().max(0.0)).powf(0.7);
let voiced = (std::f64::consts::TAU * f0 * t).sin() + 0.5 * (std::f64::consts::TAU * 2.0 * f0 * t).sin();
(8000.0 * env * voiced + 600.0 * noise) as f32
})
.collect()
}
#[test]
fn nf_ring_matches_a_shifted_history() {
let mut hist = [0f64; MAX_LPC_ORDER];
for (i, h) in hist.iter_mut().enumerate() {
*h = i as f64 * 0.5 - 3.0;
}
let mut ring = NfRing::new(&hist);
assert_eq!(ring.window(), &hist[..]);
for n in 0..100 {
let v = (n as f64 * 0.37).sin() * 100.0;
hist.copy_within(0..MAX_LPC_ORDER - 1, 1);
hist[0] = v;
ring.push(v);
assert_eq!(ring.window(), &hist[..], "after push {n}");
}
assert_eq!(ring.to_array(), hist);
}
/// The rate loop adopts the memoised trial for the chosen offset. A second encoder that codes
/// every frame afresh at that offset (what the loop did before the memo) must produce the
/// same bytes, frame after frame, so the adopted encoder and range-coder states are exact.
#[test]
fn adopting_the_memoised_trial_equals_coding_the_frame_again() {
for (fs_khz, channels, target_bits, max_bits) in
[(8, 1, 200.0, 1000), (12, 1, 320.0, 1000), (16, 1, 480.0, 1000), (16, 2, 640.0, 1000), (16, 1, 900.0, 400), (8, 2, 120.0, 160)]
{
let mut memo = SilkEncoder::new(fs_khz, channels);
let mut fresh = memo.clone();
let l = memo.frame_len();
let frames = 40;
let left = signal(l * frames, fs_khz, 7);
let right: Vec<f32> = signal(l * frames + 37, fs_khz, 11)[37..].iter().map(|v| v * 0.6).collect();
for f in 0..frames {
let mut input = vec![left[f * l..(f + 1) * l].to_vec()];
if channels == 2 {
input.push(right[f * l..(f + 1) * l].to_vec());
}
let mut enc = RangeEncoder::new();
memo.encode(&input, target_bits, max_bits, &mut enc);
let o = memo.last_offset;
let prep = fresh.prepare(&input);
let mut enc_fresh = RangeEncoder::new();
fresh.code(&prep, o, &mut enc_fresh);
fresh.end_frame(&prep, o);
assert_eq!(enc.tell(), enc_fresh.tell(), "{fs_khz} kHz {channels} ch frame {f}");
assert_eq!(enc.done(1275), enc_fresh.done(1275), "{fs_khz} kHz {channels} ch frame {f}");
for c in 0..channels {
assert_eq!(memo.ch[c].nf, fresh.ch[c].nf, "noise feedback, channel {c}, frame {f}");
assert_eq!(memo.ch[c].dec.s_lpc_q14, fresh.ch[c].dec.s_lpc_q14, "LPC state, channel {c}, frame {f}");
}
}
}
}
}
+130
View File
@@ -0,0 +1,130 @@
//! Shared CELT forward complex FFT.
#[derive(Clone, Copy, Default, Debug)]
pub struct Cpx {
pub re: f32,
pub im: f32,
}
impl Cpx {
#[inline]
pub(crate) fn mul(self, o: Cpx) -> Cpx {
Cpx { re: self.re * o.re - self.im * o.im, im: self.re * o.im + self.im * o.re }
}
#[inline]
pub(crate) fn add(self, o: Cpx) -> Cpx {
Cpx { re: self.re + o.re, im: self.im + o.im }
}
#[inline]
pub(crate) fn sub(self, o: Cpx) -> Cpx {
Cpx { re: self.re - o.re, im: self.im - o.im }
}
}
/// Mixed-radix (2, 3, 4, 5) forward complex FFT, unscaled (decimation in time, recursive).
pub struct Fft {
pub(crate) n: usize,
pub(crate) factors: Vec<usize>,
pub(crate) twiddle: Vec<Cpx>,
}
impl Fft {
pub fn new(n: usize) -> Fft {
let mut factors = Vec::new();
let mut m = n;
for p in [4usize, 2, 3, 5] {
while m.is_multiple_of(p) {
factors.push(p);
m /= p;
}
}
assert_eq!(m, 1, "unsupported FFT size {n}");
let twiddle = (0..n)
.map(|k| {
let ph = -2.0 * std::f64::consts::PI * k as f64 / n as f64;
Cpx { re: ph.cos() as f32, im: ph.sin() as f32 }
})
.collect();
Fft { n, factors, twiddle }
}
pub fn process(&self, data: &mut [Cpx], scratch: &mut Vec<Cpx>) {
scratch.clear();
scratch.extend_from_slice(&data[..self.n]);
self.rec(&mut data[..self.n], scratch, 1, self.n, 0, 1);
}
fn rec(&self, out: &mut [Cpx], inp: &[Cpx], in_stride: usize, n: usize, fi: usize, tw_stride: usize) {
let p = self.factors[fi];
let m = n / p;
if m == 1 {
for (i, o) in out.iter_mut().enumerate().take(p) {
*o = inp[i * in_stride];
}
} else {
for q in 0..p {
self.rec(&mut out[q * m..(q + 1) * m], &inp[q * in_stride..], in_stride * p, m, fi + 1, tw_stride * p);
}
}
// The twiddle index q * k * tw_stride is always below n, so no modulo is needed.
let tw = &self.twiddle;
match p {
2 => {
for k in 0..m {
let a0 = out[k];
let a1 = out[m + k].mul(tw[k * tw_stride]);
out[k] = a0.add(a1);
out[m + k] = a0.sub(a1);
}
}
4 => {
for k in 0..m {
let t0 = out[k];
let t1 = out[m + k].mul(tw[k * tw_stride]);
let t2 = out[2 * m + k].mul(tw[2 * k * tw_stride]);
let t3 = out[3 * m + k].mul(tw[3 * k * tw_stride]);
let (s0, d0) = (t0.add(t2), t0.sub(t2));
let (s1, d1) = (t1.add(t3), t1.sub(t3));
out[k] = s0.add(s1);
out[2 * m + k] = s0.sub(s1);
// The odd outputs combine d0 with -j * d1 = (d1.im, -d1.re) and its negative.
out[m + k] = Cpx { re: d0.re + d1.im, im: d0.im - d1.re };
out[3 * m + k] = Cpx { re: d0.re - d1.im, im: d0.im + d1.re };
}
}
3 => {
// Imaginary part of exp(-2 pi i / 3) = -sqrt(3) / 2.
let h = tw[self.n / 3].im;
for k in 0..m {
let t0 = out[k];
let t1 = out[m + k].mul(tw[k * tw_stride]);
let t2 = out[2 * m + k].mul(tw[2 * k * tw_stride]);
let (s, d) = (t1.add(t2), t1.sub(t2));
let a = Cpx { re: t0.re - 0.5 * s.re, im: t0.im - 0.5 * s.im };
out[k] = t0.add(s);
// j * h * d = (-h * d.im, h * d.re)
out[m + k] = Cpx { re: a.re - h * d.im, im: a.im + h * d.re };
out[2 * m + k] = Cpx { re: a.re + h * d.im, im: a.im - h * d.re };
}
}
_ => {
// Generic DFT butterfly (radix 5, once per transform).
let roots: [Cpx; 5] = std::array::from_fn(|q| if q < p { tw[q * (self.n / p)] } else { Cpx::default() });
let mut t = [Cpx::default(); 5];
for k in 0..m {
t[0] = out[k];
for q in 1..p {
t[q] = out[q * m + k].mul(tw[q * k * tw_stride]);
}
for q2 in 0..p {
let mut acc = t[0];
for q in 1..p {
acc = acc.add(t[q].mul(roots[(q * q2) % p]));
}
out[q2 * m + k] = acc;
}
}
}
}
}
}
+6 -2
View File
@@ -7,14 +7,18 @@
//! 20 ms, mono or stereo). From EffectCraft's `effectcraft-opusenc` (storytold/effectcraft@c618429).
//!
//! Public items keep their names, so FilmCraft and EffectCraft can re-export this module. The two
//! halves come from separate crates and do not share code yet (each has its own range coder, MDCT
//! and band tables). [`Bandwidth`] is one type for both (`encoder::Bandwidth` is the same type);
//! halves share the FFT, resampling dot product and CELT allocation preparation; range coders and
//! mode-specific MDCT processing remain separate. [`Bandwidth`] is one type for both (`encoder::Bandwidth` is the same type);
//! the two `Mode` enums keep their apps' variant names and convert into each other.
// Index loops and long argument lists follow the specification's pseudo-code (FilmCraft and
// EffectCraft allow these lints workspace-wide).
#![allow(clippy::needless_range_loop, clippy::too_many_arguments)]
mod dot;
mod fft;
mod rate_common;
#[cfg(feature = "opus-decode")]
mod decode;
#[cfg(feature = "opus-encode")]
+362
View File
@@ -0,0 +1,362 @@
//! CELT pulse cache and allocation caps shared by encoder and decoder.
#[cfg(not(feature = "opus-encode"))]
use super::decode::celt::tables::{ALLOC, EBANDS, LOG2_FRAC_TABLE, MAX_LM, NB_EBANDS};
#[cfg(feature = "opus-encode")]
use super::encoder::tables::{ALLOC, EBANDS, LOG2_FRAC_TABLE, MAX_LM, NB_EBANDS};
const BITRES: u32 = 3;
const MAX_PSEUDO: i32 = 40;
const LOG_MAX_PSEUDO: i32 = 6;
const MAX_FINE_BITS: i32 = 8;
const FINE_OFFSET: i32 = 21;
const QTHETA_OFFSET: i32 = 4;
const QTHETA_OFFSET_TWOPHASE: i32 = 16;
fn ilog(x: u32) -> i32 {
(32 - x.leading_zeros()) as i32
}
/// Number of pulses represented by pseudo-pulse index `i`.
pub fn get_pulses(i: i32) -> i32 {
if i < 8 { i } else { (8 + (i & 7)) << ((i >> 3) - 1) }
}
/// Conservative (rounded up) log2 of `val` with `frac` fractional bits.
pub fn log2_frac(mut val: u32, mut frac: u32) -> i32 {
let mut l = ilog(val);
if val & val.wrapping_sub(1) != 0 {
if l > 16 {
val = ((val - 1) >> (l - 16)) + 1;
} else {
val <<= 16 - l;
}
let mut l = (l - 1) << frac;
loop {
let b = (val >> 16) as i32;
l += b << frac;
val = (val + b as u32) >> b;
val = (val * val + 0x7FFF) >> 15;
if frac == 0 {
break;
}
frac -= 1;
}
l + (val > 0x8000) as i32
} else {
l -= 1;
l << frac
}
}
/// PVQ codebook size V(N, K) (saturating far above 2^32).
pub fn pvq_v(n: usize, k: usize) -> u128 {
if k == 0 {
return 1;
}
if n == 0 {
return 0;
}
let mut row = vec![0u128; k + 1];
row[0] = 1;
for _ in 0..n {
let mut prev_diag = row[0];
for kk in 1..=k {
let up = row[kk];
let v = up.saturating_add(row[kk - 1]).saturating_add(prev_diag);
prev_diag = up;
row[kk] = v.min(u128::MAX >> 8);
}
row[0] = 1;
}
row[k]
}
fn fits_in32(n: usize, k: i32) -> bool {
pvq_v(n, k as usize) <= u32::MAX as u128
}
/// Precomputed per-mode data.
pub struct Mode {
/// log2 of band width in 1/8 bits.
pub log_n: [i32; NB_EBANDS],
pub(crate) cache_index: Vec<i16>,
pub(crate) cache_bits: Vec<u8>,
pub(crate) caps: Vec<u8>,
}
impl Mode {
pub fn new() -> Mode {
let mut log_n = [0i32; NB_EBANDS];
for (i, l) in log_n.iter_mut().enumerate() {
*l = log2_frac((EBANDS[i + 1] - EBANDS[i]) as u32, BITRES);
}
let (cache_index, cache_bits) = compute_pulse_cache(MAX_LM as i32);
let mut m = Mode { log_n, cache_index, cache_bits, caps: Vec::new() };
m.caps = compute_caps(&m);
m
}
#[inline]
pub fn cache(&self, lm: i32, band: usize) -> &[u8] {
let idx = self.cache_index[((lm + 1) as usize) * NB_EBANDS + band];
&self.cache_bits[idx.max(0) as usize..]
}
pub fn bits2pulses(&self, band: usize, lm: i32, bits: i32) -> i32 {
let cache = self.cache(lm, band);
let mut lo = 0i32;
let mut hi = cache[0] as i32;
let bits = bits - 1;
for _ in 0..LOG_MAX_PSEUDO {
let mid = (lo + hi + 1) >> 1;
if cache[mid as usize] as i32 >= bits {
hi = mid;
} else {
lo = mid;
}
}
let lo_bits = if lo == 0 { -1 } else { cache[lo as usize] as i32 };
if bits - lo_bits <= cache[hi as usize] as i32 - bits { lo } else { hi }
}
pub fn pulses2bits(&self, band: usize, lm: i32, pulses: i32) -> i32 {
if pulses == 0 { 0 } else { self.cache(lm, band)[pulses as usize] as i32 + 1 }
}
/// Per-band allocation caps for this frame (`init_caps`).
pub fn init_caps(&self, lm: usize, c: usize) -> [i32; NB_EBANDS] {
let mut cap = [0i32; NB_EBANDS];
for (i, cp) in cap.iter_mut().enumerate() {
let n = (EBANDS[i + 1] - EBANDS[i]) << lm;
*cp = ((self.caps[NB_EBANDS * (2 * lm + c - 1) + i] as i32 + 64) * c as i32 * n) >> 2;
}
cap
}
}
fn compute_pulse_cache(lm_max: i32) -> (Vec<i16>, Vec<u8>) {
let nb = NB_EBANDS;
let rows = (lm_max + 2) as usize;
let mut index = vec![-1i16; nb * rows];
let mut entries: Vec<(usize, i32, usize)> = Vec::new();
let mut curr = 0usize;
for i in 0..rows {
for j in 0..nb {
let n = (((EBANDS[j + 1] - EBANDS[j]) << i) >> 1) as usize;
index[i * nb + j] = -1;
'search: for k in 0..=i {
for nn in 0..nb {
if k == i && nn >= j {
break;
}
if n == (((EBANDS[nn + 1] - EBANDS[nn]) << k) >> 1) as usize {
index[i * nb + j] = index[k * nb + nn];
break 'search;
}
}
}
if index[i * nb + j] == -1 && n != 0 {
let mut k = 0;
while k < MAX_PSEUDO && fits_in32(n, get_pulses(k + 1)) {
k += 1;
}
index[i * nb + j] = curr as i16;
entries.push((n, k, curr));
curr += (k + 1) as usize;
}
}
}
let mut bits = vec![0u8; curr];
for &(n, k, off) in &entries {
let maxk = get_pulses(k) as usize;
let tmp = required_bits(n, maxk, BITRES);
for j in 1..=k {
bits[off + j as usize] = (tmp[get_pulses(j) as usize] - 1) as u8;
}
bits[off] = k as u8;
}
(index, bits)
}
fn required_bits(n: usize, maxk: usize, frac: u32) -> Vec<i32> {
let mut out = vec![0i32; maxk + 1];
if n == 1 {
for o in out.iter_mut().skip(1) {
*o = 1 << frac;
}
} else {
for (k, o) in out.iter_mut().enumerate().skip(1) {
*o = log2_frac(pvq_v(n, k) as u32, frac);
}
}
out
}
fn compute_caps(m: &Mode) -> Vec<u8> {
let nb = NB_EBANDS;
let mut caps = vec![0u8; (MAX_LM + 1) * 2 * nb];
for i in 0..=MAX_LM as i32 {
for c in 1..=2i32 {
for j in 0..nb {
let mut n0 = EBANDS[j + 1] - EBANDS[j];
let max_bits = if n0 << i == 1 {
(c * (1 + MAX_FINE_BITS)) << BITRES
} else {
let mut lm0 = 0;
if n0 > 2 {
n0 >>= 1;
lm0 -= 1;
} else if n0 <= 1 {
lm0 = i.min(1);
n0 <<= lm0;
}
let pcache = m.cache(lm0, j);
let mut mb = pcache[pcache[0] as usize] as i32 + 1;
let mut n = n0;
for k in 0..(i - lm0) {
mb <<= 1;
let offset = ((m.log_n[j] + ((lm0 + k) << BITRES)) >> 1) - QTHETA_OFFSET;
let num = 459 * ((2 * n - 1) * offset + mb);
let den = ((2 * n - 1) << 9) - 459;
let qb = ((num + (den >> 1)) / den).min(57);
mb += qb;
n <<= 1;
}
if c == 2 {
mb <<= 1;
let offset = ((m.log_n[j] + (i << BITRES)) >> 1) - if n == 2 { QTHETA_OFFSET_TWOPHASE } else { QTHETA_OFFSET };
let ndof = 2 * n - 1 - (n == 2) as i32;
let p = if n == 2 { 512 } else { 487 };
let num = p * (mb + ndof * offset);
let den = (ndof << 9) - p;
let qb = ((num + (den >> 1)) / den).min(if n == 2 { 64 } else { 61 });
mb += qb;
}
let ndof = c * n + if c == 2 && n > 2 { 1 } else { 0 };
let mut offset = ((m.log_n[j] + (i << BITRES)) >> 1) - FINE_OFFSET;
if n == 2 {
offset += (1 << BITRES) >> 2;
}
let num = mb + ndof * offset;
let den = (ndof - 1) << BITRES;
let qb = ((num + (den >> 1)) / den).min(MAX_FINE_BITS);
mb += (c * qb) << BITRES;
mb
};
let w = c * ((EBANDS[j + 1] - EBANDS[j]) << i);
let v = (4 * max_bits / w) - 64;
caps[((i * 2 + c - 1) as usize) * nb + j] = v.clamp(0, 255) as u8;
}
}
}
caps
}
/// Shared allocation search before encoder/decoder signalling diverges.
pub struct Bracket {
pub skip_start: usize,
pub bits1: [i32; NB_EBANDS],
pub bits2: [i32; NB_EBANDS],
pub thresh: [i32; NB_EBANDS],
pub total: i32,
pub skip_rsv: i32,
pub intensity_rsv: i32,
pub dual_stereo_rsv: i32,
}
pub fn bracket(
start: usize,
end: usize,
offsets: &[i32; NB_EBANDS],
cap: &[i32; NB_EBANDS],
alloc_trim: i32,
total: i32,
c: usize,
lm: usize,
) -> Bracket {
let ci = c as i32;
let lmi = lm as i32;
let mut total = total.max(0);
let mut skip_start = start;
let skip_rsv = if total >= 1 << BITRES { 1 << BITRES } else { 0 };
total -= skip_rsv;
let mut intensity_rsv = 0;
let mut dual_stereo_rsv = 0;
if c == 2 {
intensity_rsv = LOG2_FRAC_TABLE[end - start];
if intensity_rsv > total {
intensity_rsv = 0;
} else {
total -= intensity_rsv;
dual_stereo_rsv = if total >= 1 << BITRES { 1 << BITRES } else { 0 };
total -= dual_stereo_rsv;
}
}
let mut bits1 = [0i32; NB_EBANDS];
let mut bits2 = [0i32; NB_EBANDS];
let mut thresh = [0i32; NB_EBANDS];
let mut trim_offset = [0i32; NB_EBANDS];
for j in start..end {
let w = EBANDS[j + 1] - EBANDS[j];
thresh[j] = (ci << BITRES).max(((3 * w) << lmi << BITRES) >> 4);
trim_offset[j] = (ci * w * (alloc_trim - 5 - lmi) * (end as i32 - j as i32 - 1) * (1 << (lmi + BITRES as i32))) >> 6;
if w << lmi == 1 {
trim_offset[j] -= ci << BITRES;
}
}
let nb_alloc = ALLOC.len() as i32;
let mut lo = 1;
let mut hi = nb_alloc - 1;
loop {
let mut done = false;
let mut psum = 0;
let mid = (lo + hi) >> 1;
for j in (start..end).rev() {
let n = EBANDS[j + 1] - EBANDS[j];
let mut bitsj = (ci * n * (ALLOC[mid as usize][j] as i32)) << lmi >> 2;
if bitsj > 0 {
bitsj = (bitsj + trim_offset[j]).max(0);
}
bitsj += offsets[j];
if bitsj >= thresh[j] || done {
done = true;
psum += bitsj.min(cap[j]);
} else if bitsj >= ci << BITRES {
psum += ci << BITRES;
}
}
if psum > total {
hi = mid - 1;
} else {
lo = mid + 1;
}
if lo > hi {
break;
}
}
hi = lo;
lo -= 1;
for j in start..end {
let n = EBANDS[j + 1] - EBANDS[j];
let mut bits1j = (ci * n * (ALLOC[lo as usize][j] as i32)) << lmi >> 2;
let mut bits2j = if hi >= nb_alloc { cap[j] } else { (ci * n * (ALLOC[hi as usize][j] as i32)) << lmi >> 2 };
if bits1j > 0 {
bits1j = (bits1j + trim_offset[j]).max(0);
}
if bits2j > 0 {
bits2j = (bits2j + trim_offset[j]).max(0);
}
if lo > 0 {
bits1j += offsets[j];
}
bits2j += offsets[j];
if offsets[j] > 0 {
skip_start = j;
}
bits2j = (bits2j - bits1j).max(0);
bits1[j] = bits1j;
bits2[j] = bits2j;
}
Bracket { skip_start, bits1, bits2, thresh, total, skip_rsv, intensity_rsv, dual_stereo_rsv }
}
+96
View File
@@ -0,0 +1,96 @@
//! Interleaved PCM packet decoding into caller-owned planar channels.
/// The sample representation in an interleaved PCM packet.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub struct Format {
/// Bits per sample.
pub bits: u16,
/// IEEE floating-point samples.
pub float: bool,
/// Big-endian sample bytes.
pub big_endian: bool,
/// Signed 8-bit integers (wider integer PCM is signed).
pub signed: bool,
}
/// Append complete interleaved frames to caller-owned planar channels. Empty channel slices and
/// zero-bit formats append nothing. Incomplete frames are ignored; unsupported widths produce
/// silent samples, matching the container adapters that use this API.
pub fn decode_into(data: &[u8], cfg: Format, out: &mut [Vec<f32>]) {
let ch = out.len();
if cfg.bits == 0 || ch == 0 {
return;
}
let bps = usize::from(cfg.bits).div_ceil(8);
let Some(frame_bytes) = bps.checked_mul(ch).filter(|&n| n > 0) else { return };
let n = data.len() / frame_bytes;
for channel in out.iter_mut() {
channel.reserve(n);
}
// `n` is whole frames within `data`, so every sample slice below is in bounds.
for i in 0..n {
for (c, o) in out.iter_mut().enumerate() {
let off = (i * ch + c) * bps;
let b = &data[off..off + bps];
let v = match (cfg.bits, cfg.float, cfg.big_endian) {
(32, true, false) => f32::from_le_bytes([b[0], b[1], b[2], b[3]]),
(32, true, true) => f32::from_be_bytes([b[0], b[1], b[2], b[3]]),
(64, true, false) => f64::from_le_bytes(b.try_into().unwrap_or([0; 8])) as f32,
(64, true, true) => f64::from_be_bytes(b.try_into().unwrap_or([0; 8])) as f32,
(8, _, _) => {
if cfg.signed {
b[0] as i8 as f32 / 128.0
} else {
(b[0] as f32 - 128.0) / 128.0
}
}
(16, _, false) => i16::from_le_bytes([b[0], b[1]]) as f32 / 32768.0,
(16, _, true) => i16::from_be_bytes([b[0], b[1]]) as f32 / 32768.0,
(24, _, false) => (i32::from_le_bytes([0, b[0], b[1], b[2]]) >> 8) as f32 / 8_388_608.0,
(24, _, true) => (i32::from_be_bytes([b[0], b[1], b[2], 0]) >> 8) as f32 / 8_388_608.0,
(32, false, false) => i32::from_le_bytes([b[0], b[1], b[2], b[3]]) as f32 / 2_147_483_648.0,
(32, false, true) => i32::from_be_bytes([b[0], b[1], b[2], b[3]]) as f32 / 2_147_483_648.0,
_ => 0.0,
};
o.push(v);
}
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn decodes_endian_and_interleaving_without_touching_partial_frames() {
let mut channels = vec![Vec::new(), Vec::new()];
let fmt = Format { bits: 16, float: false, big_endian: true, signed: true };
decode_into(&[0x40, 0, 0xc0, 0, 0xff], fmt, &mut channels);
assert_eq!(channels, [vec![0.5], vec![-0.5]]);
decode_into(&[0; 8], Format { bits: 0, ..fmt }, &mut channels);
assert_eq!(channels, [vec![0.5], vec![-0.5]]);
}
#[test]
fn decodes_sample_representations_and_ignores_invalid_inputs() {
let base = Format { bits: 8, float: false, big_endian: false, signed: false };
let cases: &[(Format, &[u8], f32)] = &[
(base, &[192], 0.5),
(Format { signed: true, ..base }, &[192], -0.5),
(Format { bits: 16, ..base }, &[0, 64], 0.5),
(Format { bits: 24, ..base }, &[0, 0, 64], 0.5),
(Format { bits: 24, big_endian: true, ..base }, &[0xc0, 0, 0], -0.5),
(Format { bits: 32, ..base }, &[0, 0, 0, 64], 0.5),
(Format { bits: 32, big_endian: true, ..base }, &[0xc0, 0, 0, 0], -0.5),
(Format { bits: 32, float: true, ..base }, &0.5_f32.to_le_bytes(), 0.5),
(Format { bits: 32, float: true, big_endian: true, ..base }, &(-0.5_f32).to_be_bytes(), -0.5),
(Format { bits: 64, float: true, ..base }, &0.5_f64.to_le_bytes(), 0.5),
(Format { bits: 64, float: true, big_endian: true, ..base }, &(-0.5_f64).to_be_bytes(), -0.5),
(Format { bits: 12, ..base }, &[0xff, 0xff], 0.0),
];
for &(format, bytes, expected) in cases {
let mut out = [vec![1.0]];
decode_into(bytes, format, &mut out);
assert_eq!(out[0], [1.0, expected], "{format:?}");
}
decode_into(&[1], base, &mut []);
}
}
+287
View File
@@ -0,0 +1,287 @@
//! Bit packing (Vorbis I §2) and codebooks (§3): Huffman lengths, the codeword assignment the
//! decoder derives from them, VQ lattices (lookup type 1) and the header encoding.
use super::{Error, Result};
/// LSB-first bit packer (Vorbis I §2.1.4): bits fill each byte from its least significant end.
#[derive(Clone, Debug, Default)]
pub struct BitWriter {
buf: Vec<u8>,
bits: u64,
}
impl BitWriter {
pub fn new() -> BitWriter {
BitWriter::default()
}
/// Writes the low `n` bits of `v` (`n` ≤ 32).
pub fn write(&mut self, v: u32, n: u32) {
let n = n.min(32);
for i in 0..n {
let bit = (v >> i) & 1;
let at = (self.bits / 8) as usize;
if at == self.buf.len() {
self.buf.push(0);
}
if bit != 0
&& let Some(b) = self.buf.get_mut(at)
{
*b |= 1 << (self.bits % 8);
}
self.bits += 1;
}
}
pub fn flag(&mut self, b: bool) {
self.write(b as u32, 1);
}
/// Writes a codeword MSB first: the decoder walks the tree from its first bit.
fn codeword(&mut self, word: u32, len: u32) {
for i in (0..len).rev() {
self.write((word >> i) & 1, 1);
}
}
pub fn bytes(&mut self, data: &[u8]) {
for &b in data {
self.write(u32::from(b), 8);
}
}
pub fn finish(self) -> Vec<u8> {
self.buf
}
}
/// `ilog` of the specification (§9.2.1): the position of the highest set bit, 0 for 0.
pub fn ilog(v: u32) -> u32 {
32 - v.leading_zeros()
}
/// The 32-bit float format of codebook headers (§9.2.2), for values it represents exactly.
pub fn float32_pack(v: f64) -> u32 {
if v == 0.0 || !v.is_finite() {
return 0;
}
let sign = if v < 0.0 { 0x8000_0000u32 } else { 0 };
let mut m = v.abs();
let mut exp: i32 = 0;
// a 21-bit mantissa: scale into [2^20, 2^21)
while m >= (1 << 21) as f64 {
m /= 2.0;
exp += 1;
}
while m < (1 << 20) as f64 {
m *= 2.0;
exp -= 1;
}
let mant = (m.round() as u32).min((1 << 21) - 1);
let biased = (exp + 788).clamp(0, 1023) as u32;
sign | (biased << 21) | mant
}
/// Huffman code lengths (1..=`max_len`) for `weights`, every entry coded.
pub fn huffman_lengths(weights: &[f64], max_len: u32) -> Vec<u32> {
let n = weights.len();
if n <= 1 {
return vec![1; n];
}
let total: f64 = weights.iter().map(|w| if w.is_finite() { w.max(0.0) } else { 0.0 }).sum::<f64>().max(1e-300);
let mut floor = 1e-9;
loop {
let w: Vec<f64> = weights.iter().map(|&x| (if x.is_finite() { x.max(0.0) } else { 0.0 }) / total + floor).collect();
let lens = huffman(&w);
if lens.iter().all(|&l| l <= max_len) || floor > 1.0 {
return lens.into_iter().map(|l| l.clamp(1, max_len)).collect();
}
floor *= 4.0;
}
}
fn huffman(w: &[f64]) -> Vec<u32> {
// nodes: (weight, children) with leaves first
let n = w.len();
let mut parent = vec![usize::MAX; 2 * n];
let mut weight: Vec<f64> = w.to_vec();
let mut alive: Vec<usize> = (0..n).collect();
while alive.len() > 1 {
alive.sort_by(|&a, &b| weight[b].partial_cmp(&weight[a]).unwrap_or(std::cmp::Ordering::Equal).then(b.cmp(&a)));
let (Some(a), Some(b)) = (alive.pop(), alive.pop()) else { break };
let id = weight.len();
weight.push(weight[a] + weight[b]);
if parent.len() <= id {
parent.resize(id + 1, usize::MAX);
}
parent[a] = id;
parent[b] = id;
alive.push(id);
}
(0..n)
.map(|i| {
let mut d = 0;
let mut x = i;
while let Some(&p) = parent.get(x) {
if p == usize::MAX {
break;
}
d += 1;
x = p;
}
d
})
.collect()
}
/// The codewords the decoder assigns to `lengths` (§3.2.1): in entry order, each entry gets the
/// lowest available codeword of its length (no prefix of an assigned codeword, and no assigned
/// codeword a prefix of it). An error when the lengths do not fit a prefix code.
pub fn assign_codewords(lengths: &[u32]) -> Result<Vec<u32>> {
// A trie of the assigned codewords: `children[node]` (0 = none), `leaf[node]`.
let mut children: Vec<[usize; 2]> = vec![[0, 0]];
let mut leaf = vec![false];
let mut words = Vec::with_capacity(lengths.len());
for &len in lengths {
if len == 0 || len > 32 {
return Err(Error::Internal("codeword length"));
}
let bits = lowest_free(&children, &leaf, 0, len).ok_or(Error::Internal("over-subscribed codebook"))?;
let mut node = 0usize;
let mut word = 0u32;
for &bit in &bits {
word = (word << 1) | bit as u32;
node = match children[node][bit] {
0 => {
children.push([0, 0]);
leaf.push(false);
let id = children.len() - 1;
children[node][bit] = id;
id
}
c => c,
};
}
leaf[node] = true;
words.push(word);
}
Ok(words)
}
/// The leftmost free path of `depth` bits below `node` (depth-first, 0 before 1).
fn lowest_free(children: &[[usize; 2]], leaf: &[bool], node: usize, depth: u32) -> Option<Vec<usize>> {
if leaf[node] || depth == 0 {
return None;
}
for bit in 0..2 {
let c = children[node][bit];
if c == 0 {
let mut p = vec![bit];
p.resize(depth as usize, 0);
return Some(p);
}
if let Some(mut rest) = lowest_free(children, leaf, c, depth - 1) {
rest.insert(0, bit);
return Some(rest);
}
}
None
}
/// A codebook: entry lengths and codewords, and for VQ books a lattice (lookup type 1).
#[derive(Clone, Debug)]
pub struct Codebook {
pub dimensions: u32,
pub lengths: Vec<u32>,
pub words: Vec<u32>,
/// Lattice values per dimension (lookup type 1: `values^dimensions == entries`).
pub lattice: Option<Lattice>,
}
#[derive(Clone, Copy, Debug)]
pub struct Lattice {
pub minimum: f64,
pub delta: f64,
/// Values per dimension.
pub values: u32,
}
impl Codebook {
/// A scalar book (no lookup) of `weights.len()` entries.
pub fn scalar(dimensions: u32, weights: &[f64]) -> Result<Codebook> {
let lengths = huffman_lengths(weights, 20);
let words = assign_codewords(&lengths)?;
Ok(Codebook { dimensions, lengths, words, lattice: None })
}
/// A lattice VQ book: `values` integers per dimension from `minimum` in steps of `delta`;
/// `weight(v)` is the relative probability of one component `v`.
pub fn lattice(dimensions: u32, values: u32, minimum: i32, delta: i32, weight: impl Fn(i32) -> f64) -> Result<Codebook> {
let entries = values.checked_pow(dimensions).ok_or(Error::Internal("codebook size"))?;
let w: Vec<f64> = (0..entries)
.map(|e| {
let mut p = 1.0;
let mut rest = e;
for _ in 0..dimensions {
let t = (rest % values) as i32;
rest /= values;
p *= weight(minimum + t * delta);
}
p
})
.collect();
let lengths = huffman_lengths(&w, 20);
let words = assign_codewords(&lengths)?;
Ok(Codebook { dimensions, lengths, words, lattice: Some(Lattice { minimum: f64::from(minimum), delta: f64::from(delta), values }) })
}
pub fn entries(&self) -> usize {
self.lengths.len()
}
/// Writes entry `e`.
pub fn put(&self, w: &mut BitWriter, e: usize) {
if let (Some(&word), Some(&len)) = (self.words.get(e), self.lengths.get(e)) {
w.codeword(word, len);
}
}
/// The entry of the lattice vector `v` (component 0 is the least significant digit, §3.2.1).
pub fn entry_of(&self, v: &[i32]) -> usize {
let Some(l) = self.lattice else { return 0 };
let mut e = 0usize;
let mut scale = 1usize;
for &x in v.iter().take(self.dimensions as usize) {
let t = ((f64::from(x) - l.minimum) / l.delta).round().clamp(0.0, f64::from(l.values - 1)) as usize;
e += t * scale;
scale *= l.values as usize;
}
e
}
/// The header encoding (§3.2.1).
pub fn write_header(&self, w: &mut BitWriter) {
w.write(0x56_4342, 24);
w.write(self.dimensions, 16);
w.write(self.entries() as u32, 24);
w.flag(false); // not ordered
w.flag(false); // not sparse
for &l in &self.lengths {
w.write(l - 1, 5);
}
match self.lattice {
None => w.write(0, 4),
Some(l) => {
w.write(1, 4);
w.write(float32_pack(l.minimum), 32);
w.write(float32_pack(l.delta), 32);
let bits = ilog(l.values - 1).max(1);
w.write(bits - 1, 4);
w.flag(false); // sequence_p
for m in 0..l.values {
w.write(m, bits);
}
}
}
}
}
+207
View File
@@ -0,0 +1,207 @@
//! Floor type 1 (Vorbis I §7): a piecewise-linear spectral envelope in the decoder's dB scale.
//!
//! The encoder picks a target value at each of the floor's X positions, codes it against the
//! decoder's prediction from its neighbours (step 2 of §7.2.4, inverted), and renders the curve
//! exactly as the decoder will (`render_line`, integer arithmetic), so the residue is computed
//! against the very floor the decoder multiplies it by.
use super::book::{BitWriter, Codebook, ilog};
/// `floor1_multiplier`: 2, so values run 0..128 and step two entries of the dB table.
pub const MULTIPLIER: u32 = 2;
/// The value range for [`MULTIPLIER`] 2.
pub const RANGE: i32 = 128;
const RANGE_BITS: u32 = 10;
/// Points per partition, and partitions.
pub const CLASS_DIM: usize = 4;
pub const PARTITIONS: usize = 8;
/// Step (in dB) between entries of `floor1_inverse_dB_table`: it runs from 1.0649863e-07 to 1
/// over 256 entries.
fn db_step() -> f64 {
(1.0f64 / 1.064_986_3e-7).ln() / 255.0
}
/// `floor1_inverse_dB_table[i]`.
pub fn inverse_db(i: i32) -> f32 {
(f64::from(i.clamp(0, 255) - 255) * db_step()).exp() as f32
}
/// The table index whose amplitude is nearest (in dB) to `a`.
pub fn db_index(a: f32) -> i32 {
if !a.is_finite() || a <= 0.0 {
return 0;
}
((f64::from(a)).ln() / db_step() + 255.0).round().clamp(0.0, 255.0) as i32
}
/// A floor 1 configuration for blocks of `n/2 = 2^RANGE_BITS` bins.
#[derive(Clone, Debug)]
pub struct Floor1 {
/// X positions: 0, 1024, then the partitions' points.
pub xs: Vec<i32>,
/// Index of the book coding the point values.
pub book: usize,
/// For each point (in coding order) its low and high neighbours.
neighbours: Vec<(usize, usize)>,
/// Point indices sorted by X.
sorted: Vec<usize>,
}
impl Floor1 {
/// Points spaced about evenly in log frequency over 1..1024.
pub fn new(book: usize) -> Floor1 {
let count = CLASS_DIM * PARTITIONS;
let mut xs = vec![0, 1 << RANGE_BITS];
let mut last = 0;
for i in 1..=count {
// geometric from 2 to ~1000 bins, at least one bin apart
let x = (2.0f64 * (500.0f64).powf((i - 1) as f64 / (count - 1) as f64)).round() as i32;
let x = x.max(last + 1).min((1 << RANGE_BITS) - 1);
xs.push(x);
last = x;
}
let neighbours = (0..xs.len())
.map(|i| {
if i < 2 {
return (0, 0);
}
let (mut lo, mut hi) = (0usize, 1usize);
for j in 0..i {
if xs[j] < xs[i] && xs[j] > xs[lo] {
lo = j;
}
if xs[j] > xs[i] && xs[j] < xs[hi] {
hi = j;
}
}
(lo, hi)
})
.collect();
let mut sorted: Vec<usize> = (0..xs.len()).collect();
sorted.sort_by_key(|&i| xs[i]);
Floor1 { xs, book, neighbours, sorted }
}
/// The setup-header encoding (§7.2.2): one class of `CLASS_DIM` points, no subclasses.
pub fn write_header(&self, w: &mut BitWriter) {
w.write(PARTITIONS as u32, 5);
for _ in 0..PARTITIONS {
w.write(0, 4);
}
w.write(CLASS_DIM as u32 - 1, 3);
w.write(0, 2); // no subclasses
w.write(self.book as u32 + 1, 8);
w.write(MULTIPLIER - 1, 2);
w.write(RANGE_BITS, 4);
for &x in &self.xs[2..] {
w.write(x as u32, RANGE_BITS);
}
}
/// Codes the target values `want` (one per point, 0..RANGE) into `w`; returns the floor curve
/// the decoder renders (`n2` amplitudes).
pub fn encode(&self, w: &mut BitWriter, book: &Codebook, want: &[i32], n2: usize) -> Vec<f32> {
let n = self.xs.len();
let want = |i: usize| want.get(i).copied().unwrap_or(0).clamp(0, RANGE - 1);
let mut fin = vec![0i32; n];
let mut used = vec![false; n];
let mut coded = vec![0u32; n];
fin[0] = want(0);
fin[1] = want(1);
used[0] = true;
used[1] = true;
for i in 2..n {
let (lo, hi) = self.neighbours[i];
let pred = render_point(self.xs[lo], fin[lo], self.xs[hi], fin[hi], self.xs[i]);
let f = want(i);
let (highroom, lowroom) = (RANGE - pred, pred);
let room = 2 * highroom.min(lowroom);
let val = if f == pred {
0
} else {
let d = f - pred;
let inside = if d > 0 { 2 * d } else { -2 * d - 1 };
if inside < room {
inside
} else if highroom > lowroom {
f - pred + lowroom
} else {
pred - f + highroom - 1
}
};
coded[i] = val.clamp(0, RANGE - 1) as u32;
if val != 0 {
used[lo] = true;
used[hi] = true;
used[i] = true;
fin[i] = f;
} else {
fin[i] = pred;
}
}
let bits = ilog(RANGE as u32 - 1);
w.write(fin[0] as u32, bits);
w.write(fin[1] as u32, bits);
for &c in &coded[2..] {
book.put(w, c as usize);
}
self.render(&fin, &used, n2)
}
/// The decoder's curve (§7.2.4 step 2, `render_line`) as amplitudes.
fn render(&self, fin: &[i32], used: &[bool], n2: usize) -> Vec<f32> {
let mut v = vec![0i32; n2];
let m = MULTIPLIER as i32;
let (mut lx, mut ly) = (0i32, fin[self.sorted[0]] * m);
let (mut hx, mut hy) = (0i32, ly);
for &i in &self.sorted[1..] {
if used[i] {
hy = fin[i] * m;
hx = self.xs[i];
render_line(lx, ly, hx, hy, &mut v);
lx = hx;
ly = hy;
}
}
if (hx as usize) < n2 {
render_line(hx, hy, n2 as i32, hy, &mut v);
}
v.iter().map(|&i| inverse_db(i)).collect()
}
}
fn render_point(x0: i32, y0: i32, x1: i32, y1: i32, x: i32) -> i32 {
let dy = y1 - y0;
let adx = (x1 - x0).max(1);
let err = dy.abs() * (x - x0);
let off = err / adx;
if dy < 0 { y0 - off } else { y0 + off }
}
fn render_line(x0: i32, y0: i32, x1: i32, y1: i32, v: &mut [i32]) {
let dy = y1 - y0;
let adx = x1 - x0;
if adx <= 0 {
return;
}
let base = dy / adx;
let sy = if dy < 0 { base - 1 } else { base + 1 };
let ady = dy.abs() - base.abs() * adx;
let (mut y, mut err) = (y0, 0);
if let Some(s) = v.get_mut(x0 as usize) {
*s = y;
}
for x in x0 + 1..x1 {
err += ady;
if err >= adx {
err -= adx;
y += sy;
} else {
y += base;
}
if let Some(s) = v.get_mut(x as usize) {
*s = y;
}
}
}
+134
View File
@@ -0,0 +1,134 @@
//! Forward MDCT of a windowed block of `n` samples to `n/2` coefficients:
//! `X[k] = Σ x[j] cos(2π/n · (j + 1/2 + n/4)(k + 1/2))`, the transform the Vorbis decoder inverts
//! (Vorbis I §1.3.2, §4.3.9). Computed as a DCT-IV of the folded block through an `n/8`-point
//! complex FFT.
use std::f64::consts::PI;
#[derive(Clone, Copy, Default, Debug)]
struct Cpx {
re: f64,
im: f64,
}
impl Cpx {
fn mul(self, o: Cpx) -> Cpx {
Cpx { re: self.re * o.re - self.im * o.im, im: self.re * o.im + self.im * o.re }
}
}
/// A forward MDCT for one block size (a power of two, at least 16).
#[derive(Clone, Debug)]
pub struct Mdct {
n: usize,
twiddle: Vec<Cpx>,
post: Vec<Cpx>,
fft_tw: Vec<Cpx>,
rev: Vec<usize>,
}
impl Mdct {
pub fn new(n: usize) -> Mdct {
let m = n / 2; // DCT-IV length
let h = m / 2; // FFT length
let twiddle = (0..h).map(|j| cis(-PI * (4.0 * j as f64 + 1.0) / (4.0 * m as f64))).collect();
let post = (0..h).map(|k| cis(-PI * k as f64 / m as f64)).collect();
let fft_tw = (0..h / 2).map(|j| cis(-2.0 * PI * j as f64 / h as f64)).collect();
let bits = h.trailing_zeros();
let rev = (0..h).map(|i| if bits == 0 { 0 } else { i.reverse_bits() >> (usize::BITS - bits) }).collect();
Mdct { n, twiddle, post, fft_tw, rev }
}
/// `x`: `n` windowed samples; `out`: `n/2` coefficients (scaled by `scale`).
pub fn forward(&self, x: &[f32], out: &mut [f32], scale: f64) {
let n = self.n;
let m = n / 2;
let q = n / 4;
let at = |i: usize| f64::from(x.get(i).copied().unwrap_or(0.0));
// fold (a, b, c, d) to the DCT-IV input (-c_r - d, a - b_r)
let mut v = vec![0f64; m];
for (i, s) in v.iter_mut().enumerate() {
*s = if i < q { -at(3 * q - 1 - i) - at(3 * q + i) } else { at(i - q) - at(3 * q - 1 - i) };
}
// DCT-IV through a half-length complex FFT
let h = m / 2;
let mut z: Vec<Cpx> = (0..h).map(|j| Cpx { re: v[2 * j], im: v[m - 1 - 2 * j] }.mul(self.twiddle[j])).collect();
self.fft(&mut z);
for (k, c) in z.iter().enumerate() {
let d = c.mul(self.post[k]);
if let Some(o) = out.get_mut(2 * k) {
*o = (d.re * scale) as f32;
}
if let Some(o) = out.get_mut(m - 1 - 2 * k) {
*o = (-d.im * scale) as f32;
}
}
}
/// In-place radix-2 FFT (`e^{-2πi jk/h}`).
fn fft(&self, a: &mut [Cpx]) {
let h = a.len();
for i in 0..h {
let j = self.rev[i];
if i < j {
a.swap(i, j);
}
}
let mut len = 2;
while len <= h {
let step = h / len;
for start in (0..h).step_by(len) {
for k in 0..len / 2 {
let w = self.fft_tw[k * step];
let u = a[start + k];
let t = a[start + k + len / 2].mul(w);
a[start + k] = Cpx { re: u.re + t.re, im: u.im + t.im };
a[start + k + len / 2] = Cpx { re: u.re - t.re, im: u.im - t.im };
}
}
len *= 2;
}
}
}
fn cis(t: f64) -> Cpx {
Cpx { re: t.cos(), im: t.sin() }
}
/// The Vorbis window (§4.3.1) for a block of `n` between blocks of the same size.
pub fn window(n: usize) -> Vec<f32> {
(0..n)
.map(|i| {
let s = (PI * (i as f64 + 0.5) / n as f64).sin();
(PI / 2.0 * s * s).sin() as f32
})
.collect()
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn matches_the_direct_formula() {
for n in [16usize, 64, 256, 2048] {
let x: Vec<f32> = (0..n).map(|i| ((i * 7919 % 211) as f32 - 105.0) / 50.0).collect();
let mut fast = vec![0f32; n / 2];
Mdct::new(n).forward(&x, &mut fast, 1.0);
for k in [0usize, 1, 2, n / 4, n / 2 - 1] {
let direct: f64 =
(0..n).map(|j| f64::from(x[j]) * (2.0 * PI / n as f64 * (j as f64 + 0.5 + n as f64 / 4.0) * (k as f64 + 0.5)).cos()).sum();
assert!((direct - f64::from(fast[k])).abs() < 1e-3 * (1.0 + direct.abs()), "n={n} k={k}: {direct} vs {}", fast[k]);
}
}
}
#[test]
fn the_window_is_power_complementary() {
let w = window(2048);
for i in 0..1024 {
let s = w[i] * w[i] + w[i + 1024] * w[i + 1024];
assert!((s - 1.0).abs() < 1e-5, "{i}: {s}");
}
}
}
+494
View File
@@ -0,0 +1,494 @@
//! Pure-Rust Vorbis I encoder, written from the Vorbis I specification (Xiph.Org, 2020-07-04).
//!
//! No `unsafe` and no C code; builds for `wasm32-unknown-unknown`. ffmpeg is used only as an
//! external test oracle.
//!
//! The stream: one mode of 2048-sample blocks; per channel a floor 1 envelope of 34 points; one
//! residue type 2 over the interleaved channels, partitions of 32 values (a multiple of the
//! channel count for 3, 5, 6 and 7 channels) in seven classes (silent,
//! three single-pass lattice books, and two- and three-pass cascades for large values); no channel
//! coupling. Quality (-1 to 10) sets how far the floor sits from the spectral envelope (below it
//! for tonal regions, above it for noise-like ones, from the spectral flatness), and with it the
//! residue's precision: variable bit rate, like other Vorbis encoders.
//!
//! From FilmCraft's `filmcraft-vorbis` by @JordyUSA (storytold/filmcraft#4481).
//!
//! The packets go into Ogg with [`craft_media::ogg::PageWriter`] and a comment header from
//! [`craft_media::ogg::vorbis_comment`]; [`crate::encode_ogg_vorbis`] does all of it for a
//! whole buffer.
//!
//! ```
//! use craft_audio::vorbis::encoder::{Encoder, EncoderConfig};
//!
//! let mut enc = Encoder::new(EncoderConfig::new(48_000, 2, 5.0))?;
//! let tone: Vec<f32> = (0..4_800).map(|i| (i as f32 * 0.05).sin() * 0.5).collect();
//! let mut packets = enc.encode(&[&tone, &tone])?;
//! packets.extend(enc.finish()?);
//! // the last granule position is the input's length, so a decoder trims the padding
//! assert_eq!(packets.last().map(|p| p.1), Some(4_800));
//! assert_eq!(&enc.identification()[1..7], b"vorbis");
//! # Ok::<(), craft_audio::vorbis::encoder::Error>(())
//! ```
// Index loops follow the specification, as in FilmCraft (which allows this lint workspace-wide).
#![allow(clippy::needless_range_loop)]
mod book;
mod floor;
mod mdct;
use book::{BitWriter, Codebook};
use floor::Floor1;
use mdct::Mdct;
/// Why an encoder could not be created or input could not be encoded.
#[non_exhaustive]
#[derive(Clone, Debug, PartialEq, Eq, thiserror::Error)]
pub enum Error {
/// A setting or the input is outside what the encoder takes.
#[error("invalid argument: {0}")]
InvalidArgument(&'static str),
/// An encoder invariant failed (a bug, reported instead of panicking).
#[error("internal error: {0}")]
Internal(&'static str),
}
/// The encoder's result type.
pub type Result<T> = std::result::Result<T, Error>;
/// Block size (samples); the short block size of the header is never used.
pub const BLOCK: usize = 2048;
const HOP: usize = BLOCK / 2;
/// Residue values per partition for `channels` channels: 32, or for 3, 5, 6 and 7 channels a
/// multiple of the channel count (48, 40, 48, 56). libvorbis decodes each partition of an
/// interleaved (type 2) residue as if it started on channel 0, so a partition must hold whole
/// sample frames; the size also divides `channels × 1024` and is a multiple of every book's
/// dimension (4).
fn partition_size(channels: usize) -> usize {
match channels {
3 | 6 => 48,
5 => 40,
7 => 56,
_ => 32,
}
}
const CLASSES: usize = 8;
/// Largest residue magnitude the cascade codes: 7·225 + 7·15 + 7.
const MAX_RESIDUE: i32 = 1687;
/// The quality a NaN or infinite setting reads as.
pub const DEFAULT_QUALITY: f32 = 6.0;
/// Encoder settings.
#[derive(Clone, Copy, Debug, PartialEq)]
pub struct EncoderConfig {
/// Samples per second, 1 to 768 000.
pub sample_rate: u32,
/// 1 to 8, in Vorbis channel order (§4.3.9).
pub channels: usize,
/// -1 (smallest) to 10 (best); clamped.
pub quality: f32,
}
impl EncoderConfig {
/// Settings for `channels` channels (in Vorbis order) at `sample_rate` and `quality`.
pub fn new(sample_rate: u32, channels: usize, quality: f32) -> EncoderConfig {
EncoderConfig { sample_rate, channels, quality }
}
}
/// Book indices in the setup header.
const BOOK_CLASS: usize = 0;
const BOOK_FLOOR: usize = 1;
const BOOK_A1_SPARSE: usize = 2;
const BOOK_A1: usize = 3;
const BOOK_A2: usize = 4;
const BOOK_A4: usize = 5;
const BOOK_F: usize = 6;
const BOOK_M: usize = 7;
const BOOK_C: usize = 8;
/// Books per class and pass (`None`: nothing coded in that pass).
const CASCADE: [[Option<usize>; 3]; CLASSES] = [
[None, None, None],
[Some(BOOK_A1_SPARSE), None, None],
[Some(BOOK_A1), None, None],
[Some(BOOK_A2), None, None],
[Some(BOOK_A4), None, None],
[Some(BOOK_F), None, None],
[Some(BOOK_M), Some(BOOK_F), None],
[Some(BOOK_C), Some(BOOK_M), Some(BOOK_F)],
];
/// A Vorbis encoder for one stream: planar `f32` in, Vorbis packets with their granule
/// positions out.
pub struct Encoder {
cfg: EncoderConfig,
books: Vec<Codebook>,
floor: Floor1,
mdct: Mdct,
window: Vec<f32>,
/// Input not yet past a block, per channel; the next block starts at `start`.
pending: Vec<Vec<f32>>,
/// Read cursor into `pending`: consumed hops are dropped once per call, not per block.
start: usize,
samples_in: u64,
blocks: u64,
finished: bool,
/// Floor offset below the envelope (dB) for tonal and for noise-like regions.
tonal_db: f32,
noise_db: f32,
/// Residue magnitudes below this quantise to 0.
dead_zone: f32,
}
impl Encoder {
/// An encoder for `cfg`: 1 to 8 channels, a sample rate of 1 to 768 000; the quality is
/// clamped to -1..=10, and NaN or infinite reads as [`DEFAULT_QUALITY`].
pub fn new(cfg: EncoderConfig) -> Result<Encoder> {
if !(1..=8).contains(&cfg.channels) {
return Err(Error::InvalidArgument("Vorbis encoder: 1 to 8 channels"));
}
if !(1..=768_000).contains(&cfg.sample_rate) {
return Err(Error::InvalidArgument("Vorbis encoder: sample rate"));
}
let quality = if cfg.quality.is_finite() { cfg.quality.clamp(-1.0, 10.0) } else { DEFAULT_QUALITY };
let cfg = EncoderConfig { quality, ..cfg };
let books = vec![
Codebook::scalar(2, &(0..CLASSES * CLASSES).map(|e| class_weight(e / CLASSES) * class_weight(e % CLASSES)).collect::<Vec<_>>())?,
Codebook::scalar(1, &(0..floor::RANGE).map(|v| 1.0 / (1.0 + f64::from(v)).powf(1.6)).collect::<Vec<_>>())?,
Codebook::lattice(4, 3, -1, 1, |v| if v == 0 { 0.92 } else { 0.04 })?,
Codebook::lattice(4, 3, -1, 1, |v| if v == 0 { 0.5 } else { 0.25 })?,
Codebook::lattice(2, 5, -2, 1, |v| 0.6f64.powi(v.abs()))?,
Codebook::lattice(2, 9, -4, 1, |v| 0.7f64.powi(v.abs()))?,
Codebook::lattice(2, 15, -7, 1, |v| 0.8f64.powi(v.abs()))?,
Codebook::lattice(2, 15, -105, 15, |v| 0.55f64.powi((v / 15).abs()))?,
Codebook::lattice(2, 15, -1575, 225, |v| 0.4f64.powi((v / 225).abs()))?,
];
Ok(Encoder {
cfg,
books,
floor: Floor1::new(BOOK_FLOOR),
mdct: Mdct::new(BLOCK),
window: mdct::window(BLOCK),
// the first block is centred on sample 0: the decoder's first output is input sample 0
pending: vec![vec![0.0; HOP]; cfg.channels],
start: 0,
samples_in: 0,
blocks: 0,
finished: false,
// tones 4 dB (-1) to 30.4 dB (10) under their envelope; noise 14 dB above it (-1)
// to 4.1 dB (10)
tonal_db: 4.0 + 2.4 * (quality + 1.0),
noise_db: -14.0 + 0.9 * (quality + 1.0),
dead_zone: 0.8 - 0.025 * (quality + 1.0),
})
}
/// Channels per sample frame.
pub fn channels(&self) -> usize {
self.cfg.channels
}
/// The quality in use, after clamping.
pub fn quality(&self) -> f32 {
self.cfg.quality
}
/// Input samples per channel taken so far.
pub fn samples_in(&self) -> u64 {
self.samples_in
}
/// The identification header packet (§4.2.2): the first packet of the stream.
pub fn identification(&self) -> Vec<u8> {
let mut w = BitWriter::new();
w.write(1, 8);
w.bytes(b"vorbis");
w.write(0, 32);
w.write(self.cfg.channels as u32, 8);
w.write(self.cfg.sample_rate, 32);
w.write(0, 32); // bit rates: unset (variable)
w.write(0, 32);
w.write(0, 32);
w.write(8, 4); // 256-sample short blocks (unused)
w.write(11, 4); // 2048-sample long blocks
w.flag(true);
w.finish()
}
/// The setup header packet (§4.2.4): codebooks, floor, residue, mapping and mode. It follows
/// the comment header.
pub fn setup(&self) -> Vec<u8> {
let mut w = BitWriter::new();
w.write(5, 8);
w.bytes(b"vorbis");
w.write(self.books.len() as u32 - 1, 8);
for b in &self.books {
b.write_header(&mut w);
}
w.write(0, 6); // one time-domain transform placeholder
w.write(0, 16);
w.write(0, 6); // one floor
w.write(1, 16);
self.floor.write_header(&mut w);
w.write(0, 6); // one residue, type 2
w.write(2, 16);
let end = (self.cfg.channels * HOP) as u32;
w.write(0, 24);
w.write(end, 24);
w.write(partition_size(self.cfg.channels) as u32 - 1, 24);
w.write(CLASSES as u32 - 1, 6);
w.write(BOOK_CLASS as u32, 8);
for c in &CASCADE {
let bits: u32 = c.iter().enumerate().map(|(j, b)| u32::from(b.is_some()) << j).sum();
w.write(bits & 7, 3);
w.flag(bits > 7);
if bits > 7 {
w.write(bits >> 3, 5);
}
}
for c in &CASCADE {
for b in c.iter().flatten() {
w.write(*b as u32, 8);
}
}
w.write(0, 6); // one mapping, type 0
w.write(0, 16);
w.flag(false); // one submap
w.flag(false); // no coupling
w.write(0, 2);
w.write(0, 8); // submap 0: time, floor 0, residue 0
w.write(0, 8);
w.write(0, 8);
w.write(0, 6); // one mode: long blocks, mapping 0
w.flag(true);
w.write(0, 16);
w.write(0, 16);
w.write(0, 8);
w.flag(true);
w.finish()
}
/// Encodes planar samples (one slice per channel, all the same length, nominal range ±1);
/// returns the packets completed with their granule positions. NaN or infinite samples, or a
/// channel count or length mismatch, are an error.
pub fn encode(&mut self, planar: &[&[f32]]) -> Result<Vec<(Vec<u8>, i64)>> {
if self.finished {
return Err(Error::InvalidArgument("Vorbis encoder: encode after finish"));
}
if planar.len() != self.cfg.channels {
return Err(Error::InvalidArgument("Vorbis encoder: one slice per channel"));
}
let len = planar.first().map_or(0, |p| p.len());
if planar.iter().any(|p| p.len() != len) {
return Err(Error::InvalidArgument("Vorbis encoder: channels of different lengths"));
}
if planar.iter().any(|p| p.iter().any(|v| !v.is_finite())) {
return Err(Error::InvalidArgument("Vorbis encoder: NaN or infinite sample"));
}
for (b, p) in self.pending.iter_mut().zip(planar) {
b.extend_from_slice(p);
}
self.samples_in += len as u64;
self.drain()
}
/// Encodes what remains, padded with silence; the last packet's granule position is the
/// input's length, so the decoder trims the padding (§A.2).
pub fn finish(&mut self) -> Result<Vec<(Vec<u8>, i64)>> {
if self.finished {
return Ok(Vec::new());
}
self.finished = true;
// block k ends output at k·HOP: blocks 0..=ceil(len / HOP)
let blocks = self.samples_in.div_ceil(HOP as u64) + 1;
let missing = blocks.saturating_sub(self.blocks) as usize;
self.compact();
let need = (missing + 1) * HOP;
for b in self.pending.iter_mut() {
if b.len() < need {
b.resize(need, 0.0);
}
}
let mut out = Vec::new();
for _ in 0..missing {
out.push(self.block()?);
}
Ok(out)
}
fn drain(&mut self) -> Result<Vec<(Vec<u8>, i64)>> {
let mut out = Vec::new();
while self.pending.first().is_some_and(|b| b.len().saturating_sub(self.start) >= BLOCK) {
out.push(self.block()?);
}
self.compact();
Ok(out)
}
/// Drops the hops already encoded from the front of every channel buffer.
fn compact(&mut self) {
for b in self.pending.iter_mut() {
b.drain(..self.start.min(b.len()));
}
self.start = 0;
}
/// Encodes the block at `start` in `pending` and advances by a hop.
fn block(&mut self) -> Result<(Vec<u8>, i64)> {
let ch = self.cfg.channels;
let mut w = BitWriter::new();
w.write(0, 1); // audio packet; one mode, so no mode number
w.flag(true); // previous and next windows long
w.flag(true);
let mut residue = vec![0i32; ch * HOP];
let mut any = false;
let mut x = vec![0f32; BLOCK];
let mut coeffs = vec![0f32; HOP];
for c in 0..ch {
let src = self.pending.get(c).and_then(|b| b.get(self.start..)).ok_or(Error::Internal("channel buffer"))?;
for (i, v) in x.iter_mut().enumerate() {
*v = src.get(i).copied().unwrap_or(0.0).clamp(-8.0, 8.0) * self.window[i];
}
self.mdct.forward(&x, &mut coeffs, 2.0 / HOP as f64);
let peak = coeffs.iter().fold(0f32, |m, v| m.max(v.abs()));
// (a NaN peak cannot happen: samples are finite and clamped)
if peak <= 1e-7 {
w.flag(false); // floor unused: the channel is silent
continue;
}
any = true;
w.flag(true);
let want = self.floor_targets(&coeffs);
let curve = self.floor.encode(&mut w, &self.books[BOOK_FLOOR], &want, HOP);
for (k, (&v, &f)) in coeffs.iter().zip(&curve).enumerate() {
let r = if f > 0.0 { v / f } else { 0.0 };
// a dead zone: values just past half a step are noise peaks, not worth a ±1
let q = if r.abs() < self.dead_zone { 0.0 } else { r.round() };
residue[k * ch + c] = if q.is_finite() { (q as i32).clamp(-MAX_RESIDUE, MAX_RESIDUE) } else { 0 };
}
}
if any {
self.write_residue(&mut w, &residue);
}
let granule = if self.blocks == 0 {
0
} else {
let natural = self.blocks.saturating_mul(HOP as u64);
if self.finished { natural.min(self.samples_in) } else { natural }
};
self.start += HOP;
self.blocks += 1;
Ok((w.finish(), i64::try_from(granule).unwrap_or(i64::MAX)))
}
/// Floor values at the floor's points: the spectral envelope (power smoothed over a quarter of
/// the frequency, at least 8 bins, on each side) less an offset that grows with the region's tonality, from its
/// spectral flatness: noise needs a few dB of precision, tones much more.
fn floor_targets(&self, coeffs: &[f32]) -> Vec<i32> {
let n = coeffs.len();
let mut cum = vec![0f64; n + 1];
let mut cum_ln = vec![0f64; n + 1];
for (i, &v) in coeffs.iter().enumerate() {
let p = f64::from(v) * f64::from(v);
cum[i + 1] = cum[i] + p;
cum_ln[i + 1] = cum_ln[i] + (p + 1e-30).ln();
}
self.floor
.xs
.iter()
.map(|&x| {
let k = (x as usize).min(n - 1);
let half = (k / 4).max(8);
let (lo, hi) = (k.saturating_sub(half), (k + half + 1).min(n));
let len = (hi - lo) as f64;
let am = (cum[hi] - cum[lo]) / len;
let gm = ((cum_ln[hi] - cum_ln[lo]) / len).exp();
// spectral flatness: about -2.5 dB for noise, far below for a tone
let sfm_db = 10.0 * (gm / am.max(1e-30)).max(1e-30).log10();
let tonality = ((-sfm_db - 2.5) / 20.0).clamp(0.0, 1.0);
let offset = tonality * f64::from(self.tonal_db) + (1.0 - tonality) * f64::from(self.noise_db);
let amp = (am.sqrt() * 10f64.powf(-offset / 20.0)).max(1e-7) as f32;
(floor::db_index(amp) + 1) / floor::MULTIPLIER as i32
})
.collect()
}
/// Residue type 2 (§8.6.2 with the interleaved vector): classes per partition, then the
/// cascade's passes in the decoder's order.
fn write_residue(&self, w: &mut BitWriter, r: &[i32]) {
let partition = partition_size(self.cfg.channels);
let parts = r.len() / partition;
let classes: Vec<usize> = r.chunks(partition).map(class_of).collect();
let per_word = self.books[BOOK_CLASS].dimensions as usize;
for pass in 0..3 {
let mut pc = 0;
while pc < parts {
if pass == 0 {
let mut e = 0usize;
for i in 0..per_word {
e = e * CLASSES + classes.get(pc + i).copied().unwrap_or(0);
}
self.books[BOOK_CLASS].put(w, e);
}
for _ in 0..per_word {
if pc >= parts {
break;
}
let class = classes[pc];
if let Some(b) = CASCADE[class][pass] {
let book = &self.books[b];
let dims = book.dimensions as usize;
let part = &r[pc * partition..(pc + 1) * partition];
for chunk in part.chunks(dims) {
let v: Vec<i32> = chunk.iter().map(|&x| pass_value(x, class, pass)).collect();
book.put(w, book.entry_of(&v));
}
}
pc += 1;
}
}
}
}
}
/// Relative frequency of each residue class (for the class book's code lengths).
fn class_weight(c: usize) -> f64 {
[0.3, 0.2, 0.12, 0.12, 0.1, 0.08, 0.06, 0.02].get(c).copied().unwrap_or(0.01)
}
/// The part of residue value `v` coded in `pass` for `class`: the passes add up to `v`.
fn pass_value(v: i32, class: usize, pass: usize) -> i32 {
let split = |v: i32, step: i32| -> (i32, i32) {
let a = ((f64::from(v) / f64::from(step)).round() as i32).clamp(-7, 7);
(a * step, v - a * step)
};
match (class, pass) {
(6, 0) => split(v, 15).0,
(6, _) => split(v, 15).1,
(7, 0) => split(v, 225).0,
(7, 1) => split(split(v, 225).1, 15).0,
(7, _) => split(split(v, 225).1, 15).1,
_ => v,
}
}
/// The residue class of a partition: silent; ±1 with at most four nonzero values, or more; then
/// by the largest magnitude.
fn class_of(p: &[i32]) -> usize {
let m = p.iter().map(|v| v.abs()).max().unwrap_or(0);
match m {
0 => 0,
1 if p.iter().filter(|&&v| v != 0).count() <= 4 => 1,
1 => 2,
2 => 3,
3..=4 => 4,
5..=7 => 5,
8..=112 => 6,
_ => 7,
}
}
#[cfg(test)]
mod tests;
+285
View File
@@ -0,0 +1,285 @@
//! Unit tests, and ffmpeg (as an external oracle only) decoding the encoder's streams.
#![allow(clippy::unwrap_used)]
use std::path::Path;
use std::process::Command;
use super::book::{BitWriter, assign_codewords, float32_pack};
use super::{BLOCK, Encoder, EncoderConfig, HOP, partition_size};
#[test]
fn codewords_follow_the_specification_example() {
// Vorbis I §3.2.1: lengths 2 4 4 4 4 2 3 3
let words = assign_codewords(&[2, 4, 4, 4, 4, 2, 3, 3]).unwrap();
assert_eq!(words, [0b00, 0b0100, 0b0101, 0b0110, 0b0111, 0b10, 0b110, 0b111]);
assert!(assign_codewords(&[1, 1, 1]).is_err(), "over-subscribed");
}
#[test]
fn every_book_is_a_complete_prefix_code() {
let e = Encoder::new(EncoderConfig::new(48_000, 2, 5.0)).unwrap();
for (i, b) in e.books.iter().enumerate() {
let kraft: f64 = b.lengths.iter().map(|&l| 0.5f64.powi(l as i32)).sum();
assert!((kraft - 1.0).abs() < 1e-9, "book {i}: Kraft sum {kraft}");
assert!(b.lengths.iter().all(|&l| (1..=20).contains(&l)));
for (a, (&wa, &la)) in b.words.iter().zip(&b.lengths).enumerate() {
for (c, (&wc, &lc)) in b.words.iter().zip(&b.lengths).enumerate() {
if a != c && la <= lc {
assert_ne!(wc >> (lc - la), wa, "book {i}: codeword {a} is a prefix of {c}");
}
}
}
}
}
#[test]
fn float32_pack_is_exact_for_lattice_values() {
let unpack = |x: u32| {
let mant = f64::from(x & 0x1F_FFFF);
let exp = ((x >> 21) & 0x3FF) as i32 - 788;
let v = mant * 2f64.powi(exp);
if x & 0x8000_0000 != 0 { -v } else { v }
};
for v in [1.0, -1.0, -2.0, -4.0, -7.0, -105.0, 15.0, -1575.0, 225.0, 0.5, 3.0] {
assert_eq!(unpack(float32_pack(v)), v);
}
assert_eq!(float32_pack(0.0), 0);
}
#[test]
fn bits_are_packed_lsb_first() {
let mut w = BitWriter::new();
w.write(0b1, 1);
w.write(0b10, 2);
w.write(0x1F, 5);
w.write(0xABC, 12);
assert_eq!(w.finish(), [0b1111_1101, 0xBC, 0x0A]);
}
#[test]
fn hostile_input_is_an_error_not_a_panic() {
assert!(Encoder::new(EncoderConfig::new(48_000, 0, 3.0)).is_err());
assert!(Encoder::new(EncoderConfig::new(48_000, 9, 3.0)).is_err());
assert!(Encoder::new(EncoderConfig::new(0, 2, 3.0)).is_err());
assert_eq!(Encoder::new(EncoderConfig::new(48_000, 1, f32::NAN)).unwrap().cfg.quality, 6.0, "NaN quality uses the default, as the export does");
let mut e = Encoder::new(EncoderConfig::new(44_100, 2, 3.0)).unwrap();
assert!(e.encode(&[&[0.0; 4]]).is_err());
assert!(e.encode(&[&[0.0; 4], &[0.0; 3]]).is_err());
assert!(e.encode(&[&[f32::NAN; 4], &[0.0; 4]]).is_err());
let loud = vec![1e30f32; 5000];
assert!(!e.encode(&[&loud, &loud]).unwrap().is_empty());
assert!(!e.finish().unwrap().is_empty());
assert!(e.finish().unwrap().is_empty());
assert!(e.encode(&[&[0.0; 4], &[0.0; 4]]).is_err());
}
#[test]
fn granules_count_the_samples_and_trim_the_end() {
for len in [0usize, 1, 1023, 1024, 1025, 48_000] {
let mut e = Encoder::new(EncoderConfig::new(48_000, 1, 3.0)).unwrap();
let x = vec![0.1f32; len];
let mut packets = e.encode(&[&x]).unwrap();
packets.extend(e.finish().unwrap());
assert_eq!(packets.len(), len.div_ceil(HOP) + 1, "len {len}");
// packet k ends output at k·1024 samples; the last one at the input's length
let want: Vec<i64> = (0..packets.len()).map(|k| ((k * HOP) as i64).min(len as i64)).collect();
let got: Vec<i64> = packets.iter().map(|p| p.1).collect();
assert_eq!(got, want, "len {len}");
}
}
// --- ffmpeg oracle ---
/// An Ogg Vorbis file of the three headers and the audio packets, through craft-media's writer.
fn ogg(packets: &[(Vec<u8>, i64)]) -> Vec<u8> {
let mut w = craft_media::ogg::PageWriter::new(7);
let mut out = Vec::new();
for (i, (p, g)) in packets.iter().enumerate() {
out.extend(if i < 3 { w.header(p) } else { w.packet(p, *g) });
}
out.extend(w.finish(None));
out
}
fn comment() -> Vec<u8> {
craft_media::ogg::vorbis_comment("test", &[])
}
/// Encodes `input` (planar) and decodes it with ffmpeg's `decoder`; returns the planar output.
/// ffmpeg's decoders to check: its own `vorbis` always, and `libvorbis` when ffmpeg has it.
fn decoders(ff: &Path) -> Vec<&'static str> {
let list =
Command::new(ff).args(["-hide_banner", "-decoders"]).output().map(|o| String::from_utf8_lossy(&o.stdout).into_owned()).unwrap_or_default();
if list.lines().any(|l| l.split_whitespace().nth(1) == Some("libvorbis")) {
vec!["vorbis", "libvorbis"]
} else {
eprintln!("SKIPPED (libvorbis decoder): this ffmpeg has no libvorbis; checking its own decoder only");
vec!["vorbis"]
}
}
fn round_trip(input: &[Vec<f32>], rate: u32, quality: f32, decoder: &str, name: &str) -> Option<(Vec<Vec<f32>>, usize)> {
let ff = craft_media_testkit::ffmpeg_or_skip("vorbis oracle")?;
let mut e = Encoder::new(EncoderConfig::new(rate, input.len(), quality)).unwrap();
let mut packets = vec![(e.identification(), 0), (comment(), 0), (e.setup(), 0)];
let n = input[0].len();
let mut at = 0;
while at < n {
let end = (at + 4410).min(n);
let s: Vec<&[f32]> = input.iter().map(|c| &c[at..end]).collect();
packets.extend(e.encode(&s).unwrap());
at = end;
}
packets.extend(e.finish().unwrap());
let bytes: usize = packets[3..].iter().map(|p| p.0.len()).sum();
let dir = craft_media_testkit::fixtures_dir("audio/vorbis-encoder");
let path = dir.join(format!("{name}.ogg"));
std::fs::write(&path, ogg(&packets)).unwrap();
let out = Command::new(ff)
.args(["-v", "error", "-xerror", "-c:a", decoder, "-i"])
.arg(&path)
.args(["-f", "f32le", "-c:a", "pcm_f32le", "-"])
.output()
.unwrap();
assert!(out.status.success() && out.stderr.is_empty(), "{name} {decoder}: {}", String::from_utf8_lossy(&out.stderr));
let pcm: Vec<f32> = out.stdout.as_chunks::<4>().0.iter().map(|&b| f32::from_le_bytes(b)).collect();
let ch = input.len();
Some(((0..ch).map(|c| pcm.iter().skip(c).step_by(ch).copied().collect()).collect(), bytes))
}
fn snr_db(a: &[f32], b: &[f32]) -> f64 {
let (mut s, mut e) = (0f64, 0f64);
for (&x, &y) in a.iter().zip(b) {
s += f64::from(x) * f64::from(x);
e += (f64::from(x) - f64::from(y)).powi(2);
}
10.0 * (s.max(1e-20) / e.max(1e-20)).log10()
}
fn music(n: usize, seed: u32) -> Vec<f32> {
let mut r = seed;
(0..n)
.map(|i| {
let t = i as f32 / 48_000.0;
r = r.wrapping_mul(1_664_525).wrapping_add(1_013_904_223);
let noise = (r >> 8) as f32 / 8_388_608.0 - 1.0;
let chord: f32 = [220.0f32, 277.18, 329.63, 440.0]
.iter()
.enumerate()
.map(|(k, f)| (0.2 / (k + 1) as f32) * (2.0 * std::f32::consts::PI * f * t).sin())
.sum();
chord + 0.01 * noise
})
.collect()
}
/// Harmonic chords changing every half second, with decaying noise bursts (music-like).
fn chords(n: usize, seed: u32) -> Vec<f32> {
let mut r = seed;
let notes = [220.0f32, 277.2, 329.6, 440.0, 349.2, 523.3, 392.0, 659.3];
(0..n)
.map(|i| {
let t = i as f32 / 48_000.0;
let chord = (t * 2.0) as usize;
let mut s = 0.0;
for k in 0..3 {
let f = notes[(chord * 3 + k * 2) % notes.len()];
for h in 1..6 {
s += (2.0 * std::f32::consts::PI * f * h as f32 * t).sin() * 0.08 / h as f32;
}
}
r = r.wrapping_mul(1_664_525).wrapping_add(1_013_904_223);
let env = (-(t * 2.0).fract() * 3.0).exp();
s * (0.5 + 0.5 * env) + 0.02 * ((r >> 8) as f32 / 8_388_608.0 - 1.0) * env
})
.collect()
}
/// ffmpeg's own Vorbis decoder and libvorbis read every stream exactly as long as the input,
/// with SNR floors about 6 dB (chords 4 dB) under what the encoder measured when written, and bit
/// rates near libvorbis's for the same quality.
/// A signal, and per quality the SNR floor and the bit-rate range (kbit/s).
type Case = (&'static str, Vec<Vec<f32>>, [(f32, f64, std::ops::Range<usize>); 5]);
#[test]
fn ffmpeg_decodes_every_quality() {
let Some(ff) = craft_media_testkit::ffmpeg_or_skip("vorbis oracle") else { return };
let n = 48_000 * 3;
let cases: [Case; 2] = [
(
"music",
vec![music(n, 1), music(n, 2).iter().map(|v| v * 0.7).collect()],
[(-1.0, 3.0, 15..90), (0.0, 6.5, 20..110), (3.0, 12.0, 60..180), (6.0, 18.5, 120..280), (10.0, 25.5, 180..400)],
),
(
"chords",
vec![chords(n, 1), chords(n, 2).iter().map(|v| v * 0.8).collect()],
[(-1.0, 4.5, 20..90), (0.0, 6.0, 25..110), (3.0, 10.0, 70..200), (6.0, 14.0, 130..300), (10.0, 19.0, 180..420)],
),
];
for (name, input, levels) in &cases {
for (q, floor, kbps) in levels {
for decoder in decoders(&ff) {
let Some((out, bytes)) = round_trip(input, 48_000, *q, decoder, &format!("{name}{q}")) else { return };
assert!(out.iter().all(|c| c.len() == n), "{name} q{q} {decoder}: length {}", out[0].len());
let snr = snr_db(&input[0][4096..], &out[0][4096..]);
assert!(snr >= *floor, "{name} q{q} {decoder}: {snr:.2} dB < {floor}");
let rate = bytes * 8 / 3 / 1000;
assert!(kbps.contains(&rate), "{name} q{q}: {rate} kbit/s outside {kbps:?}");
}
}
}
}
/// Mono, 44.1 kHz, 3.0, 5.1 and 6.1 streams decode too, with libvorbis as well (which reads each
/// residue partition from channel 0); a silent channel costs one bit per block.
#[test]
fn channel_counts_and_rates() {
let Some(ff) = craft_media_testkit::ffmpeg_or_skip("vorbis oracle") else { return };
let n = 44_100;
for (rate, ch) in [(44_100u32, 1usize), (22_050, 2), (48_000, 3), (48_000, 6), (48_000, 7)] {
let mut input: Vec<Vec<f32>> = (0..ch).map(|c| chords(n, c as u32 + 1).iter().map(|v| v * (1.0 - 0.1 * c as f32)).collect()).collect();
if ch == 6 {
input[3] = vec![0.0; n];
}
for decoder in decoders(&ff) {
let Some((mut out, _)) = round_trip(&input, rate, 5.0, decoder, &format!("ch{ch}_{rate}_{decoder}")) else { return };
if decoder == "vorbis" {
// ffmpeg's decoder gives WAV order (5.1: FL FR FC LFE BL BR); the stream is in Vorbis
// order (L C R Ls Rs LFE), which libvorbis passes through
let wav_to_vorbis: &[usize] = match ch {
3 => &[0, 2, 1],
6 => &[0, 2, 1, 4, 5, 3],
7 => &[0, 2, 1, 5, 6, 4, 3],
_ => &[0, 1],
};
if ch > 2 {
out = wav_to_vorbis.iter().map(|&i| out[i].clone()).collect();
}
}
assert_eq!(out.len(), ch);
for (c, (a, b)) in input.iter().zip(&out).enumerate() {
assert_eq!(b.len(), n, "{ch} ch {rate} Hz {decoder}: channel {c} length");
if a.iter().all(|&v| v == 0.0) {
assert!(b.iter().all(|v| v.abs() < 1e-6), "silent channel {c}");
} else {
let snr = snr_db(&a[4096..], &b[4096..]);
assert!(snr > 8.0, "{ch} ch {rate} Hz {decoder} channel {c}: {snr:.1} dB");
}
}
}
}
}
/// Every partition holds whole sample frames (libvorbis decodes each one from channel 0), splits
/// the interleaved residue evenly and fits every book's dimension.
#[test]
fn partitions_hold_whole_frames() {
for ch in 1..=8 {
let p = partition_size(ch);
assert_eq!(p % ch, 0, "{ch} channels");
assert_eq!((ch * BLOCK / 2) % p, 0, "{ch} channels");
assert_eq!(p % 4, 0, "{ch} channels");
}
}
+4
View File
@@ -0,0 +1,4 @@
//! Vorbis I (feature `vorbis-encode`): the pure-Rust [`encoder`]. Decoding Vorbis goes through
//! [`crate::decode`].
pub mod encoder;
+721
View File
@@ -0,0 +1,721 @@
//! Markers a WAV file carries, read from its RIFF chunks.
//!
//! Two encodings are read into separate lists for the caller to map and merge:
//! - **Cue points** (the standard): a `cue ` chunk with one point per marker, named by `labl` (or
//! `note`) sub-chunks of a `LIST` `adtl` chunk, and given a length by `ltxt`.
//! - **XMP** (Adobe's tools): an `_PMX` chunk holding an XMP packet whose `xmpDM:markers` list has
//! one entry per marker (`xmpDM:startTime`, `xmpDM:duration`, `xmpDM:name`), counted in frames
//! of `xmpDM:frameRate` (`f44100` for samples at 44.1 kHz), or with an explicit
//! FrameCount rate suffix (`15f24`, `15f30000s1001`). Durations with a distinct rate
//! are converted to the marker start rate without app-specific time quantization.
//!
//! RF64 files (WAVs over 4 GB) carry a `0xFFFFFFFF` size for a chunk too big for 32 bits and give its real size in a
//! `ds64` chunk; those sizes are resolved so the chunks after the audio are still found.
//!
//! The file is untrusted input: every read is bounds-checked, sizes use checked arithmetic, and
//! the number of markers, of `adtl` sub-chunks looked at and the size of the XMP packet are capped.
use std::collections::{HashMap, HashSet};
/// Marker coordinates before app-specific time quantization. Explicit XMP duration
/// rates are normalized to the start coordinate rate; bare counts retain the legacy
/// track/file-rate interpretation.
#[derive(Clone, Debug, PartialEq)]
pub struct Marker {
/// Start in frames at `rate`.
pub start: f64,
/// Duration in frames at `rate`.
pub duration: f64,
/// Frames per second; consumers decide how invalid or absent rates map to their timeline.
pub rate: f64,
/// Label text.
pub name: String,
}
/// Separate source lists: rounding, deduplication, ordering and labels belong to the caller.
#[derive(Clone, Debug, Default, PartialEq)]
pub struct Markers {
/// RIFF cue/adtl markers in file order.
pub cue: Vec<Marker>,
/// XMP markers in packet order.
pub xmp: Vec<Marker>,
/// A chunk-inventory or cue-label retention limit omitted metadata. Marker coordinates
/// remain available when only their label was omitted. Existing marker/XMP prefix limits
/// are separate and do not set this flag.
pub limited: bool,
}
/// Most markers read from one file.
pub const MAX_MARKERS: usize = 10_000;
/// Largest XMP packet read (bytes).
const MAX_XMP: usize = 4 << 20;
/// Most `adtl` sub-chunks (`labl`, `note`, `ltxt`) looked at in one file: a few per cue point is plenty.
const MAX_ADTL_RECORDS: usize = 4 * MAX_MARKERS;
/// Most entries read from an RF64 file's `ds64` size table.
const MAX_DS64_TABLE: usize = 1_024;
/// Maximum retained RIFF chunk descriptors (including empty chunks).
pub const MAX_CHUNKS: usize = 100_000;
/// Maximum UTF-8 bytes in one retained cue label.
pub const MAX_LABEL_BYTES: usize = 64 * 1024;
/// Aggregate cue label bytes, enforced separately for the name map and emitted markers.
pub const MAX_LABEL_TOTAL_BYTES: usize = 4 * 1024 * 1024;
fn u32_at(b: &[u8], at: usize) -> Option<u32> {
let s = b.get(at..at.checked_add(4)?)?;
Some(u32::from_le_bytes(s.try_into().ok()?))
}
fn u64_at(b: &[u8], at: usize) -> Option<u64> {
let s = b.get(at..at.checked_add(8)?)?;
Some(u64::from_le_bytes(s.try_into().ok()?))
}
/// The text of a NUL-terminated label (the rest of the chunk), lossily decoded.
fn label(b: &[u8]) -> Option<String> {
// Look only as far as one label can be retained; never copy an arbitrary chunk body.
let end = b.iter().take(MAX_LABEL_BYTES + 1).position(|&c| c == 0).unwrap_or(b.len());
if end > MAX_LABEL_BYTES {
return None;
}
let text = String::from_utf8_lossy(b.get(..end)?);
let text = text.trim();
(text.len() <= MAX_LABEL_BYTES).then(|| text.to_string())
}
/// Whether `bytes` start a RIFF/WAVE file.
pub fn is_wav(bytes: &[u8]) -> bool {
matches!(bytes.get(0..4), Some(b"RIFF" | b"RF64")) && bytes.get(8..12) == Some(b"WAVE")
}
/// The sizes an RF64 file's `ds64` chunk gives for chunks too big for the 32-bit size field.
struct Ds64 {
/// The `data` chunk's size.
data: u64,
/// Other chunks: `(id, size)`.
table: Vec<([u8; 4], u64)>,
}
impl Ds64 {
/// The real size of chunk `id`, when the file says.
fn size_of(&self, id: &[u8; 4]) -> Option<u64> {
if id == b"data" { Some(self.data) } else { self.table.iter().find(|(t, _)| t == id).map(|(_, size)| *size) }
}
}
/// The `ds64` chunk of an RF64 file (`RF64`, size, `WAVE`, then `ds64`); `None` for any other file or one whose
/// `ds64` doesn't fit.
fn ds64(bytes: &[u8]) -> Option<Ds64> {
if bytes.get(0..4) != Some(b"RF64") || bytes.get(12..16) != Some(b"ds64") {
return None;
}
let size = usize::try_from(u32_at(bytes, 16)?).ok()?;
let body = bytes.get(20..20usize.checked_add(size)?)?;
// riff size (8), data size (8), sample count (8), table length (4), then `(id, size)` entries of 12 bytes
let data = u64_at(body, 8)?;
let entries = usize::try_from(u32_at(body, 24)?).ok()?;
let mut table = Vec::new();
for i in 0..entries.min(MAX_DS64_TABLE) {
let at = 28usize.checked_add(i.checked_mul(12)?)?;
let id = <[u8; 4]>::try_from(body.get(at..at.checked_add(4)?)?).ok()?;
table.push((id, u64_at(body, at + 4)?));
}
Some(Ds64 { data, table })
}
/// The chunks of a WAVE file as `(id, body)`, stopping at the first one that doesn't fit.
fn chunks<'a>(bytes: &'a [u8], limited: &mut bool) -> Vec<([u8; 4], &'a [u8])> {
let big = ds64(bytes);
let mut out = Vec::new();
let mut at = 12usize;
while let Some(head) = bytes.get(at..at.saturating_add(8)) {
if out.len() == MAX_CHUNKS {
*limited = true;
break;
}
let (Ok(id), Some(field)) = (<[u8; 4]>::try_from(&head[..4]), u32_at(head, 4)) else { break };
// In an RF64 file a size field of 0xFFFFFFFF stands for the size `ds64` gives.
let size = match &big {
Some(d) if field == u32::MAX => d.size_of(&id).unwrap_or(u64::from(field)),
_ => u64::from(field),
};
let start = at.saturating_add(8);
let Some(end) = usize::try_from(size).ok().and_then(|n| start.checked_add(n)) else { break };
let Some(body) = bytes.get(start..end) else { break };
out.push((id, body));
// Chunks are padded to an even size.
at = end.saturating_add(end & 1);
}
out
}
/// Read bounded cue/adtl and XMP metadata without interpreting application timeline policy.
pub fn read(bytes: &[u8]) -> Markers {
if !is_wav(bytes) {
return Markers::default();
}
let mut limited = false;
let chunks = chunks(bytes, &mut limited);
let rate = chunks.iter().find(|(id, _)| id == b"fmt ").and_then(|(_, b)| u32_at(b, 4)).map_or(0.0, f64::from);
let cue = cue_markers(&chunks, rate, &mut limited);
let xmp = chunks.iter().find(|(id, _)| id == b"_PMX").map_or_else(Vec::new, |(_, xmp)| xmp_markers(xmp, rate));
Markers { cue, xmp, limited }
}
/// Cue points named and sized by the `adtl` list.
fn cue_markers(chunks: &[([u8; 4], &[u8])], rate: f64, limited: &mut bool) -> Vec<Marker> {
let Some((_, cue)) = chunks.iter().find(|(id, _)| id == b"cue ") else { return Vec::new() };
let count = (u32_at(cue, 0).unwrap_or(0) as usize).min(MAX_MARKERS);
// The cue points first: `(id, offset in samples)`.
let mut points = Vec::new();
for i in 0..count {
let Some(point) = cue.get(4usize.saturating_add(i.saturating_mul(24))..) else { break };
let (Some(id), Some(offset)) = (u32_at(point, 0), u32_at(point, 20)) else { break };
points.push((id, offset));
}
// Only the names and lengths of those ids are kept, so a hostile `adtl` list cannot grow them past the cue count,
// and each record is a lookup, not a scan.
let wanted: HashSet<u32> = points.iter().map(|(id, _)| *id).collect();
let mut names: HashMap<u32, String> = HashMap::new();
let mut lengths: HashMap<u32, u32> = HashMap::new();
let mut name_bytes = 0usize;
let mut records = 0usize;
'lists: for (_, list) in chunks.iter().filter(|(id, b)| id == b"LIST" && b.get(0..4) == Some(b"adtl")) {
let mut at = 4usize;
while let Some(head) = list.get(at..at.saturating_add(8)) {
let (Ok(id), Some(size)) = (<[u8; 4]>::try_from(&head[..4]), u32_at(head, 4)) else { break };
let start = at.saturating_add(8);
let Some(end) = start.checked_add(size as usize) else { break };
let Some(body) = list.get(start..end) else { break };
records += 1;
if records > MAX_ADTL_RECORDS {
break 'lists;
}
if let Some(cue_id) = u32_at(body, 0).filter(|c| wanted.contains(c)) {
match &id {
// A `labl` is the name; a `note` only when there is none.
b"labl" | b"note" if id == *b"labl" || !names.contains_key(&cue_id) => {
let without_old = name_bytes.saturating_sub(names.get(&cue_id).map_or(0, String::len));
let text = label(body.get(4..).unwrap_or_default())
.filter(|text| text.len() <= MAX_LABEL_TOTAL_BYTES.saturating_sub(without_old))
.unwrap_or_else(|| {
*limited = true;
String::new()
});
name_bytes = without_old + text.len();
names.insert(cue_id, text);
}
// The first `ltxt` of a cue point gives its length.
b"ltxt" => {
lengths.entry(cue_id).or_insert_with(|| u32_at(body, 4).unwrap_or(0));
}
_ => {}
}
}
at = end.saturating_add(end & 1);
}
}
let mut emitted_bytes = 0usize;
points
.into_iter()
.map(|(id, offset)| {
let comment = match names.get(&id) {
Some(text) if text.len() <= MAX_LABEL_TOTAL_BYTES.saturating_sub(emitted_bytes) => {
emitted_bytes += text.len();
text.clone()
}
Some(_) => {
*limited = true;
String::new()
}
None => String::new(),
};
let length = lengths.get(&id).copied().unwrap_or(0);
Marker { start: f64::from(offset), duration: f64::from(length), rate, name: comment }
})
.collect()
}
/// The text of `name` in an XMP entry, as an attribute (`name="v"`) or an element
/// (`<name>v</name>`).
fn xmp_value(entry: &str, name: &str) -> Option<String> {
// Each entry starts just after `<rdf:li`. Scan only tag attributes, skipping
// quoted values so a label containing an attribute-like string cannot spoof it.
let bytes = entry.as_bytes();
let mut at = 0;
let mut in_tag = true;
while at < bytes.len() {
match bytes[at] {
b'<' => in_tag = true,
b'>' => in_tag = false,
b'\'' | b'"' if in_tag => {
let quote = bytes[at];
at += 1;
while at < bytes.len() && bytes[at] != quote {
at += 1;
}
}
_ if in_tag && (at == 0 || xml_space(bytes[at - 1])) && bytes[at..].starts_with(name.as_bytes()) => {
let mut value = at + name.len();
while value < bytes.len() && xml_space(bytes[value]) {
value += 1;
}
if bytes.get(value) == Some(&b'=') {
value += 1;
while value < bytes.len() && xml_space(bytes[value]) {
value += 1;
}
if let Some(&quote @ (b'\'' | b'"')) = bytes.get(value) {
let start = value + 1;
let end = bytes.get(start..)?.iter().position(|&b| b == quote)? + start;
return Some(unescape(entry.get(start..end)?));
}
}
}
_ => {}
}
at += 1;
}
let open = format!("<{name}>");
let i = entry.find(&open)?;
let rest = entry.get(i + open.len()..)?;
Some(unescape(rest.get(..rest.find('<')?)?))
}
fn xml_space(b: u8) -> bool {
matches!(b, b' ' | b'\t' | b'\r' | b'\n')
}
fn unescape(s: &str) -> String {
let mut out = String::with_capacity(s.len());
let mut rest = s;
while let Some(i) = rest.find('&') {
out.push_str(rest.get(..i).unwrap_or_default());
let tail = rest.get(i..).unwrap_or_default();
let Some(semi) = tail.as_bytes().iter().take(11).position(|b| *b == b';') else {
out.push('&');
rest = tail.get(1..).unwrap_or_default();
continue;
};
let ent = tail.get(1..semi).unwrap_or_default();
match ent {
"amp" => out.push('&'),
"lt" => out.push('<'),
"gt" => out.push('>'),
"quot" => out.push('"'),
"apos" => out.push('\''),
_ => {
let code = ent
.strip_prefix("#x")
.and_then(|h| u32::from_str_radix(h, 16).ok())
.or_else(|| ent.strip_prefix('#').and_then(|d| d.parse().ok()));
match code.and_then(char::from_u32) {
Some(c) => out.push(c),
None => out.push_str(tail.get(..=semi).unwrap_or_default()),
}
}
}
rest = tail.get(semi + 1..).unwrap_or_default();
}
out.push_str(rest);
out.trim().to_string()
}
/// A frame rate as XMP writes it: `f44100`, or `f30000s1001` (rate over scale).
fn xmp_rate(text: &str) -> Option<f64> {
let t = text.trim().strip_prefix('f')?;
let (num, den) = t.split_once('s').unwrap_or((t, "1"));
let (n, d): (f64, f64) = (num.parse().ok()?, den.parse().ok()?);
(n.is_finite() && d.is_finite() && n > 0.0 && d > 0.0 && (n / d).is_finite() && n / d > 0.0).then_some(n / d)
}
/// Adobe XMP FrameCount: a count optionally followed by `fRATE[sSCALE]`.
/// Bare counts retain the caller's legacy track/file-rate interpretation.
fn xmp_count(text: &str, default_rate: f64) -> Option<(f64, f64)> {
let text = text.trim();
let (count, rate) = match text.find('f') {
Some(at) => (text.get(..at)?, xmp_rate(text.get(at..)?)?),
None => (text, default_rate),
};
let count: f64 = count.parse().ok()?;
(count.is_finite() && rate.is_finite() && rate > 0.0).then_some((count, rate))
}
/// The markers of an XMP packet's `xmpDM:markers` entries.
fn xmp_markers(packet: &[u8], file_rate: f64) -> Vec<Marker> {
let text = String::from_utf8_lossy(packet.get(..packet.len().min(MAX_XMP)).unwrap_or_default());
let mut out = Vec::new();
// The frame rate belongs to the track an entry follows.
let mut rate = file_rate;
for entry in text.split("<rdf:li").skip(1) {
if let Some(r) = xmp_value(entry, "xmpDM:frameRate").as_deref().and_then(xmp_rate) {
rate = r;
}
let Some((start, marker_rate)) = xmp_value(entry, "xmpDM:startTime").and_then(|v| xmp_count(&v, rate)) else { continue };
let length = xmp_value(entry, "xmpDM:duration")
.and_then(|v| xmp_count(&v, rate))
.map(|(count, duration_rate)| if duration_rate == marker_rate { count } else { count / duration_rate * marker_rate })
.unwrap_or(0.0);
if !length.is_finite() {
continue;
}
let comment = xmp_value(entry, "xmpDM:name").unwrap_or_default();
out.push(Marker { start, duration: length, rate: marker_rate, name: comment });
if out.len() >= MAX_MARKERS {
break;
}
}
out
}
#[cfg(test)]
mod tests {
use super::*;
struct TimedMarker {
time: f64,
duration: f64,
comment: String,
}
fn read(bytes: &[u8]) -> Vec<TimedMarker> {
let metadata = super::read(bytes);
let time = |frames: f64, rate: f64| if rate > 0.0 && frames.is_finite() { (frames / rate).max(0.0) } else { 0.0 };
let map = |m: Marker| TimedMarker { time: time(m.start, m.rate), duration: time(m.duration, m.rate), comment: m.name };
let mut out: Vec<_> = metadata.cue.into_iter().map(map).collect();
let mut seen: HashSet<_> = out.iter().map(|m| (m.comment.clone(), m.time.to_bits())).collect();
for m in metadata.xmp.into_iter().map(map) {
if seen.insert((m.comment.clone(), m.time.to_bits())) {
out.push(m);
}
}
out.truncate(MAX_MARKERS);
out.sort_by(|a, b| a.time.total_cmp(&b.time));
out
}
fn chunk(id: &[u8; 4], body: &[u8]) -> Vec<u8> {
let mut v = id.to_vec();
v.extend((body.len() as u32).to_le_bytes());
v.extend(body);
if body.len() % 2 == 1 {
v.push(0);
}
v
}
fn fmt(rate: u32) -> Vec<u8> {
let mut b = Vec::new();
b.extend(1u16.to_le_bytes()); // PCM
b.extend(1u16.to_le_bytes()); // mono
b.extend(rate.to_le_bytes());
b.extend((rate * 2).to_le_bytes());
b.extend(2u16.to_le_bytes());
b.extend(16u16.to_le_bytes());
chunk(b"fmt ", &b)
}
fn wav(chunks: &[Vec<u8>]) -> Vec<u8> {
let body: Vec<u8> = chunks.iter().flatten().copied().collect();
let mut v = b"RIFF".to_vec();
v.extend((body.len() as u32 + 4).to_le_bytes());
v.extend(b"WAVE");
v.extend(body);
v
}
fn cue(points: &[(u32, u32)]) -> Vec<u8> {
let mut b = (points.len() as u32).to_le_bytes().to_vec();
for (id, offset) in points {
b.extend(id.to_le_bytes());
b.extend(0u32.to_le_bytes());
b.extend(b"data");
b.extend(0u32.to_le_bytes());
b.extend(0u32.to_le_bytes());
b.extend(offset.to_le_bytes());
}
chunk(b"cue ", &b)
}
fn labl(id: &[u8; 4], cue_id: u32, text: &str) -> Vec<u8> {
let mut b = cue_id.to_le_bytes().to_vec();
b.extend(text.as_bytes());
b.push(0);
chunk(id, &b)
}
fn adtl(subs: &[Vec<u8>]) -> Vec<u8> {
let mut b = b"adtl".to_vec();
b.extend(subs.iter().flatten());
chunk(b"LIST", &b)
}
#[test]
fn cue_points_are_named_by_the_adtl_list_and_timed_in_samples() {
let file = wav(&[
fmt(44100),
chunk(b"data", &[0; 8]),
cue(&[(2, 88200), (1, 22050)]),
adtl(&[labl(b"labl", 1, "SEQ01_Prologue"), labl(b"labl", 2, "SEQ02_Vallee_P1_Agriculture")]),
]);
let m = read(&file);
assert_eq!(m.len(), 2);
assert_eq!((m[0].comment.as_str(), m[0].time), ("SEQ01_Prologue", 0.5));
assert_eq!((m[1].comment.as_str(), m[1].time), ("SEQ02_Vallee_P1_Agriculture", 2.0));
}
#[test]
fn a_note_names_a_cue_only_when_it_has_no_label_and_ltxt_gives_a_length() {
let mut ltxt = 1u32.to_le_bytes().to_vec();
ltxt.extend(44100u32.to_le_bytes());
ltxt.extend([0; 16]);
let file = wav(&[
fmt(44100),
cue(&[(1, 0), (2, 44100)]),
adtl(&[labl(b"note", 1, "from note"), chunk(b"ltxt", &ltxt), labl(b"labl", 2, "named"), labl(b"note", 2, "ignored")]),
]);
let m = read(&file);
assert_eq!((m[0].comment.as_str(), m[0].duration), ("from note", 1.0));
assert_eq!(m[1].comment, "named");
}
const XMP_ELEMENTS: &str = r#"<x:xmpmeta><rdf:RDF><rdf:Description><xmpDM:Tracks><rdf:Bag><rdf:li rdf:parseType="Resource"><xmpDM:trackName>Markers</xmpDM:trackName><xmpDM:trackType>Cue</xmpDM:trackType><xmpDM:frameRate>f44100</xmpDM:frameRate><xmpDM:markers><rdf:Seq><rdf:li rdf:parseType="Resource"><xmpDM:startTime>44100</xmpDM:startTime><xmpDM:duration>0</xmpDM:duration><xmpDM:name>One &amp; Two</xmpDM:name></rdf:li><rdf:li rdf:parseType="Resource"><xmpDM:startTime>132300</xmpDM:startTime><xmpDM:duration>22050</xmpDM:duration><xmpDM:name>Three</xmpDM:name></rdf:li></rdf:Seq></xmpDM:markers></rdf:li></rdf:Bag></xmpDM:Tracks></rdf:Description></rdf:RDF></x:xmpmeta>"#;
#[test]
fn xmp_markers_are_read_as_elements_in_frames_of_the_track_rate() {
let file = wav(&[fmt(48000), chunk(b"_PMX", XMP_ELEMENTS.as_bytes())]);
let m = read(&file);
assert_eq!(m.len(), 2);
// 44100 frames at f44100 is one second, whatever the file's own rate.
assert_eq!((m[0].comment.as_str(), m[0].time), ("One & Two", 1.0));
assert_eq!((m[1].comment.as_str(), m[1].time, m[1].duration), ("Three", 3.0, 0.5));
}
#[test]
fn xmp_markers_are_read_as_attributes_and_use_the_file_rate_without_a_track_rate() {
let xmp = r#"<rdf:Seq><rdf:li xmpDM:startTime="24000" xmpDM:duration="0" xmpDM:name="Attr &#233;"/></rdf:Seq>"#;
let m = read(&wav(&[fmt(48000), chunk(b"_PMX", xmp.as_bytes())]));
assert_eq!((m[0].comment.as_str(), m[0].time), ("Attr é", 0.5));
}
#[test]
fn a_marker_in_both_encodings_is_listed_once() {
let xmp = r#"<rdf:li xmpDM:startTime="44100" xmpDM:name="Same"/><rdf:li xmpDM:startTime="88200" xmpDM:name="Only XMP"/>"#;
let file = wav(&[fmt(44100), cue(&[(1, 44100)]), adtl(&[labl(b"labl", 1, "Same")]), chunk(b"_PMX", xmp.as_bytes())]);
let names: Vec<String> = read(&file).into_iter().map(|m| m.comment).collect();
assert_eq!(names, ["Same", "Only XMP"]);
}
#[test]
fn damaged_or_hostile_files_read_as_far_as_they_go_without_panicking() {
assert!(read(b"").is_empty());
assert!(read(b"RIFF").is_empty());
assert!(read(b"not a wav file at all").is_empty());
let good = wav(&[fmt(44100), cue(&[(1, 44100)]), adtl(&[labl(b"labl", 1, "Kept")])]);
// Every truncation is safe.
for n in 0..good.len() {
let _ = read(&good[..n]);
}
// A cue count far beyond the chunk, and chunk sizes past the end of the file.
let mut huge = 0xFFFF_FFFFu32.to_le_bytes().to_vec();
huge.extend([0; 24]);
let m = read(&wav(&[fmt(44100), chunk(b"cue ", &huge)]));
assert!(m.len() <= 1);
let mut lying = good.clone();
lying.extend(b"LIST\xff\xff\xff\xffadtl");
assert_eq!(read(&lying).len(), 1);
// No sample rate: times are zero, not a division by zero.
let m = read(&wav(&[cue(&[(1, 44100)])]));
assert_eq!(m[0].time, 0.0);
}
/// A chunk whose size field says `field` (an RF64 file's `0xFFFFFFFF`) while its body is `body`.
fn chunk_with_size_field(id: &[u8; 4], field: u32, body: &[u8]) -> Vec<u8> {
let mut v = id.to_vec();
v.extend(field.to_le_bytes());
v.extend(body);
if body.len() % 2 == 1 {
v.push(0);
}
v
}
/// An RF64 `ds64` chunk: the `data` chunk's size and a table of other chunks' sizes.
fn ds64_chunk(data_size: u64, table: &[([u8; 4], u64)]) -> Vec<u8> {
let mut b = 0u64.to_le_bytes().to_vec(); // riff size (not used)
b.extend(data_size.to_le_bytes());
b.extend(0u64.to_le_bytes()); // sample count
b.extend((table.len() as u32).to_le_bytes());
for (id, size) in table {
b.extend(id);
b.extend(size.to_le_bytes());
}
chunk(b"ds64", &b)
}
fn rf64(chunks: &[Vec<u8>]) -> Vec<u8> {
let body: Vec<u8> = chunks.iter().flatten().copied().collect();
let mut v = b"RF64".to_vec();
v.extend(u32::MAX.to_le_bytes());
v.extend(b"WAVE");
v.extend(body);
v
}
#[test]
fn rf64_markers_after_a_data_chunk_of_sentinel_size_are_read() {
let audio = [0u8; 8];
let file = rf64(&[
ds64_chunk(audio.len() as u64, &[]),
fmt(44100),
chunk_with_size_field(b"data", u32::MAX, &audio),
cue(&[(1, 44100)]),
adtl(&[labl(b"labl", 1, "After the audio")]),
]);
let m = read(&file);
assert_eq!(m.len(), 1);
assert_eq!((m[0].comment.as_str(), m[0].time), ("After the audio", 1.0));
}
#[test]
fn rf64_sizes_of_other_chunks_come_from_the_ds64_table() {
let junk = [7u8; 6];
let tail = || [cue(&[(1, 8000)]), adtl(&[labl(b"labl", 1, "Found")])].concat();
let with_entry = rf64(&[ds64_chunk(0, &[(*b"junk", junk.len() as u64)]), fmt(8000), chunk_with_size_field(b"junk", u32::MAX, &junk), tail()]);
assert_eq!(read(&with_entry)[0].comment, "Found");
// Without the table entry the sentinel is all there is, and what follows is not reached.
let without = rf64(&[ds64_chunk(0, &[]), fmt(8000), chunk_with_size_field(b"junk", u32::MAX, &junk), tail()]);
assert!(read(&without).is_empty());
}
#[test]
fn hostile_rf64_size_tables_read_as_far_as_they_go_without_panicking() {
// sizes that overflow when added to an offset
for data in [u64::MAX, u64::MAX - 7, 1 << 63] {
let file =
rf64(&[ds64_chunk(data, &[(*b"junk", u64::MAX)]), fmt(8000), chunk_with_size_field(b"data", u32::MAX, &[0; 4]), cue(&[(1, 0)])]);
assert!(read(&file).is_empty());
}
// a table that claims far more entries than its chunk holds
let mut liar = ds64_chunk(0, &[]);
liar[8 + 24..8 + 28].copy_from_slice(&u32::MAX.to_le_bytes());
let _ = read(&rf64(&[liar, fmt(8000), cue(&[(1, 0)])]));
// every truncation of a good RF64 file is safe
let good = rf64(&[
ds64_chunk(4, &[]),
fmt(44100),
chunk_with_size_field(b"data", u32::MAX, &[0; 4]),
cue(&[(1, 44100)]),
adtl(&[labl(b"labl", 1, "Kept")]),
]);
assert_eq!(read(&good).len(), 1);
for n in 0..good.len() {
let _ = read(&good[..n]);
}
}
#[test]
fn a_huge_adtl_list_is_read_in_linear_time_and_only_for_the_cue_points_that_exist() {
// Records for ids that have no cue point are skipped, not stored, and the number looked at is capped.
let junk = |n: u32| (1000..1000 + n).map(|id| labl(b"labl", id, "n")).collect::<Vec<_>>();
let started = std::time::Instant::now();
// the real label comes first: read
let mut subs = vec![labl(b"labl", 1, "Real")];
subs.extend(junk(100_000));
let m = read(&wav(&[fmt(44100), cue(&[(1, 44100)]), adtl(&subs)]));
assert_eq!(m[0].comment, "Real");
// it comes after more records than are looked at: not read, and the marker is still there
let mut subs = junk(MAX_ADTL_RECORDS as u32 + 10);
subs.push(labl(b"labl", 1, "Too late"));
let m = read(&wav(&[fmt(44100), cue(&[(1, 44100)]), adtl(&subs)]));
assert_eq!((m.len(), m[0].comment.as_str()), (1, ""));
assert!(started.elapsed() < std::time::Duration::from_secs(5), "took {:?}", started.elapsed());
}
#[test]
fn metadata_keeps_original_coordinates_and_separate_sources() {
let xmp = br#"<rdf:li xmpDM:startTime="1" xmpDM:duration="2" xmpDM:name="Same"/>"#;
let file = wav(&[fmt(44100), cue(&[(1, 1)]), adtl(&[labl(b"labl", 1, "Same")]), chunk(b"_PMX", xmp)]);
let data = super::read(&file);
assert_eq!(data.cue[0].start, 1.0);
assert_eq!(data.cue[0].rate, 44100.0);
assert_eq!(data.xmp[0].start, 1.0);
assert_eq!(data.xmp[0].duration, 2.0);
assert_eq!(data.cue.len(), 1);
assert_eq!(data.xmp.len(), 1);
}
#[test]
fn repeated_unterminated_entities_preserve_text_with_bounded_lookahead() {
let text = "&".repeat(100_000);
assert_eq!(unescape(&text), text);
assert_eq!(unescape("&#0000065; &#00000065; &amp; &unknown;"), "A A & &unknown;");
}
#[test]
fn repeated_cue_ids_cannot_multiply_label_storage() {
let text = "x".repeat(MAX_LABEL_BYTES);
let points: Vec<_> = (0..MAX_MARKERS).map(|i| (1, i as u32)).collect();
let file = wav(&[fmt(44100), cue(&points), adtl(&[labl(b"labl", 1, &text)])]);
let metadata = super::read(&file);
assert_eq!(metadata.cue.len(), MAX_MARKERS);
assert_eq!(metadata.cue.iter().map(|m| m.name.len()).sum::<usize>(), MAX_LABEL_TOTAL_BYTES);
assert!(metadata.limited);
assert_eq!(metadata.cue[0].name, text);
assert!(metadata.cue[MAX_MARKERS - 1].name.is_empty());
assert_eq!(metadata.cue[MAX_MARKERS - 1].start, (MAX_MARKERS - 1) as f64);
}
#[test]
fn cue_name_map_and_single_label_are_bounded() {
let count = MAX_LABEL_TOTAL_BYTES / MAX_LABEL_BYTES + 2;
let text = "x".repeat(MAX_LABEL_BYTES);
let points: Vec<_> = (0..count as u32).map(|i| (i, i)).collect();
let labels: Vec<_> = (0..count as u32).map(|i| labl(b"labl", i, &text)).collect();
let metadata = super::read(&wav(&[fmt(44100), cue(&points), adtl(&labels)]));
assert!(metadata.limited);
assert_eq!(metadata.cue.iter().map(|m| m.name.len()).sum::<usize>(), MAX_LABEL_TOTAL_BYTES);
let oversized = "x".repeat(MAX_LABEL_BYTES + 1);
let metadata = super::read(&wav(&[fmt(44100), cue(&[(1, 3)]), adtl(&[labl(b"labl", 1, &oversized)])]));
assert!(metadata.limited);
assert_eq!(metadata.cue[0].start, 3.0);
assert!(metadata.cue[0].name.is_empty());
}
#[test]
fn empty_chunk_inventory_is_bounded() {
let empty = chunk(b"junk", &[]);
let many = empty.repeat(MAX_CHUNKS + 1);
let metadata = super::read(&wav(&[many, fmt(44100), cue(&[(1, 1)])]));
assert!(metadata.limited);
assert!(metadata.cue.is_empty());
}
#[test]
fn entity_lookahead_keeps_previous_semicolon_boundary() {
assert_eq!(unescape("&#00000065;"), "A");
assert_eq!(unescape("&#000000065;"), "&#000000065;");
}
#[test]
fn xmp_quotes_spacing_and_attribute_boundaries() {
let packet = br#"<rdf:li xmpDM:startTime = '24000' xmpDM:duration =
'12000' xmpDM:name='single &amp; quoted'/>"#;
let markers = xmp_markers(packet, 48000.0);
assert_eq!(markers.len(), 1);
assert_eq!((markers[0].start, markers[0].duration, markers[0].rate), (24000.0, 12000.0, 48000.0));
assert_eq!(markers[0].name, "single & quoted");
let spoof = r#" label=" xmpDM:startTime='7'" otherxmpDM:startTime='8' xmpDM:startTime = '9'/>"#;
assert_eq!(xmp_value(spoof, "xmpDM:startTime").as_deref(), Some("9"));
assert!(xmp_value(" xmpDM:startTime='unterminated", "xmpDM:startTime").is_none());
}
#[test]
fn xmp_frame_counts_preserve_explicit_and_mixed_rates() {
let packet = br#"<rdf:li xmpDM:frameRate='f48000'><rdf:li xmpDM:startTime='15f24' xmpDM:duration='15f30000s1001'/><rdf:li xmpDM:startTime='48000' xmpDM:duration='12f24'/><rdf:li xmpDM:startTime='15f24' xmpDM:duration='24000'/></rdf:li>"#;
let markers = xmp_markers(packet, 44100.0);
assert_eq!(markers.len(), 3);
assert_eq!((markers[0].start, markers[0].rate), (15.0, 24.0));
assert!((markers[0].duration / markers[0].rate - 0.5005).abs() < 1e-12);
assert_eq!((markers[1].start, markers[1].duration, markers[1].rate), (48000.0, 24000.0, 48000.0));
assert_eq!((markers[2].start, markers[2].duration, markers[2].rate), (15.0, 12.0, 24.0));
for invalid in ["15f0", "15f24s0", "15fNaN", "15finf", "NaN", "1e999", "15f24junk"] {
assert!(xmp_count(invalid, 48000.0).is_none(), "{invalid}");
}
}
}
+17 -10
View File
@@ -12,7 +12,7 @@ mod pcm;
#[cfg(feature = "vorbis-encode")]
mod vorbis;
#[cfg(feature = "vorbis-encode")]
pub use vorbis::{OGG_BITRATES, encode as encode_ogg};
pub use vorbis::{OGG_BITRATES, OggVorbisOptions, encode as encode_ogg, encode_ogg_vorbis, quality_for_bitrate};
#[cfg(feature = "pcm-encode")]
mod raw;
#[cfg(feature = "pcm-encode")]
@@ -66,15 +66,22 @@ pub fn encode(buf: &AudioBuffer, opts: &EncodeOptions) -> Result<Vec<u8>> {
EncodeFormat::Aac | EncodeFormat::Alac | EncodeFormat::Mp3 | EncodeFormat::Ac3 | EncodeFormat::Eac3 => coded::encode(buf, opts),
#[cfg(feature = "vorbis-encode")]
EncodeFormat::Ogg => {
if opts.layout.is_some_and(|layout| !EncodeFormat::Ogg.supports_layout(&layout)) {
return Err(AudioError::Unsupported("Vorbis requires a mono or stereo speaker layout".into()));
let count = u16::try_from(buf.channels.len()).unwrap_or(u16::MAX);
let layout = opts.layout.unwrap_or_else(|| ChannelLayout::default_for(count));
if layout.channels() != count {
return Err(AudioError::Unsupported(format!("a {}-channel layout for {count} channels", layout.channels())));
}
let kbps = match opts.rate_control {
None => 192,
Some(crate::RateControl::Bitrate(bps)) => bps / 1000,
Some(crate::RateControl::Quality(_)) => return Err(AudioError::Unsupported("Ogg export takes a target bitrate".into())),
let map = vorbis::vorbis_map(&layout)?;
let quality = match opts.rate_control {
None => vorbis::quality_for_bitrate(192, buf.channels.len()),
Some(crate::RateControl::Bitrate(bps)) => {
vorbis::quality_for_bitrate((bps / 1000).clamp(OGG_BITRATES.0, OGG_BITRATES.1), buf.channels.len())
}
Some(crate::RateControl::Quality(q)) if q.is_nan() => return Err(AudioError::Encode("the Vorbis quality is NaN".into())),
Some(crate::RateControl::Quality(q)) => -1.0 + 11.0 * q.clamp(0.0, 1.0),
};
vorbis::encode(buf, kbps)
let planar: Vec<&[f32]> = map.iter().filter_map(|&i| buf.channels.get(i).map(Vec::as_slice)).collect();
vorbis::encode_planar(buf.sample_rate, &planar, &OggVorbisOptions::new(quality))
}
#[allow(unreachable_patterns)]
f => Err(AudioError::Unsupported(format!("writing {f:?}"))),
@@ -106,7 +113,7 @@ const fn extensions() -> ([&'static str; 13], usize) {
add!(cfg!(feature = "mp3-encode"), "mp3");
add!(cfg!(feature = "ac3-encode"), "ac3");
add!(cfg!(feature = "eac3-encode"), "eac3", "ec3");
add!(cfg!(all(feature = "vorbis-encode", not(target_arch = "wasm32"))), "ogg");
add!(cfg!(feature = "vorbis-encode"), "ogg");
(all, n)
}
@@ -148,7 +155,7 @@ pub fn encode_format_for(name: &str) -> Option<EncodeFormat> {
"ac3" => Some(EncodeFormat::Ac3),
#[cfg(feature = "eac3-encode")]
"eac3" | "ec3" => Some(EncodeFormat::Eac3),
#[cfg(all(feature = "vorbis-encode", not(target_arch = "wasm32")))]
#[cfg(feature = "vorbis-encode")]
"ogg" => Some(EncodeFormat::Ogg),
_ => None,
}
+217 -80
View File
@@ -1,83 +1,198 @@
//! Ogg Vorbis encoding (RFC 5334): the reference libvorbis encoder, built from its C sources by
//! `vorbis_rs`. Stereo or mono, variable bitrate at the requested kbit/s (64–500), with a
//! fallback to a quality preset when the bitrate is not supported for the rate and channel count.
//! Ogg Vorbis files (Vorbis I §A, RFC 5334) from the pure-Rust [`crate::vorbis::encoder`] and
//! craft-media's Ogg page writer: 1 to 8 channels in Vorbis channel order, a quality from -1 to
//! 10 (variable bit rate), and the tags in the comment header. Builds for every target.
use crate::{AudioBuffer, AudioError, Result};
use craft_media::ogg::{PageWriter, vorbis_comment};
/// The bitrates an Ogg Vorbis export is asked for, in kbit/s.
use crate::vorbis::encoder::{DEFAULT_QUALITY, Encoder, EncoderConfig, Error as VorbisError};
use crate::{AudioBuffer, AudioError, ChannelLayout, Result};
/// The bit rates [`encode_ogg`](crate::encode_ogg) takes, in kbit/s. Vorbis is variable: the bit rate picks a
/// quality ([`quality_for_bitrate`]), and the file comes out near it for typical music.
pub const OGG_BITRATES: (u32, u32) = (64, 500);
/// The block size the encoder processes at a time: small enough that memory stays bounded
/// regardless of file length.
#[cfg(not(target_arch = "wasm32"))]
const BLOCK: usize = 4096;
/// The serial number of the stream when the options do not set one (`LCRF`): one stream per file,
/// so a constant keeps files byte-for-byte reproducible.
const SERIAL: u32 = 0x4C43_5246;
#[cfg(not(target_arch = "wasm32"))]
fn encode_error(e: vorbis_rs::VorbisError) -> AudioError {
AudioError::Encode(e.to_string())
/// Samples per channel fed to the encoder at a time.
const CHUNK: usize = 4096;
/// What [`encode_ogg_vorbis`] writes besides the audio.
///
/// `#[non_exhaustive]`: build it with `OggVorbisOptions::default()` or
/// [`OggVorbisOptions::new`] and the `with_*` methods.
#[non_exhaustive]
#[derive(Debug, Clone, PartialEq)]
pub struct OggVorbisOptions {
/// -1 (smallest) to 10 (best); clamped, and NaN or infinite reads as
/// [`DEFAULT_QUALITY`] (6).
pub quality: f32,
/// The comment header's vendor string.
pub vendor: String,
/// `NAME=value` comments (Vorbis I §5), in order. A name that is empty, or holds `=` or a byte
/// outside 0x20–0x7D, is left out.
pub tags: Vec<(String, String)>,
/// The logical stream's serial number.
pub serial: u32,
}
/// Encode `buf` as an Ogg Vorbis stream at about `kbps` (variable, as Vorbis is): stereo, or mono
/// for a mono buffer. A bitrate the encoder has no setup for at that rate and channel count falls
/// back to a quality that suits it. `Err` says why there is nothing.
#[cfg(not(target_arch = "wasm32"))]
pub fn encode(buf: &AudioBuffer, kbps: u32) -> Result<Vec<u8>> {
use std::num::{NonZeroU8, NonZeroU32};
let channels = buf.channels.len();
if !(1..=2).contains(&channels) {
return Err(AudioError::Unsupported("Ogg Vorbis export requires mono or stereo audio".into()));
impl Default for OggVorbisOptions {
fn default() -> Self {
OggVorbisOptions { quality: DEFAULT_QUALITY, vendor: "craft-audio".into(), tags: Vec::new(), serial: SERIAL }
}
if buf.channels.iter().any(|c| c.len() != buf.frames() || c.iter().any(|s| !s.is_finite())) {
}
impl OggVorbisOptions {
/// The defaults at `quality`.
pub fn new(quality: f32) -> Self {
OggVorbisOptions { quality, ..Self::default() }
}
/// Sets [`quality`](Self::quality).
pub fn with_quality(mut self, quality: f32) -> Self {
self.quality = quality;
self
}
/// Sets [`vendor`](Self::vendor).
pub fn with_vendor(mut self, vendor: impl Into<String>) -> Self {
self.vendor = vendor.into();
self
}
/// Adds a comment ([`tags`](Self::tags)).
pub fn with_tag(mut self, name: impl Into<String>, value: impl Into<String>) -> Self {
self.tags.push((name.into(), value.into()));
self
}
/// Sets [`serial`](Self::serial).
pub fn with_serial(mut self, serial: u32) -> Self {
self.serial = serial;
self
}
}
fn encode_error(e: VorbisError) -> AudioError {
AudioError::Encode(format!("Vorbis: {e}"))
}
/// Encode `buf` as an Ogg Vorbis file with `opts`. The channels are in Vorbis channel order
/// (Vorbis I §4.3.9: L C R for three, L C R Ls Rs LFE for 5.1, L C R Ls Rs Rl Rr LFE for 7.1).
/// The last granule position is the buffer's length, so a decoder returns exactly its frames.
///
/// ```
/// use craft_audio::{AudioBuffer, OggVorbisOptions, encode_ogg_vorbis};
///
/// let buf = AudioBuffer::new(48_000, 6, 4_800); // 0.1 s of 5.1 silence
/// let opts = OggVorbisOptions::new(4.0).with_tag("TITLE", "Silence");
/// let ogg = encode_ogg_vorbis(&buf, &opts).unwrap();
/// assert!(ogg.starts_with(b"OggS"));
/// ```
pub fn encode_ogg_vorbis(buf: &AudioBuffer, opts: &OggVorbisOptions) -> Result<Vec<u8>> {
let planar: Vec<&[f32]> = buf.channels.iter().map(Vec::as_slice).collect();
encode_planar(buf.sample_rate, &planar, opts)
}
/// [`encode_ogg_vorbis`] over channels already in Vorbis order.
pub(crate) fn encode_planar(sample_rate: u32, planar: &[&[f32]], opts: &OggVorbisOptions) -> Result<Vec<u8>> {
if !(1..=8).contains(&planar.len()) {
return Err(AudioError::Unsupported(format!("Ogg Vorbis holds 1 to 8 channels, not {}", planar.len())));
}
let frames = planar.first().map_or(0, |c| c.len());
if planar.iter().any(|c| c.len() != frames || c.iter().any(|s| !s.is_finite())) {
return Err(AudioError::Encode("Vorbis samples must be finite and channels equally long".into()));
}
let (Some(rate), Some(count)) = (NonZeroU32::new(buf.sample_rate), NonZeroU8::new(channels as u8)) else {
if sample_rate == 0 {
return Err(AudioError::Encode("there is no audio to encode".into()));
};
let target = NonZeroU32::new(kbps.clamp(OGG_BITRATES.0, OGG_BITRATES.1) * 1000).unwrap_or(NonZeroU32::MIN);
let encode = |strategy: vorbis_rs::VorbisBitrateManagementStrategy| -> Result<Vec<u8>> {
let mut encoder = vorbis_rs::VorbisEncoderBuilder::new_with_serial(rate, count, Vec::new(), 0x4C43_5246)
.bitrate_management_strategy(strategy)
.build()
.map_err(encode_error)?;
let frames = buf.frames();
let mut at = 0usize;
while at < frames {
let end = (at + BLOCK).min(frames);
let block: Vec<&[f32]> = buf.channels.iter().take(channels).map(|side| side.get(at..end).unwrap_or_default()).collect();
encoder.encode_audio_block(&block).map_err(encode_error)?;
at = end;
}
let mut enc = Encoder::new(EncoderConfig::new(sample_rate, planar.len(), opts.quality)).map_err(encode_error)?;
let mut pages = PageWriter::new(opts.serial);
let tags: Vec<(&str, &str)> = opts.tags.iter().map(|(k, v)| (k.as_str(), v.as_str())).collect();
let mut out = pages.header(&enc.identification());
out.extend(pages.header(&vorbis_comment(&opts.vendor, &tags)));
out.extend(pages.header(&enc.setup()));
// The first audio packet (which outputs nothing) gets a page of its own: a stream whose first
// audio page is also its last would leave decoders to choose between start and end trimming
// (Vorbis I §A.2), and ffmpeg then plays the padding.
let mut first = true;
let mut add = |packets: Vec<(Vec<u8>, i64)>, out: &mut Vec<u8>| {
for (packet, granule) in packets {
out.extend(pages.packet(&packet, granule));
if std::mem::take(&mut first) {
out.extend(pages.flush());
}
}
encoder.finish().map_err(encode_error)
};
let mut at = 0;
loop {
let end = (at + CHUNK).min(frames);
let chunk: Vec<&[f32]> = planar.iter().map(|c| c.get(at..end).unwrap_or_default()).collect();
add(enc.encode(&chunk).map_err(encode_error)?, &mut out);
at = end;
if at >= frames {
break;
}
}
add(enc.finish().map_err(encode_error)?, &mut out);
out.extend(pages.finish(None));
Ok(out)
}
// Convert Rust unwinds to an error. This does not catch native crashes or aborts.
let attempt = |strategy| {
std::panic::catch_unwind(std::panic::AssertUnwindSafe(|| encode(strategy)))
.unwrap_or_else(|_| Err(AudioError::Encode("the Vorbis encoder failed".into())))
};
match attempt(vorbis_rs::VorbisBitrateManagementStrategy::Vbr { target_bitrate: target }) {
Ok(bytes) => Ok(bytes),
Err(_) => attempt(vorbis_rs::VorbisBitrateManagementStrategy::QualityVbr { target_quality: 0.6 })
.map_err(|e| AudioError::Encode(format!("the Vorbis encoder refused the audio: {e}"))),
/// Nominal kbit/s per channel at each whole quality from -1 to 10: this encoder's rate on
/// music-like test signals at 48 kHz (harmonic chords with noise), averaged.
const KBPS_PER_CHANNEL: [f32; 12] = [18.0, 23.0, 31.0, 43.0, 58.0, 75.0, 89.0, 100.0, 111.0, 121.0, 130.0, 140.0];
/// The quality whose nominal bit rate is `kbps` kbit/s for `channels` channels (clamped to -1..=10).
/// Vorbis is variable: the bit rate of a file depends on the audio.
pub fn quality_for_bitrate(kbps: u32, channels: usize) -> f32 {
let per = kbps as f32 / channels.max(1) as f32;
let mut q = -1.0;
for pair in KBPS_PER_CHANNEL.windows(2) {
if let [lo, hi] = *pair
&& per <= hi
{
return q + ((per - lo) / (hi - lo)).clamp(0.0, 1.0);
}
q += 1.0;
}
10.0
}
/// Encode `buf` as an Ogg Vorbis stream near `kbps` kbit/s ([`OGG_BITRATES`], clamped): the
/// quality [`quality_for_bitrate`] gives, no tags. 1 to 8 channels in Vorbis channel order.
/// `Err` says why there is nothing.
pub fn encode(buf: &AudioBuffer, kbps: u32) -> Result<Vec<u8>> {
let kbps = kbps.clamp(OGG_BITRATES.0, OGG_BITRATES.1);
encode_ogg_vorbis(buf, &OggVorbisOptions::new(quality_for_bitrate(kbps, buf.channels.len())))
}
/// WAV-order speakers ([`crate::EncodeFormat::layout_masks`]) to Vorbis order, per channel count.
const VORBIS_ORDER: [&[usize]; 8] =
[&[0], &[0, 1], &[0, 2, 1], &[0, 1, 2, 3], &[0, 2, 1, 3, 4], &[0, 2, 1, 4, 5, 3], &[0, 2, 1, 5, 6, 4, 3], &[0, 2, 1, 6, 7, 4, 5, 3]];
/// For each Vorbis channel, the channel of audio in `layout` it comes from.
pub(crate) fn vorbis_map(layout: &ChannelLayout) -> Result<Vec<usize>> {
let n = layout.channels();
let mask = crate::EncodeFormat::Ogg.layout_masks(n).first().copied();
let order = usize::from(n).checked_sub(1).and_then(|i| VORBIS_ORDER.get(i)).copied();
match (mask, order) {
(Some(mask), Some(order)) => crate::layout::channel_map(mask, Some(order), layout)
.ok_or_else(|| AudioError::Unsupported(format!("Vorbis has no layout of {n} channels with these speakers"))),
_ => Err(AudioError::Unsupported(format!("Ogg Vorbis holds 1 to 8 channels, not {n}"))),
}
}
/// Ogg Vorbis encoding is unavailable on WASM; returns an unsupported-format error.
#[cfg(target_arch = "wasm32")]
pub fn encode(_buf: &AudioBuffer, _kbps: u32) -> Result<Vec<u8>> {
Err(AudioError::Unsupported("Ogg Vorbis files are exported by the desktop app".into()))
}
#[cfg(all(test, not(target_arch = "wasm32")))]
#[cfg(test)]
mod tests {
#![allow(clippy::unwrap_used)]
use super::*;
use super::{OGG_BITRATES, OggVorbisOptions, encode, encode_ogg_vorbis, quality_for_bitrate, vorbis_map};
use crate::{AudioBuffer, AudioError, ChannelLayout};
#[test]
fn rejects_unsupported_or_malformed_channels_without_dropping_audio() {
for channels in [0, 3, 6] {
for channels in [0, 9] {
assert!(matches!(encode(&AudioBuffer::new(48_000, channels, 16), 192), Err(AudioError::Unsupported(_))));
}
let ragged = AudioBuffer { sample_rate: 48_000, channels: vec![vec![0.0; 16], vec![0.0; 15]] };
@@ -85,46 +200,68 @@ mod tests {
assert!(encode(&AudioBuffer::new(0, 1, 16), 192).is_err());
let invalid = AudioBuffer { sample_rate: 48_000, channels: vec![vec![f32::NAN]] };
assert!(encode(&invalid, 192).is_err());
let infinite = AudioBuffer { sample_rate: 48_000, channels: vec![vec![f32::INFINITY]] };
assert!(encode(&infinite, 192).is_err());
}
#[test]
fn generic_and_direct_encoders_write_mono_and_stereo_ogg() {
for channels in [1, 2] {
fn generic_and_direct_encoders_write_one_to_eight_channels() {
for channels in 1..=8 {
let audio = AudioBuffer::new(48_000, channels, 512);
let opts = crate::EncodeOptions::new(crate::EncodeFormat::Ogg);
assert!(opts.check(48_000, channels).is_ok());
assert_eq!(opts.bitrate(48_000, channels).unwrap(), None);
let direct = encode(&audio, 192).unwrap();
let generic = crate::encode(&audio, &opts).unwrap();
assert!(direct.starts_with(b"OggS"));
assert_eq!(direct, generic);
// silence: the channel order changes nothing, so the generic path writes the same file
let generic = crate::encode(&audio, &opts.with_bitrate(192_000)).unwrap();
assert_eq!(direct, generic, "{channels} channels");
#[cfg(feature = "decode")]
{
let (info, decoded) = crate::decode(&generic, Some("ogg")).unwrap();
assert_eq!(info.channels, channels);
assert_eq!(decoded.num_channels(), channels);
assert_eq!(decoded.frames(), audio.frames());
}
}
}
#[cfg(feature = "decode")]
#[test]
fn distinct_signals_survive_full_and_partial_blocks() {
for frames in [4096, 4097, 8193] {
let channels: Vec<Vec<f32>> = [440.0f32, 880.0]
.into_iter()
.map(|hz| (0..frames).map(|i| (std::f32::consts::TAU * hz * i as f32 / 48_000.0).sin() * 0.4).collect())
.collect();
let audio = AudioBuffer { sample_rate: 48_000, channels };
let bytes = encode(&audio, 192).unwrap();
let (_, decoded) = crate::decode(&bytes, Some("ogg")).unwrap();
assert_eq!(decoded.frames(), frames);
assert_eq!(decoded.channels.len(), 2);
for (expected, actual) in audio.channels.iter().zip(&decoded.channels) {
let mse = expected.iter().zip(actual).map(|(a, b)| (a - b).powi(2)).sum::<f32>() / frames as f32;
// Vorbis is lossy; this tolerates codec error but rejects silence or swapped channels.
assert!(mse.sqrt() < 0.08, "{frames} frames: RMS error {}", mse.sqrt());
}
fn the_quality_follows_the_bit_rate() {
assert_eq!(quality_for_bitrate(0, 2), -1.0);
assert_eq!(quality_for_bitrate(10_000, 2), 10.0);
assert!((quality_for_bitrate(200, 2) - 6.0).abs() < 1e-6);
assert!((quality_for_bitrate(600, 6) - 6.0).abs() < 1e-6);
let mut last = -2.0;
for kbps in OGG_BITRATES.0..=OGG_BITRATES.1 {
let q = quality_for_bitrate(kbps, 2);
assert!(q >= last && (-1.0..=10.0).contains(&q));
last = q;
}
assert!(quality_for_bitrate(192, 0).is_finite());
}
#[test]
fn layouts_map_to_vorbis_order() {
// 5.1 in WAV order (L R C LFE Ls Rs) is written L C R Ls Rs LFE
assert_eq!(vorbis_map(&ChannelLayout::SURROUND_5_1).unwrap(), [0, 2, 1, 4, 5, 3]);
assert_eq!(vorbis_map(&ChannelLayout::SURROUND_5_1_SIDE).unwrap(), [0, 2, 1, 4, 5, 3]);
assert_eq!(vorbis_map(&ChannelLayout::from_mask(0x63F)).unwrap(), [0, 2, 1, 6, 7, 4, 5, 3]);
assert_eq!(vorbis_map(&ChannelLayout::from_mask(0x7)).unwrap(), [0, 2, 1]);
assert_eq!(vorbis_map(&ChannelLayout::STEREO).unwrap(), [0, 1]);
assert!(vorbis_map(&ChannelLayout::from_mask(0xC)).is_err());
assert!(vorbis_map(&ChannelLayout::unordered(9)).is_err());
assert!(vorbis_map(&ChannelLayout::unordered(0)).is_err());
}
#[test]
fn options_build_and_tags_reach_the_comment_header() {
let opts = OggVorbisOptions::default().with_quality(2.0).with_vendor("v").with_tag("TITLE", "t").with_tag("bad=name", "x").with_serial(9);
assert_eq!((opts.quality, opts.vendor.as_str(), opts.serial, opts.tags.len()), (2.0, "v", 9, 2));
let ogg = encode_ogg_vorbis(&AudioBuffer::new(44_100, 1, 100), &opts).unwrap();
let file = craft_media::ogg::open(&ogg).unwrap();
let s = &file.streams[0];
assert_eq!((s.serial, s.saw_eos, s.headers.len()), (9, true, 3));
assert_eq!(s.headers[1], craft_media::ogg::vorbis_comment("v", &[("TITLE", "t")]));
assert_eq!(s.last_granule, Some(100));
}
}
+2 -2
View File
@@ -20,8 +20,8 @@ fn only_formats_the_encoder_writes_are_named() {
}
#[test]
fn ogg_names_follow_the_native_feature() {
let built = cfg!(all(feature = "vorbis-encode", not(target_arch = "wasm32")));
fn ogg_names_follow_the_feature() {
let built = cfg!(feature = "vorbis-encode");
assert_eq!(EncodeFormat::Ogg.is_built(), built);
assert_eq!(encode_format_for("ogg"), built.then_some(EncodeFormat::Ogg));
assert_eq!(craft_audio::ENCODE_EXTENSIONS.contains(&"ogg"), built);
+1 -1
View File
@@ -527,7 +527,7 @@ fn the_format_queries_agree_with_the_writer() {
// The most channels is the most: one more is refused, by the layouts of a format that has
// a fixed set and by the writer of one that has not.
let most: Vec<u16> = EncodeFormat::ALL.iter().map(|f| f.max_channels()).collect();
assert_eq!(most, [32_767, 32_767, 8, 8, 8, 2, 6, 8, 2]);
assert_eq!(most, [32_767, 32_767, 8, 8, 8, 2, 6, 8, 8]);
for &format in EncodeFormat::ALL {
let most = format.max_channels();
match format.fixed_layouts(most) {
+2
View File
@@ -20,3 +20,5 @@ mod opus;
mod opusenc;
mod routing_oracle;
mod track_decoder;
#[cfg(feature = "vorbis-encode")]
mod vorbis_encoder_oracle;
@@ -0,0 +1,131 @@
//! ffmpeg as an external oracle for the pure-Rust Vorbis encoder: both of its decoders (its own
//! and libvorbis) read every file exactly as long as the input, surround comes out on the right
//! speakers, and the tags reach ffprobe. Skipped when ffmpeg is not installed.
use std::path::Path;
use std::process::Command;
use craft_audio::{AudioBuffer, ChannelLayout, EncodeFormat, EncodeOptions, OggVorbisOptions, encode, encode_ogg_vorbis};
/// A different tone on every channel, so each output channel can be traced to its input.
fn tones(rate: u32, channels: usize, frames: usize) -> AudioBuffer {
let channels = (0..channels)
.map(|c| {
let f = 220.0 * (c + 1) as f32;
(0..frames).map(|i| (std::f32::consts::TAU * f * i as f32 / rate as f32).sin() * 0.3).collect()
})
.collect();
AudioBuffer { sample_rate: rate, channels }
}
/// Decodes `file` with ffmpeg's `decoder`; planar output in ffmpeg's (WAV) channel order.
fn ffmpeg_decode(ff: &Path, decoder: &str, file: &[u8], channels: usize, tag: &str) -> Vec<Vec<f32>> {
let path = crate::testkit::fixtures_dir("vorbis-encoder").join(format!("{tag}.ogg"));
std::fs::write(&path, file).unwrap();
let out = Command::new(ff)
.args(["-v", "error", "-xerror", "-c:a", decoder, "-i"])
.arg(&path)
.args(["-f", "f32le", "-c:a", "pcm_f32le", "-"])
.output()
.unwrap();
assert!(out.status.success() && out.stderr.is_empty(), "{tag} {decoder}: {}", String::from_utf8_lossy(&out.stderr));
let pcm: Vec<f32> = out.stdout.as_chunks::<4>().0.iter().map(|&b| f32::from_le_bytes(b)).collect();
(0..channels).map(|c| pcm.iter().skip(c).step_by(channels).copied().collect()).collect()
}
/// ffmpeg's decoders to check: its own `vorbis` always, and `libvorbis` when ffmpeg has it.
fn decoders(ff: &Path) -> Vec<&'static str> {
let list =
Command::new(ff).args(["-hide_banner", "-decoders"]).output().map(|o| String::from_utf8_lossy(&o.stdout).into_owned()).unwrap_or_default();
if list.lines().any(|l| l.split_whitespace().nth(1) == Some("libvorbis")) {
vec!["vorbis", "libvorbis"]
} else {
eprintln!("SKIPPED (libvorbis decoder): this ffmpeg has no libvorbis; checking its own decoder only");
vec!["vorbis"]
}
}
fn correlation(a: &[f32], b: &[f32]) -> f64 {
let (mut ab, mut aa, mut bb) = (0f64, 0f64, 0f64);
for (&x, &y) in a.iter().zip(b) {
ab += f64::from(x) * f64::from(y);
aa += f64::from(x) * f64::from(x);
bb += f64::from(y) * f64::from(y);
}
ab / (aa * bb).sqrt().max(1e-20)
}
/// Vorbis order (§4.3.9) of the WAV-order layouts the test writes, per channel count.
const VORBIS_ORDER: [&[usize]; 8] =
[&[0], &[0, 1], &[0, 2, 1], &[0, 1, 2, 3], &[0, 2, 1, 3, 4], &[0, 2, 1, 4, 5, 3], &[0, 2, 1, 5, 6, 4, 3], &[0, 2, 1, 6, 7, 4, 5, 3]];
/// 1 to 8 channels through `encode` with a WAV-order layout, at exactly the input's length out of
/// both decoders: ffmpeg's own puts every channel back on its WAV speaker, and libvorbis (through
/// ffmpeg, which passes its order through) gives the file's Vorbis order.
#[test]
fn every_channel_count_decodes_on_the_right_speakers() {
let ff = require_ffmpeg!();
for channels in 1..=8u16 {
let layout = if channels == 7 { ChannelLayout::from_mask(0x70F) } else { ChannelLayout::default_for(channels) };
let buf = tones(48_000, channels.into(), 24_000 + 77);
let opts = EncodeOptions::new(EncodeFormat::Ogg).with_layout(layout).with_quality(0.6);
let file = encode(&buf, &opts).unwrap();
for decoder in decoders(&ff) {
let out = ffmpeg_decode(&ff, decoder, &file, channels.into(), &format!("tones{channels}-{decoder}"));
for (j, got) in out.iter().enumerate() {
let c = if decoder == "libvorbis" { VORBIS_ORDER[usize::from(channels) - 1][j] } else { j };
assert_eq!(got.len(), buf.frames(), "{channels} ch {decoder}: channel {j} length");
let best = (0..buf.channels.len()).max_by(|&a, &b| {
correlation(&buf.channels[a][2048..], &got[2048..]).total_cmp(&correlation(&buf.channels[b][2048..], &got[2048..]))
});
assert_eq!(best, Some(c), "{channels} ch {decoder}: output channel {c} carries input {best:?}");
let r = correlation(&buf.channels[c][2048..], &got[2048..]);
assert!(r > 0.95, "{channels} ch {decoder}: channel {c} correlation {r:.3}");
}
}
}
}
/// The comment header's tags, UTF-8 values included, are what ffprobe reports; a name that is not
/// a valid field name is left out.
#[test]
fn tags_reach_ffprobe() {
let Some(probe) = crate::common::tool("ffprobe").or_else(|| crate::common::skip("ffprobe not found")) else { return };
let opts = OggVorbisOptions::new(3.0)
.with_tag("TITLE", "Smörgåsbord ✓")
.with_tag("ARTIST", "Craft")
.with_tag("bad=name", "dropped")
.with_vendor("craft-audio test");
let file = encode_ogg_vorbis(&tones(44_100, 2, 44_100), &opts).unwrap();
let path = crate::testkit::fixtures_dir("vorbis-encoder").join("tags.ogg");
std::fs::write(&path, &file).unwrap();
let out = Command::new(probe).args(["-v", "error", "-of", "json", "-show_streams", "-show_format"]).arg(&path).output().unwrap();
assert!(out.status.success(), "{}", String::from_utf8_lossy(&out.stderr));
let j: serde_json::Value = serde_json::from_slice(&out.stdout).unwrap();
let s = &j["streams"][0];
assert_eq!((s["codec_name"].as_str(), s["channels"].as_u64(), s["sample_rate"].as_str()), (Some("vorbis"), Some(2), Some("44100")));
let tags = &s["tags"];
assert_eq!((tags["TITLE"].as_str(), tags["ARTIST"].as_str()), (Some("Smörgåsbord ✓"), Some("Craft")));
assert!(tags.as_object().unwrap().keys().all(|k| !k.contains("bad")), "{tags}");
assert_eq!(j["format"]["duration"].as_str().map(|d| d.parse::<f64>().unwrap()), Some(1.0));
}
/// The lowest and highest qualities and the bit-rate path decode at the exact length, mono at
/// 44.1 kHz and stereo at 22.05 kHz.
#[test]
fn quality_extremes_and_rates_decode_exactly() {
let ff = require_ffmpeg!();
for (rate, channels, quality) in [(44_100u32, 1usize, -1.0f32), (44_100, 1, 10.0), (22_050, 2, -1.0), (22_050, 2, 10.0), (96_000, 2, 5.0)] {
let buf = tones(rate, channels, rate as usize / 2 + 13);
let file = encode_ogg_vorbis(&buf, &OggVorbisOptions::new(quality)).unwrap();
for decoder in decoders(&ff) {
let out = ffmpeg_decode(&ff, decoder, &file, channels, &format!("q{quality}-{rate}-{channels}-{decoder}"));
assert!(out.iter().all(|c| c.len() == buf.frames()), "q{quality} {rate} Hz {decoder}: {}", out[0].len());
let r = correlation(&buf.channels[0][2048..], &out[0][2048..]);
assert!(r > 0.9, "q{quality} {rate} Hz {decoder}: correlation {r:.3}");
}
}
let low = craft_audio::encode_ogg(&tones(48_000, 2, 48_000), craft_audio::OGG_BITRATES.0).unwrap();
let high = craft_audio::encode_ogg(&tones(48_000, 2, 48_000), craft_audio::OGG_BITRATES.1).unwrap();
assert!(low.len() < high.len(), "{} vs {} bytes", low.len(), high.len());
}
+211
View File
@@ -0,0 +1,211 @@
//! The native FLAC decoder: round trips through this crate's encoder over bit depths, channel
//! counts, block sizes and effort levels; hostile input; and ffmpeg as the reference (oracle;
//! skipped when ffmpeg is absent, a failure with `CRAFT_MEDIA_REQUIRE_ORACLES=1`) for files
//! ffmpeg's encoder writes at every compression level.
use craft_audio::flac::{DecodeError, Decoder, Encoder, EncoderConfig, STREAMINFO_OFFSET, StreamInfo, decode};
use std::process::Command;
fn signal(channels: usize, frames: usize, bits: u32, seed: u32) -> Vec<Vec<i32>> {
let max = if bits == 32 { i32::MAX as f64 } else { ((1i64 << (bits - 1)) - 1) as f64 };
let mut s = seed;
(0..channels)
.map(|c| {
(0..frames)
.map(|i| {
s ^= s << 13;
s ^= s >> 17;
s ^= s << 5;
let t = i as f64;
let v = match (i / 3000) % 4 {
0 => (t * (0.01 + 0.007 * c as f64)).sin() * 0.6 + (t * 0.31).sin() * 0.1,
1 => (f64::from(s) / f64::from(u32::MAX) - 0.5) * 1.8,
2 => 0.0,
_ => {
if (i / 40) % 2 == 0 {
0.99
} else {
-0.99
}
}
};
(v * max).round() as i32
})
.collect()
})
.collect()
}
fn encode(channels: &[Vec<i32>], rate: u32, bits: u8, block: u16, level: u8) -> Vec<u8> {
let mut cfg = EncoderConfig::new(rate, channels.len() as u8, bits);
cfg.block_size = block;
cfg.level = level;
let mut enc = Encoder::new(cfg).expect("encoder");
let mut file = enc.header(&[]);
let refs: Vec<&[i32]> = channels.iter().map(Vec::as_slice).collect();
file.extend(enc.encode(&refs).expect("encode"));
file.extend(enc.finish());
let at = STREAMINFO_OFFSET as usize;
file[at..at + 34].copy_from_slice(&enc.streaminfo());
file
}
#[test]
fn round_trips_through_the_encoder() {
for (channels, bits) in [(1usize, 8u8), (2, 8), (1, 12), (2, 16), (2, 20), (3, 24), (6, 24), (8, 16), (2, 32), (1, 32)] {
for (block, level) in [(4096u16, 5u8), (16, 0), (1000, 8), (65535, 3), (576, 1)] {
let frames = 9000 + usize::from(block % 97);
let src = signal(channels, frames, u32::from(bits), 0x1234_5679 + u32::from(bits));
let file = encode(&src, 44_100, bits, block, level);
let got = decode(&file).unwrap_or_else(|e| panic!("{channels}ch {bits}-bit block {block} level {level}: {e}"));
assert_eq!((got.info.channels as usize, got.info.bits_per_sample, got.info.sample_rate), (channels, bits, 44_100));
assert_eq!(got.channels, src, "{channels}ch {bits}-bit block {block} level {level}");
}
}
}
#[test]
fn frames_decode_one_at_a_time() {
let src = signal(2, 10_000, 16, 7);
let file = encode(&src, 48_000, 16, 4096, 5);
let info = StreamInfo::parse(&file[STREAMINFO_OFFSET as usize..]).expect("streaminfo");
let dec = Decoder::new(info);
// The first frame follows the metadata blocks; find the first position a frame decodes at.
let at = (42..file.len()).find(|&p| dec.decode_frame(&file[p..]).is_ok()).expect("a frame");
let first = dec.decode_frame(&file[at..]).expect("frame");
assert_eq!((first.block_size, first.number, first.sample_rate, first.bits_per_sample), (4096, 0, 48_000, 16));
assert_eq!(first.channels[0], src[0][..4096]);
// Without the STREAMINFO a frame that spells out its own rate and depth still decodes.
let _ = Decoder::without_streaminfo().decode_frame(&file[at..]);
}
#[test]
fn hostile_input_is_an_error_not_a_panic() {
let src = signal(2, 6000, 16, 11);
let file = encode(&src, 44_100, 16, 1152, 5);
for n in 0..file.len().min(3000) {
let _ = decode(&file[..n]);
}
// A cut file is truncated, not silently shorter.
assert!(decode(&file[..file.len() - 5]).is_err());
// Every bit flip in the first frames is caught by a CRC or another check, never a panic.
for i in 0..file.len().min(2500) {
for bit in 0..8 {
let mut c = file.clone();
c[i] ^= 1 << bit;
let _ = decode(&c);
}
}
// A sample limit stops a stream that claims too much.
assert_eq!(craft_audio::flac::decode_with_limit(&file, 1000), Err(DecodeError::TooLarge));
assert!(decode(b"nope").is_err());
assert!(decode(b"fLaC").is_err());
}
// ---- ffmpeg ----
/// Little-endian 16- or 32-bit samples of raw PCM.
fn pcm_values(raw: &[u8], bytes: usize) -> Vec<i32> {
if bytes == 2 {
raw.as_chunks::<2>().0.iter().map(|b| i32::from(i16::from_le_bytes(*b))).collect()
} else {
raw.as_chunks::<4>().0.iter().map(|b| i32::from_le_bytes(*b)).collect()
}
}
/// Planar channels as interleaved samples.
fn interleave(channels: &[Vec<i32>]) -> Vec<i32> {
let frames = channels.first().map_or(0, Vec::len);
(0..frames).flat_map(|i| channels.iter().map(move |c| c[i])).collect()
}
fn ffmpeg_run(ff: &std::path::Path, args: &[&str]) -> Vec<u8> {
let out = Command::new(ff).args(["-v", "error", "-nostdin", "-y"]).args(args).output().expect("run ffmpeg");
assert!(out.status.success(), "ffmpeg {args:?}: {}", String::from_utf8_lossy(&out.stderr));
out.stdout
}
#[test]
fn ffmpeg_files_decode_to_ffmpegs_samples() {
let Some(ff) = craft_media_testkit::ffmpeg() else { return };
let dir = craft_media_testkit::fixture_subdir("flac_decode");
let tones = "aevalsrc=exprs=0.4*sin(2*PI*441*t)+0.2*sin(2*PI*3100*t)|0.3*sin(2*PI*660*t)*sin(2*PI*3*t):s=44100:d=1.3";
let noise = "anoisesrc=d=1.3:c=white:r=44100:a=0.5:s=3";
for (src, name) in [(tones, "tones"), (noise, "noise")] {
for channels in [1usize, 2, 6] {
for (fmt, bytes, bits) in [("s16", 2usize, 16u32), ("s32", 4, 24)] {
for level in [0, 3, 5, 8, 12] {
let file = dir.join(format!("ffmpeg_{name}_{channels}ch_{bits}_l{level}.flac"));
let f = file.to_str().expect("path");
let (ch, lv) = (channels.to_string(), level.to_string());
ffmpeg_run(&ff, &["-f", "lavfi", "-i", src, "-ac", &ch, "-sample_fmt", fmt, "-compression_level", &lv, "-c:a", "flac", f]);
let theirs = ffmpeg_run(&ff, &["-i", f, "-f", if bits == 16 { "s16le" } else { "s32le" }, "-"]);
let got =
decode(&std::fs::read(&file).expect("read")).unwrap_or_else(|e| panic!("{name} {channels}ch {bits}-bit level {level}: {e}"));
assert_eq!(got.info.channels as usize, channels);
let frames = got.channels[0].len();
assert_eq!(theirs.len(), frames * channels * bytes, "{name} {channels}ch {bits} l{level}: length");
// ffmpeg returns 24-bit audio left-aligned in 32 bits.
let shift = if bits == 24 { 8 } else { 0 };
let mine: Vec<i32> = interleave(&got.channels).into_iter().map(|v| v << shift).collect();
let ok = mine == pcm_values(&theirs, bytes);
assert!(ok, "{name} {channels}ch {bits}-bit level {level}: samples differ from ffmpeg's decode");
}
}
}
}
}
#[test]
fn ffmpeg_decodes_our_files_to_our_samples() {
let Some(ff) = craft_media_testkit::ffmpeg() else { return };
let dir = craft_media_testkit::fixture_subdir("flac_decode");
for (channels, bits) in [(1usize, 16u8), (2, 16), (2, 24), (6, 16)] {
let src = signal(channels, 20_000, u32::from(bits), 99);
let file = dir.join(format!("ours_{channels}ch_{bits}.flac"));
std::fs::write(&file, encode(&src, 44_100, bits, 4096, 5)).expect("write");
let theirs = ffmpeg_run(&ff, &["-i", file.to_str().expect("path"), "-f", if bits == 16 { "s16le" } else { "s32le" }, "-"]);
let got = decode(&std::fs::read(&file).expect("read")).expect("decode");
let bytes = if bits == 16 { 2 } else { 4 };
let shift = if bytes == 4 { 8 } else { 0 };
let want: Vec<i32> = pcm_values(&theirs, bytes).into_iter().map(|v| v >> shift).collect();
assert!(interleave(&got.channels) == want, "{channels}ch {bits}-bit: samples differ from ffmpeg's decode");
}
}
#[test]
fn rejects_unknown_length_corruption_and_streaminfo_format_mismatch() {
let src = signal(1, 100, 16, 7);
let original = encode(&src, 44_100, 16, 4096, 5);
let at = STREAMINFO_OFFSET as usize;
// STREAMINFO is not CRC-covered. Clear only the 36-bit total sample count.
let mut unknown = original.clone();
unknown[at + 13] &= 0xf0;
unknown[at + 14..at + 18].fill(0);
assert_eq!(decode(&unknown).unwrap().channels, src);
for tail in [vec![0xff], vec![0x00, 0x00]] {
let mut broken = unknown.clone();
broken.extend(tail);
assert!(decode(&broken).is_err());
}
// The encoder spells these in frame headers, independent of STREAMINFO.
let mut wrong_rate = original.clone();
let mut packed = u64::from_be_bytes(wrong_rate[at + 10..at + 18].try_into().unwrap());
packed = (packed & ((1u64 << 44) - 1)) | (48_000u64 << 44);
wrong_rate[at + 10..at + 18].copy_from_slice(&packed.to_be_bytes());
assert!(decode(&wrong_rate).is_err());
let mut wrong_depth = original;
wrong_depth[at + 12] = (wrong_depth[at + 12] & !1) | 1;
wrong_depth[at + 13] = (wrong_depth[at + 13] & 0x0f) | 0x70;
assert!(decode(&wrong_depth).is_err());
}
#[test]
fn caller_constructed_streaminfo_is_validated_before_decoding() {
let file = encode(&signal(1, 100, 16, 9), 44_100, 16, 4096, 5);
let info = StreamInfo::parse(&file[STREAMINFO_OFFSET as usize..]).unwrap();
for bits in [0, 1, 3, 33, 64, 255] {
let invalid = StreamInfo { bits_per_sample: bits, ..info };
assert!(matches!(Decoder::new(invalid).decode_frame(&[]), Err(DecodeError::Invalid(_))));
}
}
+2
View File
@@ -32,9 +32,11 @@ pub mod named;
pub mod pipeline;
pub mod profile;
pub mod sony_lut;
pub mod spi1d;
pub mod synth;
pub mod transform;
mod write;
pub mod write_v2;
pub use builtin::Builtin;
pub use clut::Clut;
+59
View File
@@ -0,0 +1,59 @@
//! Sony Imageworks SPI1D tables, preserving EffectCraft's permissive header syntax.
//!
//! Unknown header lines and trailing text after the closing brace are ignored. Table
//! samples are not clamped or sanitized: callers own their numerical rendering policy.
//! The declared length is validated before storing samples; surplus samples are refused.
/// Largest accepted table (the existing EffectCraft interpolation limit).
pub const MAX_ENTRIES: usize = 1 << 24;
/// A one-dimensional RGB lookup table and its common input domain.
#[derive(Clone, Debug, PartialEq)]
pub struct Table {
pub values: Vec<[f32; 3]>,
pub domain: [f32; 2],
}
/// Parse a SPI1D table with one or three components, expanding monochrome samples to RGB.
/// No allocation is based only on the claimed length. At most `MAX_ENTRIES` RGB entries
/// are retained. Missing final braces remain accepted, as in the source reader.
pub fn parse(text: &str) -> Option<Table> {
let (mut from, mut len, mut comps) = ([0.0f32, 1.0], 0usize, 1usize);
let mut values = Vec::new();
let mut body = false;
let mut sample = [0.0; 3];
let mut channel = 0;
for line in text.lines().map(str::trim).filter(|l| !l.is_empty()) {
if body {
if line.starts_with('}') {
break;
}
for t in line.split_whitespace() {
if values.len() == len {
return None;
}
sample[channel] = t.parse().ok()?;
channel += 1;
if channel == comps {
values.push(if comps == 1 { [sample[0]; 3] } else { sample });
channel = 0;
}
}
continue;
}
let mut t = line.split_whitespace();
match t.next()? {
"{" => {
if !(2..=MAX_ENTRIES).contains(&len) || !matches!(comps, 1 | 3) || from[1] <= from[0] || from.iter().any(|v| !v.is_finite()) {
return None;
}
body = true;
}
"From" => from = [t.next()?.parse().ok()?, t.next()?.parse().ok()?],
"Length" => len = t.next()?.parse().ok()?,
"Components" => comps = t.next()?.parse().ok()?,
_ => {}
}
}
(body && values.len() == len && channel == 0).then_some(Table { values, domain: from })
}
+195
View File
@@ -0,0 +1,195 @@
//! Bounded ICC v2.1 matrix/TRC display-profile writer, extracted from TextureCraft.
//! Colour-space selection and transfer-curve sampling remain caller policy.
const D50_XYZ: [f64; 3] = [0.9642, 1.0, 0.8249];
/// One common red/green/blue transfer curve.
#[derive(Clone, Copy)]
pub enum ToneCurve<'a> {
/// ICC gamma 1.0 (`curv` with one u8Fixed8 entry).
Linear,
/// Already quantized samples, inclusive endpoints, between 2 and 4096 entries.
Samples(&'a [u16]),
}
/// Parameters for an ICC v2.1 RGB display profile.
pub struct MatrixProfile<'a> {
/// RGB-to-XYZ matrix already adapted to PCS D50, in row-major order.
pub matrix: [[f64; 3]; 3],
/// Common RGB transfer curve; its storage is shared by all three tags.
pub curve: ToneCurve<'a>,
/// ASCII description, at most 1024 bytes with no embedded NUL.
pub description: &'a str,
/// ASCII copyright text, at most 1024 bytes with no embedded NUL.
pub copyright: &'a str,
/// Raw ICC date fields: year, month, day, hour, minute, second.
pub date: [u16; 6],
}
fn s15f16(v: f64) -> [u8; 4] {
((v * 65536.0).round().clamp(f64::from(i32::MIN), f64::from(i32::MAX)) as i32).to_be_bytes()
}
fn xyz_tag(v: [f64; 3]) -> Vec<u8> {
let mut b = b"XYZ \0\0\0\0".to_vec();
for c in v {
b.extend_from_slice(&s15f16(c));
}
b
}
fn text_tag(text: &str) -> Vec<u8> {
let mut b = b"text\0\0\0\0".to_vec();
b.extend_from_slice(text.as_bytes());
b.push(0);
b
}
/// `textDescriptionType` with the ASCII description only.
fn desc_tag(text: &str) -> Vec<u8> {
let mut b = b"desc\0\0\0\0".to_vec();
b.extend_from_slice(&(text.len() as u32 + 1).to_be_bytes());
b.extend_from_slice(text.as_bytes());
b.push(0);
// No Unicode text and no Macintosh ScriptCode text: empty fields and the 67-byte filler.
b.extend_from_slice(&[0; 4 + 4 + 2 + 1 + 67]);
b
}
fn curve_tag(curve: ToneCurve<'_>) -> Vec<u8> {
let mut b = b"curv\0\0\0\0".to_vec();
match curve {
ToneCurve::Linear => {
b.extend_from_slice(&1u32.to_be_bytes());
b.extend_from_slice(&0x0100u16.to_be_bytes());
}
ToneCurve::Samples(samples) => {
b.extend_from_slice(&(samples.len() as u32).to_be_bytes());
for sample in samples {
b.extend_from_slice(&sample.to_be_bytes());
}
}
}
b
}
/// Write a deterministic ICC v2.1 RGB display profile with one shared RGB TRC.
///
/// Returns `None` for nonfinite matrix values, descriptions longer than 1024 ASCII
/// bytes or containing NUL, or sampled curves outside 2..=4096 entries. These caps
/// bound every allocation independently of caller input. Matrix values outside the
/// signed 15.16 range saturate, matching the legacy exporter. The caller owns colour
/// adaptation, transfer sampling, names and timestamp policy.
pub fn matrix_profile(params: &MatrixProfile<'_>) -> Option<Vec<u8>> {
let valid_text = |s: &str| s.len() <= 1024 && s.is_ascii() && !s.contains('\0');
if !valid_text(params.description)
|| !valid_text(params.copyright)
|| !params.matrix.iter().flatten().all(|v| v.is_finite())
|| matches!(params.curve, ToneCurve::Samples(s) if !(2..=4096).contains(&s.len()))
{
return None;
}
let m = params.matrix;
let column = |c: usize| [m[0][c], m[1][c], m[2][c]];
let curve = curve_tag(params.curve);
// The green and blue curves are the red one's entry.
let tags: [(&[u8; 4], Vec<u8>); 9] = [
(b"desc", desc_tag(params.description)),
(b"cprt", text_tag(params.copyright)),
(b"wtpt", xyz_tag(D50_XYZ)),
(b"rXYZ", xyz_tag(column(0))),
(b"gXYZ", xyz_tag(column(1))),
(b"bXYZ", xyz_tag(column(2))),
(b"rTRC", curve.clone()),
(b"gTRC", curve.clone()),
(b"bTRC", curve),
];
// Header (128) + tag count (4) + 12 per tag, then the tag data, each tag padded to 4 bytes.
let table_end = 128 + 4 + 12 * tags.len();
let mut offsets = Vec::new();
let mut data: Vec<u8> = Vec::new();
for (i, (_, bytes)) in tags.iter().enumerate() {
let shared = i >= 7;
let at = if shared { offsets.get(6).copied().unwrap_or(0) } else { table_end + data.len() };
offsets.push(at);
if !shared {
data.extend_from_slice(bytes);
while !data.len().is_multiple_of(4) {
data.push(0);
}
}
}
let total = table_end + data.len();
let mut out = vec![0u8; 128];
out.get_mut(0..4)?.copy_from_slice(&(total as u32).to_be_bytes());
out.get_mut(8..12)?.copy_from_slice(&[2, 0x10, 0, 0]); // version 2.1.0
out.get_mut(12..16)?.copy_from_slice(b"mntr");
out.get_mut(16..20)?.copy_from_slice(b"RGB ");
out.get_mut(20..24)?.copy_from_slice(b"XYZ ");
// Serialize caller-supplied ICC date fields; no calendar arithmetic.
for (i, value) in params.date.iter().enumerate() {
out.get_mut(24 + i * 2..26 + i * 2)?.copy_from_slice(&value.to_be_bytes());
}
out.get_mut(36..40)?.copy_from_slice(b"acsp");
for (k, v) in D50_XYZ.iter().enumerate() {
out.get_mut(68 + 4 * k..72 + 4 * k)?.copy_from_slice(&s15f16(*v));
}
out.extend_from_slice(&(tags.len() as u32).to_be_bytes());
for ((sig, bytes), at) in tags.iter().zip(&offsets) {
out.extend_from_slice(*sig);
out.extend_from_slice(&(*at as u32).to_be_bytes());
out.extend_from_slice(&(bytes.len() as u32).to_be_bytes());
}
out.extend_from_slice(&data);
Some(out)
}
#[cfg(test)]
mod tests {
#![allow(clippy::unwrap_used)]
use super::*;
fn params() -> MatrixProfile<'static> {
MatrixProfile {
matrix: [[0.4361, 0.3851, 0.1431], [0.2225, 0.7169, 0.0606], [0.0139, 0.0971, 0.7141]],
curve: ToneCurve::Linear,
description: "v2",
copyright: "free",
date: [2026, 1, 1, 0, 0, 0],
}
}
#[test]
fn valid_profile_parses_and_aliases_curves() {
for curve in [ToneCurve::Linear, ToneCurve::Samples(&[0, 32768, 65535])] {
let bytes = matrix_profile(&MatrixProfile { curve, ..params() }).unwrap();
let p = crate::Profile::parse(&bytes).unwrap();
assert_eq!(p.version, (2, 0x10));
assert_eq!(p.description, "v2");
assert_eq!(&bytes[24..28], &[7, 234, 0, 1]);
assert_eq!(&bytes[208..216], &bytes[220..228]);
assert_eq!(&bytes[208..216], &bytes[232..240]);
assert_eq!(bytes, matrix_profile(&MatrixProfile { curve, ..params() }).unwrap());
}
}
#[test]
fn bounded_inputs_reject_before_serializing() {
let long = "x".repeat(1025);
for description in [long.as_str(), "bad\0name", "non-ascii é"] {
assert!(matrix_profile(&MatrixProfile { description, ..params() }).is_none());
}
for samples in [&[][..], &[0][..], &vec![0; 4097][..]] {
assert!(matrix_profile(&MatrixProfile { curve: ToneCurve::Samples(samples), ..params() }).is_none());
}
for value in [f64::NAN, f64::INFINITY, f64::NEG_INFINITY] {
let mut p = params();
p.matrix[0][0] = value;
assert!(matrix_profile(&p).is_none());
}
let samples = vec![0; 4096];
let name = "x".repeat(1024);
let bytes = matrix_profile(&MatrixProfile { description: &name, copyright: &name, curve: ToneCurve::Samples(&samples), ..params() }).unwrap();
assert!(bytes.len() < 12 * 1024);
}
}
+32
View File
@@ -0,0 +1,32 @@
use craft_cms::spi1d::{MAX_ENTRIES, Table, parse};
#[test]
fn monochrome_and_three_component_samples_preserve_domain() {
assert_eq!(
parse("Version 1\nFrom -1 2\nLength 2\nComponents 1\n{\n-2\n3\n}"),
Some(Table { values: vec![[-2.0; 3], [3.0; 3]], domain: [-1.0, 2.0] })
);
assert_eq!(
parse("Length 2\nComponents 3\n{\n0 1\n2 3 4 5\n}"),
Some(Table { values: vec![[0.0, 1.0, 2.0], [3.0, 4.0, 5.0]], domain: [0.0, 1.0] })
);
}
#[test]
fn legacy_header_and_eof_tolerance_is_preserved() {
let table = parse("Ignored arbitrary header\nLength 2 extra\n{\n0 1");
assert!(table.is_some());
assert_eq!(table, parse("Length 2\n{\n0 1\n} ignored\ninvalid trailing text"));
assert!(parse("Length 2\n{\nNaN inf\n}").is_some(), "sample sanitization belongs to the caller");
}
#[test]
fn invalid_headers_partial_and_surplus_tables_are_refused() {
for header in ["Length 1", "Length 2\nComponents 2", "Length 2\nFrom 2 1", "Length 2\nFrom NaN 1"] {
assert!(parse(&format!("{header}\n{{\n0 1\n}}")).is_none());
}
assert!(parse(&format!("Length {}\n{{\n0 1", MAX_ENTRIES + 1)).is_none());
assert!(parse("Length 2\nComponents 3\n{\n0 1 2 3 4").is_none());
assert!(parse("Length 2\n{\n0 1 2").is_none());
assert!(parse("Length 2\n{\n").is_none());
}
+15
View File
@@ -0,0 +1,15 @@
[package]
name = "craft-control-protocol"
description = "Authenticated bounded JSON-lines control protocol"
version.workspace = true
edition.workspace = true
license.workspace = true
rust-version.workspace = true
repository.workspace = true
[lints]
workspace = true
[dependencies]
serde_json = { workspace = true }
subtle = "2"
+234
View File
@@ -0,0 +1,234 @@
//! Authenticated JSON-lines request framing and dispatch for local control services.
#![cfg_attr(not(test), deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable))]
use serde_json::{Value, json};
use std::io::{BufRead, BufReader, Read, Write};
use subtle::ConstantTimeEq;
/// Whether a session token has the control protocol's 64 hexadecimal character form.
pub fn valid_token(token: &str) -> bool {
token.len() == 64 && token.bytes().all(|b| b.is_ascii_hexdigit())
}
/// Encode one client request, including its terminating newline.
pub fn request_line(id: u64, token: Option<&str>, method: &str, params: &Value) -> String {
format!("{}\n", json!({"id": id, "token": token, "method": method, "params": params}))
}
/// Extract the result or application error from a parsed control reply.
pub fn reply_result(reply: &Value) -> Result<Value, String> {
if reply.get("ok").and_then(Value::as_bool) == Some(true) {
Ok(reply.get("result").cloned().unwrap_or(Value::Null))
} else {
Err(reply.get("error").and_then(Value::as_str).unwrap_or("error").to_owned())
}
}
/// One parsed line.
enum Line {
Request {
id: Value,
method: String,
params: Value,
},
Blank,
/// Not a request: reply with this error and close the connection.
Reject(String),
}
fn parse_line(bytes: &[u8], token: &str) -> Line {
let Ok(text) = std::str::from_utf8(bytes) else {
return Line::Reject("not a control request (invalid UTF-8); closing the connection".into());
};
let text = text.trim();
if text.is_empty() {
return Line::Blank;
}
let msg = match serde_json::from_str::<Value>(text) {
Ok(v) => v,
Err(e) => return Line::Reject(format!("bad JSON ({e}); expected one JSON request object per line; closing the connection")),
};
let Some(obj) = msg.as_object() else {
return Line::Reject("not a control request (expected a JSON object); closing the connection".into());
};
let Some(method) = obj.get("method").and_then(Value::as_str) else {
return Line::Reject("not a control request (missing string `method`); closing the connection".into());
};
// Authenticate every request before constructing or enqueueing a ControlRequest. A valid
// earlier request must not authorize a later one with a missing or incorrect credential.
let authenticated = obj.get("token").and_then(Value::as_str).is_some_and(|supplied| bool::from(supplied.as_bytes().ct_eq(token.as_bytes())));
if !authenticated {
return Line::Reject("control authentication failed; closing the connection".into());
}
Line::Request {
id: obj.get("id").cloned().unwrap_or(Value::Null),
method: method.to_string(),
params: obj.get("params").cloned().unwrap_or(json!({})),
}
}
#[derive(Debug, PartialEq, Eq)]
pub enum ReadFailure {
Timeout,
Rejected(String),
}
/// Read one `\n`-terminated line of at most `max` bytes into `buf` (newline stripped).
/// `Ok(false)` at end of stream; `Err` when the line is too long or the read fails.
pub fn read_bounded_line(reader: &mut impl BufRead, buf: &mut Vec<u8>, max: usize) -> Result<bool, ReadFailure> {
buf.clear();
// `take` bounds the bytes buffered for one line: a peer can't make us allocate more than `max`.
let limit = u64::try_from(max).unwrap_or(u64::MAX).saturating_add(1);
let n = reader.take(limit).read_until(b'\n', buf).map_err(|e| match e.kind() {
std::io::ErrorKind::TimedOut | std::io::ErrorKind::WouldBlock => ReadFailure::Timeout,
_ => ReadFailure::Rejected(e.to_string()),
})?;
if n == 0 {
return Ok(false);
}
if buf.last() == Some(&b'\n') {
buf.pop();
if buf.last() == Some(&b'\r') {
buf.pop();
}
return Ok(true);
}
if buf.len() > max {
return Err(ReadFailure::Rejected(format!("request line longer than {max} bytes; closing the connection")));
}
// Last line without a newline, then end of stream.
Ok(true)
}
/// Serve requests from `read`, answering on `out`, until the peer closes, sends something that is
/// not a request, or `handle` returns `None` (app gone). `handle` gets `(method, params)` and
/// returns the reply object (the request's `id` is added here).
pub fn serve_lines<R: Read, W: Write>(read: R, mut out: W, token: &str, max_line: usize, mut handle: impl FnMut(String, Value) -> Option<Value>) {
let mut reader = BufReader::new(read);
let mut buf = Vec::new();
loop {
let reject = match read_bounded_line(&mut reader, &mut buf, max_line) {
Ok(false) => return,
// Expiration is not a request: a pooled client must see EOF and reconnect, rather
// than read a stale error reply. A partial line must not be parsed on timeout.
Err(ReadFailure::Timeout) => return,
Err(ReadFailure::Rejected(e)) => e,
Ok(true) => match parse_line(&buf, token) {
Line::Blank => continue,
Line::Reject(e) => e,
Line::Request { id, method, params } => {
let Some(mut r) = handle(method, params) else { return };
if let Some(o) = r.as_object_mut() {
o.insert("id".into(), id);
}
if writeln!(out, "{r}").and_then(|()| out.flush()).is_err() {
return;
}
continue;
}
},
};
let _ = writeln!(out, "{}", json!({"ok": false, "error": reject})).and_then(|()| out.flush());
return;
}
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn rejects_bad_request_shapes_without_dispatching() {
for input in [&b"\xff\n"[..], &b"[]\n"[..], &b"{}\n"[..]] {
let mut out = Vec::new();
serve_lines(input, &mut out, "secret", 1024, |_, _| panic!("must not dispatch"));
let reply: Value = serde_json::from_slice(&out).unwrap();
assert_eq!(reply["ok"], false);
assert!(reply["error"].as_str().unwrap().contains("closing the connection"));
}
}
#[test]
fn timeout_after_partial_line_never_dispatches() {
struct Partial(bool);
impl Read for Partial {
fn read(&mut self, buf: &mut [u8]) -> std::io::Result<usize> {
if !self.0 {
self.0 = true;
buf[..2].copy_from_slice(b"{\"");
return Ok(2);
}
Err(std::io::ErrorKind::TimedOut.into())
}
}
let mut out = Vec::new();
serve_lines(Partial(false), &mut out, "secret", 1024, |_, _| panic!("must not dispatch"));
assert!(out.is_empty());
}
#[test]
fn line_boundaries_and_closed_dispatch_are_preserved() {
let mut buf = Vec::new();
assert_eq!(read_bounded_line(&mut &b"abc\r\n"[..], &mut buf, 4), Ok(true));
assert_eq!(buf, b"abc");
assert_eq!(read_bounded_line(&mut &b"abcd\n"[..], &mut buf, 4), Ok(true));
assert_eq!(buf, b"abcd");
let mut out = Vec::new();
serve_lines(&b"{\"method\":\"x\",\"token\":\"s\"}\n"[..], &mut out, "s", 1024, |_, _| None);
assert!(out.is_empty());
}
#[test]
fn output_failure_stops_following_requests() {
struct Closed;
impl Write for Closed {
fn write(&mut self, _: &[u8]) -> std::io::Result<usize> {
Err(std::io::ErrorKind::BrokenPipe.into())
}
fn flush(&mut self) -> std::io::Result<()> {
Ok(())
}
}
let input = b"{\"method\":\"x\",\"token\":\"s\"}\n{\"method\":\"y\",\"token\":\"s\"}\n";
let mut calls = 0;
serve_lines(&input[..], Closed, "s", 1024, |_, _| {
calls += 1;
Some(json!({"ok": true}))
});
assert_eq!(calls, 1);
}
#[test]
fn client_request_and_reply_keep_optional_fields() {
let line = request_line(7, None, "status", &json!({"a": 1}));
assert_eq!(serde_json::from_str::<Value>(&line).unwrap(), json!({"id": 7, "token": null, "method": "status", "params": {"a": 1}}));
assert_eq!(reply_result(&json!({"ok": true})).unwrap(), Value::Null);
assert_eq!(reply_result(&json!({"ok": false, "error": "busy"})).unwrap_err(), "busy");
}
#[test]
fn validates_session_token_shape() {
assert!(valid_token(&"aB09".repeat(16)));
assert!(!valid_token(&"a".repeat(63)));
assert!(!valid_token(&"g".repeat(64)));
}
#[test]
fn authenticates_each_request_and_closes_after_failure() {
let input =
b"{\"id\":1,\"method\":\"first\",\"token\":\"secret\"}\n{\"id\":2,\"method\":\"second\"}\n{\"method\":\"third\",\"token\":\"secret\"}\n";
let mut output = Vec::new();
let mut calls = Vec::new();
serve_lines(&input[..], &mut output, "secret", 4096, |method, _| {
calls.push(method);
Some(json!({"ok": true}))
});
assert_eq!(calls, ["first"]);
let lines: Vec<Value> = std::str::from_utf8(&output).unwrap().lines().map(|s| serde_json::from_str(s).unwrap()).collect();
assert_eq!(lines[0], json!({"ok": true, "id": 1}));
assert_eq!(lines[1]["error"], "control authentication failed; closing the connection");
}
#[test]
fn bounds_requests_and_preserves_last_unterminated_line() {
let mut buf = Vec::new();
assert_eq!(read_bounded_line(&mut &b"abc"[..], &mut buf, 3), Ok(true));
assert_eq!(buf, b"abc");
assert!(matches!(read_bounded_line(&mut &b"abcd"[..], &mut buf, 3), Err(ReadFailure::Rejected(_))));
let mut out = Vec::new();
serve_lines(&b"{broken}\n"[..], &mut out, "secret", 1024, |_, _| panic!("must not dispatch"));
let reply: Value = serde_json::from_slice(&out).unwrap();
assert!(reply["error"].as_str().unwrap().starts_with("bad JSON ("));
}
}
+18
View File
@@ -0,0 +1,18 @@
[package]
name = "craft-deckcraft-format"
description = "The DeckCraft .deckcraft package: identity, manifest envelope, NaN-safe JSON, member names and bounded reads"
version.workspace = true
edition.workspace = true
license.workspace = true
rust-version.workspace = true
repository.workspace = true
[lints]
workspace = true
[dependencies]
craft-zip = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
zip = { version = "9", default-features = false, features = ["deflate-flate2"] }
+25
View File
@@ -0,0 +1,25 @@
# craft-deckcraft-format
The DeckCraft `.deckcraft` package. A file is a ZIP that holds, in this order:
- `mimetype`, stored: `application/vnd.storyteller.deckcraft+zip`. Files from before the
SlideCraft rename carry the legacy type, and `sniff` accepts both.
- `presentation.json`, deflated: `{"format":"deckcraft","version":1,"generator":…,"presentation":…}`.
It is compact JSON, and non-finite numbers are written as `0` (`Finite`).
- `media/<id>` and `chart-parts/<index>` binary members. A member whose content type is already
compressed (JPEG, PNG, video, MP3/MP4 audio, anything `zip`) is stored, and any other member is deflated.
The presentation is a type parameter: DeckCraft owns the model, decides which media and chart
parts become members, and repairs a loaded deck. This crate owns the bytes:
- `write(presentation, generator, members)` writes the package with `craft-zip`'s deterministic writer.
- `Package::open_manifest(bytes, max)` reads and checks the manifest. A file with no
`presentation.json` or a different `format` is `NotOurs`. `parse_manifest` reads files written
before `Finite`, where serde_json saved NaN as `null`, as 0 within fixed patch and re-parse budgets.
- `Package::read_max` refuses a member that declares more than its limit and stops one that
inflates past it. `read_charged` charges a shared budget for every byte it inflates, including
the bytes of a read that then fails its CRC.
- `Budget` and the `MAX_*` constants are the format's limits: 2 GiB per member, 4 GiB of media and
chart parts, 100,000 items and a 256 MiB manifest.
There is no `unsafe` and no panics, and it builds for `wasm32-unknown-unknown`.
+185
View File
@@ -0,0 +1,185 @@
//! A serde serializer adapter that writes non-finite floats as 0.
//!
//! serde_json writes NaN and ±infinity as `null`, which doesn't read back as a number: a single
//! NaN anywhere in the model (a rotation, a crop, a stroke width) made a saved file fail to open
//! as "damaged". [`Finite`] wraps any `Serialize` value and replaces those floats on the way out;
//! everything else passes through unchanged.
use serde::ser::{self, Serialize, Serializer};
/// `T`, serialized with non-finite floats written as 0.
pub struct Finite<'a, T: ?Sized>(pub &'a T);
impl<T: ?Sized + Serialize> Serialize for Finite<'_, T> {
fn serialize<S: Serializer>(&self, s: S) -> Result<S::Ok, S::Error> {
self.0.serialize(Wrap(s))
}
}
struct Wrap<S>(S);
macro_rules! pass {
($($m:ident($t:ty)),* $(,)?) => {
$(fn $m(self, v: $t) -> Result<S::Ok, S::Error> { self.0.$m(v) })*
};
}
impl<S: Serializer> Serializer for Wrap<S> {
type Ok = S::Ok;
type Error = S::Error;
type SerializeSeq = Wrap<S::SerializeSeq>;
type SerializeTuple = Wrap<S::SerializeTuple>;
type SerializeTupleStruct = Wrap<S::SerializeTupleStruct>;
type SerializeTupleVariant = Wrap<S::SerializeTupleVariant>;
type SerializeMap = Wrap<S::SerializeMap>;
type SerializeStruct = Wrap<S::SerializeStruct>;
type SerializeStructVariant = Wrap<S::SerializeStructVariant>;
pass!(
serialize_bool(bool),
serialize_i8(i8),
serialize_i16(i16),
serialize_i32(i32),
serialize_i64(i64),
serialize_i128(i128),
serialize_u8(u8),
serialize_u16(u16),
serialize_u32(u32),
serialize_u64(u64),
serialize_u128(u128),
serialize_char(char),
serialize_str(&str),
serialize_bytes(&[u8]),
);
fn serialize_f32(self, v: f32) -> Result<S::Ok, S::Error> {
self.0.serialize_f32(if v.is_finite() { v } else { 0.0 })
}
fn serialize_f64(self, v: f64) -> Result<S::Ok, S::Error> {
self.0.serialize_f64(if v.is_finite() { v } else { 0.0 })
}
fn serialize_none(self) -> Result<S::Ok, S::Error> {
self.0.serialize_none()
}
fn serialize_some<T: ?Sized + Serialize>(self, v: &T) -> Result<S::Ok, S::Error> {
self.0.serialize_some(&Finite(v))
}
fn serialize_unit(self) -> Result<S::Ok, S::Error> {
self.0.serialize_unit()
}
fn serialize_unit_struct(self, name: &'static str) -> Result<S::Ok, S::Error> {
self.0.serialize_unit_struct(name)
}
fn serialize_unit_variant(self, name: &'static str, i: u32, variant: &'static str) -> Result<S::Ok, S::Error> {
self.0.serialize_unit_variant(name, i, variant)
}
fn serialize_newtype_struct<T: ?Sized + Serialize>(self, name: &'static str, v: &T) -> Result<S::Ok, S::Error> {
self.0.serialize_newtype_struct(name, &Finite(v))
}
fn serialize_newtype_variant<T: ?Sized + Serialize>(self, name: &'static str, i: u32, variant: &'static str, v: &T) -> Result<S::Ok, S::Error> {
self.0.serialize_newtype_variant(name, i, variant, &Finite(v))
}
fn serialize_seq(self, len: Option<usize>) -> Result<Self::SerializeSeq, S::Error> {
self.0.serialize_seq(len).map(Wrap)
}
fn serialize_tuple(self, len: usize) -> Result<Self::SerializeTuple, S::Error> {
self.0.serialize_tuple(len).map(Wrap)
}
fn serialize_tuple_struct(self, name: &'static str, len: usize) -> Result<Self::SerializeTupleStruct, S::Error> {
self.0.serialize_tuple_struct(name, len).map(Wrap)
}
fn serialize_tuple_variant(self, name: &'static str, i: u32, variant: &'static str, len: usize) -> Result<Self::SerializeTupleVariant, S::Error> {
self.0.serialize_tuple_variant(name, i, variant, len).map(Wrap)
}
fn serialize_map(self, len: Option<usize>) -> Result<Self::SerializeMap, S::Error> {
self.0.serialize_map(len).map(Wrap)
}
fn serialize_struct(self, name: &'static str, len: usize) -> Result<Self::SerializeStruct, S::Error> {
self.0.serialize_struct(name, len).map(Wrap)
}
fn serialize_struct_variant(
self,
name: &'static str,
i: u32,
variant: &'static str,
len: usize,
) -> Result<Self::SerializeStructVariant, S::Error> {
self.0.serialize_struct_variant(name, i, variant, len).map(Wrap)
}
fn is_human_readable(&self) -> bool {
self.0.is_human_readable()
}
}
macro_rules! compound {
($tr:ident, $m:ident) => {
impl<S: ser::$tr> ser::$tr for Wrap<S> {
type Ok = S::Ok;
type Error = S::Error;
fn $m<T: ?Sized + Serialize>(&mut self, v: &T) -> Result<(), S::Error> {
self.0.$m(&Finite(v))
}
fn end(self) -> Result<S::Ok, S::Error> {
self.0.end()
}
}
};
}
compound!(SerializeSeq, serialize_element);
compound!(SerializeTuple, serialize_element);
compound!(SerializeTupleStruct, serialize_field);
compound!(SerializeTupleVariant, serialize_field);
impl<S: ser::SerializeMap> ser::SerializeMap for Wrap<S> {
type Ok = S::Ok;
type Error = S::Error;
fn serialize_key<T: ?Sized + Serialize>(&mut self, k: &T) -> Result<(), S::Error> {
self.0.serialize_key(&Finite(k))
}
fn serialize_value<T: ?Sized + Serialize>(&mut self, v: &T) -> Result<(), S::Error> {
self.0.serialize_value(&Finite(v))
}
fn end(self) -> Result<S::Ok, S::Error> {
self.0.end()
}
}
macro_rules! fields {
($tr:ident) => {
impl<S: ser::$tr> ser::$tr for Wrap<S> {
type Ok = S::Ok;
type Error = S::Error;
fn serialize_field<T: ?Sized + Serialize>(&mut self, key: &'static str, v: &T) -> Result<(), S::Error> {
self.0.serialize_field(key, &Finite(v))
}
fn skip_field(&mut self, key: &'static str) -> Result<(), S::Error> {
self.0.skip_field(key)
}
fn end(self) -> Result<S::Ok, S::Error> {
self.0.end()
}
}
};
}
fields!(SerializeStruct);
fields!(SerializeStructVariant);
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn non_finite_floats_are_written_as_zero_and_nothing_else_changes() {
#[derive(serde::Serialize)]
struct T {
a: f64,
b: Option<f64>,
c: Vec<(f32, f64)>,
d: Option<String>,
e: std::collections::BTreeMap<String, f64>,
}
let t = T { a: f64::NAN, b: Some(f64::INFINITY), c: vec![(f32::NEG_INFINITY, 1.5)], d: None, e: [("k".to_string(), f64::NAN)].into() };
let s = serde_json::to_string(&Finite(&t)).unwrap_or_default();
assert_eq!(s, r#"{"a":0.0,"b":0.0,"c":[[0.0,1.5]],"d":null,"e":{"k":0.0}}"#);
}
}
+226
View File
@@ -0,0 +1,226 @@
//! The native `.deckcraft` package: a ZIP holding a stored `mimetype`, `presentation.json` (the
//! manifest: format name, version, generator and the presentation, minus media bytes), and
//! `media/<id>` and `chart-parts/<index>` binary members. Readers ignore unknown fields, so newer
//! files open in older builds with what those builds understand.
//!
//! DeckCraft owns the presentation model and its mapping: which media and chart parts become
//! members, and how a loaded deck is repaired. This crate owns the bytes: the package identity,
//! the manifest envelope, the NaN-safe JSON writer, the reader that opens files with NaN saved as
//! `null`, member names and compression, and the bounded member reads and their budgets.
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
#![forbid(unsafe_code)]
mod finite;
mod manifest;
#[cfg(test)]
mod tests;
use std::io::{Cursor, Read};
pub use finite::Finite;
pub use manifest::parse_manifest;
pub const MIMETYPE: &str = "application/vnd.storyteller.deckcraft+zip";
/// Files written before the SlideCraft → DeckCraft rename (`.slidecraft`) are still read.
pub const LEGACY_MIMETYPE: &str = concat!("application/vnd.storyteller.", "slide", "craft+zip");
pub const EXTENSION: &str = "deckcraft";
/// The manifest's `format`.
pub const FORMAT: &str = "deckcraft";
/// Format version written into the manifest.
pub const VERSION: u32 = 1;
/// The stored member naming the package type.
pub const MIMETYPE_ENTRY: &str = "mimetype";
/// The manifest member.
pub const MANIFEST_ENTRY: &str = "presentation.json";
/// Largest entry we will inflate (guards against zip bombs).
pub const MAX_ENTRY: u64 = 2 << 30;
/// All embedded media and chart sidecars together, inflated (storytold/deckcraft#393).
pub const MAX_TOTAL_MEDIA: u64 = 4 << 30;
/// Media items and chart sidecar parts one file may list.
pub const MAX_MEDIA_ITEMS: usize = 100_000;
/// Largest `presentation.json` we will inflate. The manifest holds no media bytes, so it is far
/// smaller than a media entry may be; inflating and parsing one is what dominates memory.
pub const MAX_MANIFEST: u64 = 256 << 20;
const MEDIA_PREFIX: &str = "media/";
const CHART_PARTS_PREFIX: &str = "chart-parts/";
/// What one load may inflate.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub struct Budget {
/// Bytes all media and chart members may inflate to together.
pub total: u64,
/// Media items and chart parts the manifest may list.
pub items: usize,
/// Bytes `presentation.json` may inflate to.
pub manifest: u64,
}
impl Default for Budget {
fn default() -> Self {
Budget { total: MAX_TOTAL_MEDIA, items: MAX_MEDIA_ITEMS, manifest: MAX_MANIFEST }
}
}
impl Budget {
/// A media budget with the default manifest limit.
pub const fn media(total: u64, items: usize) -> Self {
Budget { total, items, manifest: MAX_MANIFEST }
}
}
#[derive(Debug, thiserror::Error)]
pub enum FormatError {
#[error("not a DeckCraft file: {0}")]
NotOurs(String),
#[error("damaged file: {0}")]
Damaged(String),
#[error("write failed: {0}")]
Write(String),
}
pub type Result<T> = std::result::Result<T, FormatError>;
/// `presentation.json`: the envelope around the app's presentation.
#[derive(serde::Serialize, serde::Deserialize)]
pub struct Manifest<T> {
pub format: String,
pub version: u32,
pub generator: String,
pub presentation: T,
}
/// The member holding media item `id`'s bytes.
pub fn media_entry(id: u32) -> String {
format!("{MEDIA_PREFIX}{id}")
}
/// The member holding the `index`th chart part a save separated out.
pub fn chart_part_entry(index: usize) -> String {
format!("{CHART_PARTS_PREFIX}{index}")
}
/// Whether `entry` is a name [`chart_part_entry`] gives, exactly: no other member, no path
/// tricks, no leading zeros.
pub fn is_chart_part_entry(entry: &str) -> bool {
entry.strip_prefix(CHART_PARTS_PREFIX).and_then(|s| s.parse::<usize>().ok()).is_some_and(|n| entry == chart_part_entry(n))
}
/// Whether a member of this content type is stored rather than deflated: it is compressed already.
pub fn is_compressed(content_type: &str) -> bool {
content_type.starts_with("image/jpeg")
|| content_type.starts_with("image/png")
|| content_type.starts_with("video/")
|| content_type.starts_with("audio/mpeg")
|| content_type.starts_with("audio/mp4")
|| content_type.contains("zip")
}
/// Does this look like a `.deckcraft` file?
pub fn sniff(bytes: &[u8]) -> bool {
bytes.starts_with(b"PK") && [MIMETYPE, LEGACY_MIMETYPE].iter().any(|m| bytes.windows(m.len()).take(200).any(|w| w == m.as_bytes()))
}
/// A binary member of a package being written.
#[derive(Clone, Copy, Debug)]
pub struct Member<'a> {
/// Its name, from [`media_entry`] or [`chart_part_entry`].
pub name: &'a str,
/// Its content type, which decides whether it is stored or deflated.
pub content_type: &'a str,
pub bytes: &'a [u8],
}
/// The package: `mimetype` (stored), the manifest naming `generator` around `presentation`
/// (deflated, with non-finite numbers written as 0), then `members` in order.
pub fn write<T: serde::Serialize>(presentation: &T, generator: &str, members: &[Member<'_>]) -> Result<Vec<u8>> {
use craft_zip::Compression::{Deflated, Stored};
let w = |e: craft_zip::Error| FormatError::Write(e.to_string());
let mut z = craft_zip::Writer::new();
z.add(MIMETYPE_ENTRY, MIMETYPE.as_bytes(), Stored).map_err(w)?;
let m = Manifest { format: FORMAT.to_string(), version: VERSION, generator: generator.to_string(), presentation };
let json = serde_json::to_vec(&Finite(&m)).map_err(|e| FormatError::Write(e.to_string()))?;
z.add(MANIFEST_ENTRY, &json, Deflated).map_err(w)?;
for member in members {
let compression = if is_compressed(member.content_type) { Stored } else { Deflated };
z.add(member.name, member.bytes, compression).map_err(w)?;
}
z.finish().map_err(w)
}
/// A package open for reading. Nothing is inflated until a member is read.
pub struct Package<'a> {
zip: zip::ZipArchive<Cursor<&'a [u8]>>,
}
impl<'a> Package<'a> {
/// Index `bytes` as a ZIP.
pub fn open(bytes: &'a [u8]) -> Result<Self> {
let zip = zip::ZipArchive::new(Cursor::new(bytes)).map_err(|e| FormatError::NotOurs(e.to_string()))?;
Ok(Package { zip })
}
/// Open `bytes` and read its manifest, inflating at most `max_manifest` bytes of it. Missing
/// `presentation.json` or a different `format` is [`FormatError::NotOurs`].
pub fn open_manifest<T: serde::de::DeserializeOwned>(bytes: &'a [u8], max_manifest: u64) -> Result<(Manifest<T>, Self)> {
let mut package = Package::open(bytes)?;
if !package.contains(MANIFEST_ENTRY) {
return Err(FormatError::NotOurs(format!("no {MANIFEST_ENTRY}")));
}
let json = package.read_max(MANIFEST_ENTRY, max_manifest)?;
let m: Manifest<T> = parse_manifest(&json)?;
if m.format != FORMAT {
return Err(FormatError::NotOurs(m.format));
}
Ok((m, package))
}
/// Whether the package has a member named `name`.
pub fn contains(&self, name: &str) -> bool {
self.zip.index_for_name(name).is_some()
}
/// The size `name` declares, inflated; `None` when there is no such readable member.
pub fn declared_size(&mut self, name: &str) -> Option<u64> {
self.zip.by_name(name).ok().map(|f| f.size())
}
/// Read one member within [`MAX_ENTRY`].
pub fn read(&mut self, name: &str) -> Result<Vec<u8>> {
self.read_max(name, MAX_ENTRY)
}
/// Read one member, refusing it before inflating if it declares more than `max` bytes, and
/// stopping at `max` if it inflates further than it declared.
pub fn read_max(&mut self, name: &str, max: u64) -> Result<Vec<u8>> {
self.read_counted(name, max, &mut 0)
}
/// [`Package::read_max`] within `left` (and [`MAX_ENTRY`]), charging `left` for every byte
/// inflated, including those inflated before a decode or CRC error, so a member that fails
/// late still spends the shared budget it used.
pub fn read_charged(&mut self, name: &str, left: &mut u64) -> Result<Vec<u8>> {
let mut spent = 0;
let out = self.read_counted(name, (*left).min(MAX_ENTRY), &mut spent);
*left = left.saturating_sub(spent);
out
}
/// [`Package::read_max`], adding the bytes inflated to `spent` whether or not the read succeeds.
fn read_counted(&mut self, name: &str, max: u64, spent: &mut u64) -> Result<Vec<u8>> {
let f = self.zip.by_name(name).map_err(|e| FormatError::Damaged(format!("{name}: {e}")))?;
if f.size() > max {
return Err(FormatError::Damaged(format!("{name} is too large")));
}
let mut out = Vec::with_capacity(usize::try_from(f.size().min(64 << 20)).unwrap_or(0));
let mut f = f.take(max.saturating_add(1));
let read = f.read_to_end(&mut out);
*spent = spent.saturating_add(out.len() as u64);
read.map_err(|e| FormatError::Damaged(format!("{name}: {e}")))?;
if out.len() as u64 > max {
return Err(FormatError::Damaged(format!("{name} is too large")));
}
Ok(out)
}
}
+99
View File
@@ -0,0 +1,99 @@
//! Reading `presentation.json`, including files written with NaN or infinity saved as `null`.
use serde::de::DeserializeOwned;
use crate::{FormatError, Manifest, Result};
/// Most `null`s standing in for numbers that [`parse_manifest`] patches in one file, and the
/// candidates it tries for each.
const MAX_NULL_FIXES: usize = 256;
const MAX_TRIES_PER_FIX: usize = 32;
/// Bytes [`parse_manifest`] may re-parse in all while patching, so a hostile file full of `null`s
/// can't keep it busy: past this the file is reported damaged.
const MAX_REPARSE_BYTES: usize = 256 * 1024 * 1024;
/// Where a parse failed, comparable: later is progress.
fn failure<T: DeserializeOwned>(src: &[u8]) -> std::result::Result<Manifest<T>, (String, (usize, usize))> {
serde_json::from_slice::<Manifest<T>>(src).map_err(|e| (e.to_string(), (e.line(), e.column())))
}
/// Parse `presentation.json`. serde_json writes a NaN or infinite number as `null`, which then
/// fails to read back as a number ("invalid type: null, expected f64"), so DeckCraft could save
/// a file it couldn't open. Each such `null` is read as 0 instead (the app then brings the
/// value into range); anything else that doesn't parse is damage.
///
/// serde reports the failing `null` exactly, except inside tagged enums (buffered), where it
/// reports the end of the enclosing object: there the `null`s before that point are tried
/// nearest first, and a patch is kept only if the parse then gets further. (Files saved since
/// [`crate::Finite`] never contain such `null`s; this reads older ones.)
pub fn parse_manifest<T: DeserializeOwned>(json: &[u8]) -> Result<Manifest<T>> {
// Parse the inflated text as it is: only a file that fails on a `null` number is copied for
// patching (the copy is bounded by `MAX_MANIFEST`).
let mut last = match failure(json) {
Ok(m) => return Ok(m),
Err(f) => f,
};
if !is_null_number(&last.0) {
return Err(FormatError::Damaged(last.0));
}
let mut src = json.to_vec();
let mut budget = MAX_REPARSE_BYTES;
'fixes: for _ in 0..MAX_NULL_FIXES {
let (msg, pos) = &last;
if !is_null_number(msg) {
break;
}
let end = offset(&src, pos.0, pos.1).unwrap_or(src.len());
let mut progressed = false;
let candidates: Vec<usize> = value_nulls_before(&src, end + 4).take(MAX_TRIES_PER_FIX).collect();
for at in candidates {
let (Some(head), Some(tail)) = (src.get(..at), src.get(at.saturating_add(4)..)) else { continue };
let Some(left) = budget.checked_sub(src.len()) else { break 'fixes };
budget = left;
let mut next = Vec::with_capacity(src.len());
next.extend_from_slice(head);
next.push(b'0');
next.extend_from_slice(tail);
match failure(&next) {
Ok(m) => return Ok(m),
// The patch shortened the text by 3 bytes before the error: compare positions
// allowing for that.
Err(f) if f.1 > (pos.0, pos.1.saturating_sub(3)) => {
src = next;
last = f;
progressed = true;
break;
}
Err(_) => {}
}
}
if !progressed {
break;
}
}
Err(FormatError::Damaged(last.0))
}
/// Is this parse error a `null` where a number belongs (a NaN or infinity serde_json wrote)?
fn is_null_number(msg: &str) -> bool {
msg.starts_with("invalid type: null, expected f") || msg.starts_with("invalid type: null, expected a number")
}
/// Byte offset of a 1-based `line`:`column`.
fn offset(src: &[u8], line: usize, column: usize) -> Option<usize> {
let mut start = 0;
for _ in 1..line {
start += src.get(start..)?.iter().position(|b| *b == b'\n')? + 1;
}
Some((start + column).min(src.len()))
}
/// Starts of `null` tokens in value position (after `:`, `[` or `,`) before `end`, nearest first.
fn value_nulls_before(src: &[u8], end: usize) -> impl Iterator<Item = usize> + '_ {
let end = end.min(src.len());
(0..end.saturating_sub(3)).rev().filter(move |&i| {
src.get(i..i + 4) == Some(b"null")
&& src[..i].iter().rev().find(|b| !b.is_ascii_whitespace()).is_some_and(|b| matches!(b, b':' | b'[' | b','))
&& src.get(i + 4).is_none_or(|b| !b.is_ascii_alphanumeric())
})
}
+235
View File
@@ -0,0 +1,235 @@
#![allow(clippy::unwrap_used, clippy::expect_used, clippy::panic)]
use serde::{Deserialize, Serialize};
use super::*;
/// A stand-in for an app's presentation: plain numbers, an optional number and a tagged enum
/// (whose `null`s serde reports only at the end of the enclosing object).
#[derive(Debug, Default, PartialEq, Serialize, Deserialize)]
struct Deck {
#[serde(default)]
width: f64,
#[serde(default)]
zoom: Option<f64>,
#[serde(default)]
shapes: Vec<Shape>,
}
#[derive(Debug, PartialEq, Serialize, Deserialize)]
#[serde(tag = "kind")]
enum Shape {
Box { x: f64, y: f64 },
Line { len: f64 },
}
fn package(members: &[Member<'_>]) -> Vec<u8> {
write(&Deck { width: 960.0, ..Default::default() }, "Test 1", members).unwrap()
}
#[test]
fn a_package_holds_mimetype_then_manifest_then_members_in_order() {
let png = [0x89, b'P', b'N', b'G'];
let svg = b"<svg/>".repeat(20);
let bytes = package(&[
Member { name: &media_entry(7), content_type: "image/png", bytes: &png },
Member { name: &media_entry(8), content_type: "image/svg+xml", bytes: &svg },
Member { name: &chart_part_entry(0), content_type: "application/zip", bytes: b"PK" },
]);
assert!(sniff(&bytes));
let mut z = zip::ZipArchive::new(std::io::Cursor::new(bytes.as_slice())).unwrap();
assert_eq!(z.len(), 5);
let methods: Vec<_> = (0..z.len())
.map(|i| {
let f = z.by_index(i).unwrap();
(f.name().unwrap().into_owned(), f.compression())
})
.collect();
use zip::CompressionMethod::{Deflated, Stored};
assert_eq!(
methods,
[("mimetype", Stored), ("presentation.json", Deflated), ("media/7", Stored), ("media/8", Deflated), ("chart-parts/0", Stored)]
.map(|(n, m)| (n.to_string(), m))
);
// The mimetype is the first, stored member, readable in place.
assert_eq!(craft_zip::stored_mimetype(&bytes), Some(MIMETYPE.as_bytes()));
let (m, mut p) = Package::open_manifest::<Deck>(&bytes, MAX_MANIFEST).unwrap();
assert_eq!((m.format.as_str(), m.version, m.generator.as_str(), m.presentation.width), (FORMAT, VERSION, "Test 1", 960.0));
assert_eq!(p.read(&media_entry(8)).unwrap(), svg);
assert_eq!(p.declared_size(&media_entry(7)), Some(4));
assert_eq!(p.declared_size("media/99"), None);
}
#[test]
fn the_manifest_is_compact_json_with_its_fields_in_order() {
let bytes = package(&[]);
let mut p = Package::open(&bytes).unwrap();
let json = String::from_utf8(p.read(MANIFEST_ENTRY).unwrap()).unwrap();
assert_eq!(json, r#"{"format":"deckcraft","version":1,"generator":"Test 1","presentation":{"width":960.0,"zoom":null,"shapes":[]}}"#);
}
#[test]
fn non_finite_numbers_are_written_as_zero_and_read_back() {
let deck = Deck { width: f64::NAN, zoom: Some(f64::INFINITY), shapes: vec![Shape::Box { x: f64::NEG_INFINITY, y: 2.0 }] };
let bytes = write(&deck, "t", &[]).unwrap();
let (m, _) = Package::open_manifest::<Deck>(&bytes, MAX_MANIFEST).unwrap();
assert_eq!(m.presentation, Deck { width: 0.0, zoom: Some(0.0), shapes: vec![Shape::Box { x: 0.0, y: 2.0 }] });
}
/// Files written before [`Finite`] (plain serde_json: NaN as `null`) open too, including a
/// `null` inside a tagged enum, where serde reports only the enclosing object.
#[test]
fn older_manifests_with_null_numbers_parse() {
let cases: [(&str, Deck); 3] = [
(r#"{"format":"deckcraft","version":1,"generator":"old","presentation":{"width":null}}"#, Deck::default()),
(
r#"{"format":"deckcraft","version":1,"generator":"old","presentation":{"width":3,"shapes":[{"kind":"Box","x":null,"y":4}]}}"#,
Deck { width: 3.0, shapes: vec![Shape::Box { x: 0.0, y: 4.0 }], ..Default::default() },
),
(
"{\n \"format\": \"deckcraft\",\n \"version\": 1,\n \"generator\": \"t\",\n \"presentation\": {\"shapes\": [{\"kind\": \"Line\", \"len\": null}]}\n}",
Deck { shapes: vec![Shape::Line { len: 0.0 }], ..Default::default() },
),
];
for (json, want) in cases {
let m = parse_manifest::<Deck>(json.as_bytes()).unwrap_or_else(|e| panic!("{json}: {e}"));
assert_eq!(m.presentation, want, "{json}");
}
}
/// Only `null`s where numbers belong are patched: other damage still fails.
#[test]
fn other_manifest_damage_is_still_reported() {
let ok = br#"{"format": "deckcraft", "version": 1, "generator": "t", "presentation": {}}"#;
assert!(parse_manifest::<Deck>(ok).is_ok());
let bad = br#"{"format": null, "version": 1, "generator": "t", "presentation": {}}"#;
assert!(matches!(parse_manifest::<Deck>(bad), Err(FormatError::Damaged(_))));
assert!(parse_manifest::<Deck>(&ok[..ok.len() - 3]).is_err());
}
#[test]
fn a_manifest_full_of_nulls_is_refused_within_bounds() {
let shapes = (0..2000).map(|_| r#"{"kind":"Box","x":1,"y":"not a number"}"#).collect::<Vec<_>>().join(",");
let json = format!(r#"{{"format":"deckcraft","version":1,"generator":"t","presentation":{{"width":null,"shapes":[{shapes}]}}}}"#);
assert!(matches!(parse_manifest::<Deck>(json.as_bytes()), Err(FormatError::Damaged(_))));
}
#[test]
fn what_is_not_a_package_is_not_ours() {
for bytes in [&b""[..], b"PK\x03\x04garbage", &[0u8; 1000]] {
assert!(matches!(Package::open_manifest::<Deck>(bytes, MAX_MANIFEST), Err(FormatError::NotOurs(_))));
}
// A ZIP without the manifest, and one from another app.
let mut z = craft_zip::Writer::new();
z.add("mimetype", b"application/zip", craft_zip::Compression::Stored).unwrap();
let no_manifest = z.finish().unwrap();
let err = Package::open_manifest::<Deck>(&no_manifest, MAX_MANIFEST).err().unwrap();
assert_eq!(err.to_string(), "not a DeckCraft file: no presentation.json");
let mut z = craft_zip::Writer::new();
z.add(MANIFEST_ENTRY, br#"{"format":"other","version":1,"generator":"x","presentation":{}}"#, craft_zip::Compression::Deflated).unwrap();
let other = z.finish().unwrap();
let err = Package::open_manifest::<Deck>(&other, MAX_MANIFEST).err().unwrap();
assert_eq!(err.to_string(), "not a DeckCraft file: other");
// A truncated package is an error, not a panic.
let mut b = package(&[]);
b.truncate(b.len() / 2);
assert!(Package::open_manifest::<Deck>(&b, MAX_MANIFEST).is_err());
}
#[test]
fn legacy_slidecraft_packages_are_recognised() {
let mut z = craft_zip::Writer::new();
z.add(MIMETYPE_ENTRY, LEGACY_MIMETYPE.as_bytes(), craft_zip::Compression::Stored).unwrap();
assert!(sniff(&z.finish().unwrap()));
assert!(!sniff(b"PK\x03\x04 application/zip"));
assert!(!sniff(MIMETYPE.as_bytes()));
}
#[test]
fn an_oversized_manifest_is_refused_before_inflating() {
let bytes = package(&[]);
let size = Package::open(&bytes).unwrap().declared_size(MANIFEST_ENTRY).unwrap();
assert!(Package::open_manifest::<Deck>(&bytes, size).is_ok());
let err = Package::open_manifest::<Deck>(&bytes, size - 1).err().unwrap();
assert_eq!(err.to_string(), "damaged file: presentation.json is too large");
}
#[test]
fn a_member_that_inflates_past_its_declared_size_stops_at_the_limit() {
// Declared sizes are the file's word: a stored member whose header lies is still capped.
let data = vec![7u8; 100];
let bytes = package(&[Member { name: &media_entry(1), content_type: "image/png", bytes: &data }]);
let mut p = Package::open(&bytes).unwrap();
assert_eq!(p.read_max(&media_entry(1), 100).unwrap().len(), 100);
assert!(p.read_max(&media_entry(1), 99).is_err());
let err = p.read("media/2").unwrap_err();
assert!(matches!(err, FormatError::Damaged(ref m) if m.starts_with("media/2: ")), "{err}");
}
#[test]
fn corrupt_members_are_charged_for_what_they_inflated() {
let a = b"PICTURE-AAAAAAAAAAAA";
let b = b"PICTURE-BBBBBBBBBBBB";
let mut bytes = package(&[
Member { name: &media_entry(1), content_type: "image/png", bytes: a },
Member { name: &media_entry(2), content_type: "image/png", bytes: b },
]);
// Corrupt both stored members, so each fails its CRC only after inflating all its bytes.
for tag in [b"PICTURE-AAAA", b"PICTURE-BBBB"] {
let at = bytes.windows(tag.len()).position(|w| w == tag).unwrap();
bytes[at] ^= 0xff;
}
let mut p = Package::open(&bytes).unwrap();
let mut left = 30;
assert!(p.read_charged(&media_entry(1), &mut left).is_err());
assert_eq!(left, 10, "a failed read still spends what it inflated");
// The second fits a fresh budget on its own, but not what is left: refused before inflating.
let err = p.read_charged(&media_entry(2), &mut left).unwrap_err();
assert_eq!(err.to_string(), "damaged file: media/2 is too large");
assert_eq!(left, 10);
}
#[test]
fn chart_part_names_are_exact() {
assert_eq!(chart_part_entry(3), "chart-parts/3");
assert!(is_chart_part_entry("chart-parts/0"));
assert!(is_chart_part_entry("chart-parts/12"));
for not in ["media/1", "chart-parts/../0", "chart-parts/00", "chart-parts/-1", "chart-parts/", "chart-parts/+1", "chart-parts/1 "] {
assert!(!is_chart_part_entry(not), "{not}");
}
}
#[test]
fn compressed_content_types_are_stored() {
for stored in [
"image/jpeg",
"image/png",
"video/mp4",
"audio/mpeg",
"audio/mp4",
"application/zip",
"application/vnd.openxmlformats-officedocument.spreadsheetml.sheet+zip",
] {
assert!(is_compressed(stored), "{stored}");
}
for deflated in ["image/svg+xml", "image/gif", "audio/wav", "application/octet-stream", "text/plain"] {
assert!(!is_compressed(deflated), "{deflated}");
}
}
#[test]
fn duplicate_members_are_a_write_error() {
let err = write(
&Deck::default(),
"t",
&[Member { name: "media/1", content_type: "x", bytes: b"a" }, Member { name: "media/1", content_type: "x", bytes: b"b" }],
)
.unwrap_err();
assert!(matches!(err, FormatError::Write(_)), "{err}");
}
#[test]
fn the_default_budget_is_the_formats_limits() {
assert_eq!(Budget::default(), Budget { total: 4 << 30, items: 100_000, manifest: 256 << 20 });
assert_eq!(Budget::media(10, 2), Budget { total: 10, items: 2, manifest: MAX_MANIFEST });
}
+55 -24
View File
@@ -62,6 +62,10 @@ impl Limits {
/// A byte count in megabytes for messages ("9.9 MB", "1024 MB").
#[cfg_attr(no_dwg_bridge, allow(dead_code))]
#[expect(
clippy::cast_precision_loss,
reason = "Megabyte formatting is rounded for display; exact integer precision beyond 2^53 bytes is not meaningful."
)]
fn mb(n: u64) -> String {
let m = n as f64 / f64::from(1u32 << 20);
if m >= 100.0 { format!("{m:.0} MB") } else { format!("{m:.1} MB") }
@@ -79,12 +83,17 @@ mod proxy_transport;
#[cfg(not(no_dwg_bridge))]
mod native {
use std::fmt::Write as _;
use std::io::{Cursor, Write};
use std::panic::AssertUnwindSafe;
use super::{Limits, mb};
/// Read DWG bytes and return an ASCII DXF rendition, within [`Limits::DEFAULT`].
///
/// # Errors
///
/// Returns an error when the DWG cannot be read or post-processed, or its DXF rendition exceeds the default limits.
pub fn dwg_to_dxf(bytes: &[u8]) -> Result<Vec<u8>, String> {
dwg_to_dxf_with(bytes, Limits::DEFAULT)
}
@@ -92,6 +101,10 @@ mod native {
/// [`dwg_to_dxf`] with explicit limits. Both are checked before the expensive step they
/// guard: the input size before the DWG reader runs, the DXF size while it is written, so a
/// runaway conversion stops at the limit instead of filling memory first.
///
/// # Errors
///
/// Returns an error when the input exceeds `limits`, decoding fails, or the DXF output exceeds `limits`.
pub fn dwg_to_dxf_with(bytes: &[u8], limits: Limits) -> Result<Vec<u8>, String> {
dwg_to_dxf_noted(bytes, limits).map(|(dxf, _)| dxf)
}
@@ -100,6 +113,10 @@ mod native {
/// failsafe mode: an object record it can't decode is skipped instead of failing the whole
/// file, and the notes say how many were skipped and of which types, so a partial read never
/// passes for a complete one.
///
/// # Errors
///
/// Returns an error when the input exceeds `limits`, decoding fails, or the DXF output exceeds `limits`.
pub fn dwg_to_dxf_noted(bytes: &[u8], limits: Limits) -> Result<(Vec<u8>, Vec<String>), String> {
if bytes.len() > limits.max_dwg_bytes {
return Err(format!(
@@ -122,13 +139,13 @@ mod native {
let mut notes = read_notes(&outcome.stats);
let mut doc = outcome.document;
notes.extend(
guarded(AssertUnwindSafe(|| application_objects(&mut doc))).map_err(|_| "the DWG application object conversion failed".to_string())?,
guarded(AssertUnwindSafe(|| application_objects(&mut doc))).map_err(|()| "the DWG application object conversion failed".to_string())?,
);
// After application_objects, so the proxy objects it makes are numbered as the DXF's.
notes.extend(
guarded(AssertUnwindSafe(|| super::proxy_transport::prepare(&mut doc))).map_err(|_| "the DWG proxy conversion failed".to_string())?,
guarded(AssertUnwindSafe(|| super::proxy_transport::prepare(&mut doc))).map_err(|()| "the DWG proxy conversion failed".to_string())?,
);
let orphans = guarded(AssertUnwindSafe(|| post_process(&mut doc))).map_err(|_| "the DWG post-processing failed on this file".to_string())?;
let orphans = guarded(AssertUnwindSafe(|| post_process(&mut doc))).map_err(|()| "the DWG post-processing failed on this file".to_string())?;
if orphans > 0 {
let (s, were) = if orphans == 1 { ("", "was") } else { ("s", "were") };
notes.push(format!("DWG: {orphans} DGN line style component{s} that no line style definition uses {were} left out"));
@@ -632,7 +649,7 @@ mod native {
// A real table has at most one merge per cell; more ranges than that come from a
// damaged file and would only make this rows × cols × ranges.
let max_ranges = rows.saturating_mul(cols).min(1 << 16);
for r in t.merged_ranges.iter().take(max_ranges).cloned().collect::<Vec<_>>() {
for r in t.merged_ranges.iter().take(max_ranges).copied().collect::<Vec<_>>() {
// Clamp to the table: the ranges come from the file.
let (bottom, right) = (r.bottom_row.min(rows.saturating_sub(1)), r.right_col.min(cols.saturating_sub(1)));
if r.top_row > bottom || r.left_col > right || rows == 0 || cols == 0 || (r.top_row, r.left_col) == (bottom, right) {
@@ -715,8 +732,8 @@ mod native {
}
/// Leave out DGN line style components (`LS*COMPONENT`) that no line style definition uses
/// (#1482). A drawing that once came from MicroStation can carry hundreds of thousands of
/// them, orphaned copies piled up by earlier DGN imports and copy-pastes (AutoCAD's PURGE
/// (#1482). A drawing that once came from `MicroStation` can carry hundreds of thousands of
/// them, orphaned copies piled up by earlier DGN imports and copy-pastes (`AutoCAD`'s PURGE
/// removes them as orphaned data): in a real 83 MB site plan they were 888,483 of 889,053
/// components and made its DXF rendition 1.2 GB, over [`Limits::DEFAULT`], so the file
/// didn't open at all. No definition that was read refers to them (a definition the reader
@@ -846,7 +863,7 @@ mod native {
for (name, code, value) in unwritten_header_vars(h) {
let written = section.windows(name.len() + 2).any(|w| w.starts_with(name.as_bytes()) && w.ends_with(b"\r\n"));
if !written && value.parse::<f64>().is_ok_and(f64::is_finite) {
add.push_str(&format!(" 9\r\n{name}\r\n{code:>3}\r\n{value}\r\n"));
let _ = write!(add, " 9\r\n{name}\r\n{code:>3}\r\n{value}\r\n");
}
}
dxf.splice(end..end, add.into_bytes());
@@ -878,14 +895,22 @@ mod native {
/// Oldest DWG version written; older DXF input is written as this version.
const MIN_DWG_VERSION: acadrust::DxfVersion = acadrust::DxfVersion::AC1018;
/// Convert DXF bytes into a DWG file of the DXF's version, and at least AutoCAD 2004
/// Convert DXF bytes into a DWG file of the DXF's version, and at least `AutoCAD` 2004
/// (AC1018).
///
/// # Errors
///
/// Returns an error when the DXF cannot be decoded or the DWG cannot be written, including oversized input.
pub fn dxf_to_dwg(dxf: &[u8]) -> Result<Vec<u8>, String> {
convert(dxf, None, None).map(|(dwg, _)| dwg)
}
/// Convert DXF bytes into a DWG file of `version`, a code from [`super::VERSIONS`] ("AC1032"),
/// whatever version the DXF declares.
///
/// # Errors
///
/// Returns an error for an unsupported version, invalid DXF, oversized input, or a DWG write failure.
pub fn dxf_to_dwg_as(dxf: &[u8], version: &str) -> Result<Vec<u8>, String> {
dxf_to_dwg_noted(dxf, version).map(|(dwg, _)| dwg)
}
@@ -1011,7 +1036,7 @@ mod native {
/// The current dimension style (`$DIMSTYLE`) by its name: the DXF gives the name, and the
/// handle read with it needn't be the style's in the document, in which case the DWG writer
/// fell back to Standard and AutoCAD opened the drawing with Standard current (#1051).
/// fell back to Standard and `AutoCAD` opened the drawing with Standard current (#1051).
fn current_dimstyle(doc: &mut acadrust::CadDocument) {
let name = doc.header.current_dimstyle_name.clone();
if let Some(h) = doc.dim_styles.iter().find(|ds| ds.name.eq_ignore_ascii_case(&name)).map(|ds| ds.handle) {
@@ -1021,7 +1046,7 @@ mod native {
/// The current text style (`$TEXTSTYLE`) by its name, the same way as [`current_dimstyle`]:
/// the handle read with the DXF needn't be the style's in the document, in which case the DWG
/// writer fell back to Standard and AutoCAD opened the drawing with Standard current (#1650).
/// writer fell back to Standard and `AutoCAD` opened the drawing with Standard current (#1650).
fn current_text_style(doc: &mut acadrust::CadDocument) {
let name = doc.header.current_text_style_name.clone();
if let Some(h) = doc.text_styles.iter().find(|ts| ts.name.eq_ignore_ascii_case(&name)).map(|ts| ts.handle) {
@@ -1211,7 +1236,7 @@ mod native {
};
let (classes, source) = guarded(AssertUnwindSafe(|| (dxf_class_names(&data), super::proxy_transport::source_classes(&data))))
.map_err(|_| "the DXF proxy class conversion failed".to_string())?;
let mut doc = std::panic::catch_unwind(move || acadrust::DxfReader::from_reader(Cursor::new(data)).and_then(|r| r.read()))
let mut doc = std::panic::catch_unwind(move || acadrust::DxfReader::from_reader(Cursor::new(data)).and_then(acadrust::DxfReader::read))
.map_err(|_| "the DXF→DWG conversion failed".to_string())?
.map_err(|e| format!("DXF: {e}"))?;
match version {
@@ -1250,14 +1275,14 @@ mod native {
current_layer(&mut doc);
unwritten
}))
.map_err(|_| "the DXF to DWG conversion failed on this file".to_string())?;
.map_err(|()| "the DXF to DWG conversion failed on this file".to_string())?;
let dwg = std::panic::catch_unwind(AssertUnwindSafe(|| acadrust::DwgWriter::write_to_vec(&doc)))
.map_err(|_| "the DWG writer failed on this drawing".to_string())?
.map_err(|e| format!("DWG write: {e}"))?;
Ok((dwg, unwritten))
}
/// AutoCAD's entry name for the drawing variables dictionary (the DXF Reference calls it the
/// `AutoCAD`'s entry name for the drawing variables dictionary (the DXF Reference calls it the
/// ACDBVARIABLEDICTIONARY; dictionary keys are case-insensitive).
const VARIABLE_DICTIONARY: &str = "AcDbVariableDictionary";
@@ -1273,11 +1298,11 @@ mod native {
if valid.contains(&value) { value.to_string() } else { default.to_string() }
}
/// Add the drawing variables dictionary AutoCAD always writes into the named object
/// Add the drawing variables dictionary `AutoCAD` always writes into the named object
/// dictionary, with the variables it keeps there, when the drawing has none (#1813).
/// Vectric Aspire 10.5 reads a 2004 (AC1018) DWG without it as empty ("No data was imported
/// from the DXF / DWG file"), though it reads the same drawing as DXF — which has no such
/// dictionary either, as CADCraft's and ezdxf's writers don't make one. AutoCAD's AC1032 DWGs
/// dictionary either, as CADCraft's and ezdxf's writers don't make one. `AutoCAD`'s AC1032 DWGs
/// read there without it, so newer output is left as it was, and a dictionary the drawing
/// does have keeps its own entries and values.
fn add_variable_dictionary(doc: &mut acadrust::CadDocument) {
@@ -1326,7 +1351,7 @@ mod native {
/// Entities of a layout other than the one in `*Paper_Space` are written owned by their block
/// (entity mode 0, with its handle). acadrust writes every paper-space entity with mode 1,
/// "paper space", which AutoCAD reads as the `*Paper_Space` block's: everything drawn on a
/// "paper space", which `AutoCAD` reads as the `*Paper_Space` block's: everything drawn on a
/// second layout landed on the first one, and the second stayed empty (#1057).
fn other_layout_owners(doc: &mut acadrust::CadDocument) {
let others: std::collections::HashSet<acadrust::Handle> = doc
@@ -1549,11 +1574,11 @@ thread_local! {
/// Panics when a test asked for `stage` to fail (see [`PANIC_IN`]); does nothing otherwise.
#[cfg(not(no_dwg_bridge))]
#[allow(clippy::panic)]
fn fail_in_test(_stage: &str) {
fn fail_in_test(stage: &str) {
#[cfg(not(test))]
let _ = stage;
#[cfg(test)]
if PANIC_IN.with(|p| p.get()) == Some(_stage) {
panic!("test-forced panic in {_stage}");
}
assert!(PANIC_IN.with(std::cell::Cell::get) != Some(stage), "test-forced panic in {stage}");
}
/// The error for a DWG version this writer can't create.
@@ -1633,6 +1658,8 @@ pub fn dxf_to_dwg_kept_noted(_dxf: &[u8], _version: &str, _kept: &str) -> Result
#[cfg(test)]
mod tests {
use std::fmt::Write as _;
use super::*;
/// The DXF of an empty drawing, enough for the bridge to make a small DWG.
@@ -1726,9 +1753,9 @@ mod tests {
let mut s = String::from(" 0\nSECTION\n 2\nHEADER\n 9\n$ACADVER\n 1\nAC1032\n 0\nENDSEC\n 0\nSECTION\n 2\nENTITIES\n");
for (text, flags, sub, pts) in dims {
s += " 0\nDIMENSION\n 8\n0\n100\nAcDbEntity\n100\nAcDbDimension\n 10\n0\n 20\n0\n 30\n0\n";
s += &format!(" 11\n50\n 21\n-20\n 31\n0\n 70\n{flags}\n 1\n{text}\n 3\nStandard\n100\n{sub}\n");
for (code, [x, y]) in pts.iter() {
s += &format!("{code:>3}\n{x}\n{:>3}\n{y}\n{:>3}\n0\n", code + 10, code + 20);
let _ = write!(s, " 11\n50\n 21\n-20\n 31\n0\n 70\n{flags}\n 1\n{text}\n 3\nStandard\n100\n{sub}\n");
for (code, [x, y]) in *pts {
let _ = write!(s, "{code:>3}\n{x}\n{:>3}\n{y}\n{:>3}\n0\n", code + 10, code + 20);
}
}
s + " 0\nENDSEC\n 0\nEOF\n"
@@ -1797,13 +1824,17 @@ mod tests {
.collect()
}
/// Issue #1482: a DWG that once came from MicroStation can carry hundreds of thousands of DGN
/// Issue #1482: a DWG that once came from `MicroStation` can carry hundreds of thousands of DGN
/// line style components no definition uses (a real 83 MB site plan: 888,483 of 889,053, a
/// 1.2 GB DXF rendition over the limit, so it didn't open). They're left out with a note, and
/// their dictionary entries with them; the definition and every component it reaches —
/// through compound and point components, around a cycle — are kept.
#[cfg(not(no_dwg_bridge))]
#[test]
#[expect(
clippy::too_many_lines,
reason = "This integration test builds and verifies one complete DGN component graph; splitting the fixture would obscure reachability."
)]
fn orphaned_dgn_line_style_components_are_left_out() {
use acadrust::objects::*;
let mut doc = acadrust::CadDocument::new();
+3 -2
View File
@@ -199,8 +199,9 @@ pub use codepage::decode_code_page;
/// # Errors
///
/// Returns an error for empty input, an invalid group code, an incomplete group-code/value pair,
/// truncated binary data, or more than [`MAX_TAGS`] group codes. For ASCII input, invalid numeric
/// text becomes `0.0` for real values or `0` for integer values, and an EOF tag is not required.
/// truncated binary data, or more group codes than the limit returned by [`max_tags()`], which is
/// [`MAX_TAGS`] by default. For ASCII input, invalid numeric text becomes `0.0` for real values or
/// `0` for integer values, and an EOF tag is not required.
pub fn parse(bytes: &[u8]) -> Result<Vec<Tag>> {
parse_with_limit(bytes, max_tags())
}
+2
View File
@@ -18,6 +18,8 @@
//! - [`stream`]: one flat scan-line part read block by block, for pictures larger than memory.
//! - [`cryptomatte_samples`]: a file's Cryptomatte layers and their per-pixel (ID, coverage) ranks.
/// Scanline OpenEXR writer using a caller-supplied linearization table.
pub mod rgba8;
/// RFC 1950/1951 compressor for ZIP-compressed EXR chunks.
pub mod zlib;
+235
View File
@@ -0,0 +1,235 @@
//! Single-part scanline OpenEXR output from RGBA8 pixels.
/// Scanline chunk compression.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum Compression {
/// Uncompressed.
None,
/// OpenEXR RLE.
Rle,
/// zlib per scanline.
Zips,
/// zlib per 16 scanlines.
Zip,
}
impl Compression {
fn code(self) -> u8 {
match self {
Self::None => 0,
Self::Rle => 1,
Self::Zips => 2,
Self::Zip => 3,
}
}
fn lines(self) -> usize {
if self == Self::Zip { 16 } else { 1 }
}
}
/// Why a frame cannot be encoded.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum Error {
/// Empty, overflowing or mismatched RGBA dimensions.
FrameSize,
/// Dimensions exceed the OpenEXR signed-size fields.
TooLarge,
}
fn checked_len(rgba: &[u8], w: u32, h: u32) -> Result<usize, Error> {
let n = (w as usize).checked_mul(h as usize).and_then(|n| n.checked_mul(4)).ok_or(Error::FrameSize)?;
if w == 0 || h == 0 || rgba.len() != n {
return Err(Error::FrameSize);
}
Ok(n)
}
/// IEEE 754 binary16 bits of `v`, rounded to nearest even (overflow → infinity, NaN → quiet NaN).
pub fn half(v: f32) -> u16 {
let b = v.to_bits();
let sign = ((b >> 16) & 0x8000) as u16;
let exp = ((b >> 23) & 0xFF) as i32;
let man = b & 0x7F_FFFF;
if exp == 0xFF {
return sign | 0x7C00 | if man != 0 { 0x200 } else { 0 };
}
// rounds `m >> shift` to nearest, ties to even (`shift` is 1..=24)
let round = |m: u32, shift: u32| {
let (q, rem, mid) = (m >> shift, m & ((1 << shift) - 1), 1 << (shift - 1));
if rem > mid || (rem == mid && q & 1 == 1) { q + 1 } else { q }
};
let e = exp - 127 + 15;
if e >= 0x1F {
sign | 0x7C00
} else if e <= 0 {
if e < -10 {
return sign;
}
// subnormal half: the 24-bit significand scaled by 2^(e - 14); rounding up may carry
// into the smallest normal, which is the right encoding
sign | round(man | 0x80_0000, (14 - e) as u32) as u16
} else {
// a carry out of the mantissa bumps the exponent (up to infinity), as it should
sign | round(((e as u32) << 23) | man, 13) as u16
}
}
/// An OpenEXR file: half-float scene-linear Rec.709 RGB, or RGBA with `alpha` (premultiplied, as
/// EXR defines alpha; the frame's straight alpha is multiplied in after linearisation).
pub fn write_rgba8(rgba: &[u8], w: u32, h: u32, alpha: bool, compression: Compression, linear: &[f32; 256]) -> Result<Vec<u8>, Error> {
let n = checked_len(rgba, w, h)?;
let too_large = || Error::TooLarge;
let (Ok(x_max), Ok(y_max)) = (i32::try_from(w - 1), i32::try_from(h - 1)) else {
return Err(too_large());
};
// channels in the alphabetical order the file layout requires
let names: &[u8] = if alpha { b"ABGR" } else { b"BGR" };
let line = (w as usize).checked_mul(names.len() * 2).ok_or(Error::FrameSize)?;
// a chunk's byte count is a signed 32-bit field
let lines = compression.lines();
if line.checked_mul(lines).and_then(|c| i32::try_from(c).ok()).is_none() {
return Err(too_large());
}
let mut hd = Vec::with_capacity(512);
hd.extend_from_slice(&[0x76, 0x2F, 0x31, 0x01]); // magic number 20000630
hd.extend_from_slice(&[2, 0, 0, 0]); // version 2, single-part scan-line file, short names
let attr = |hd: &mut Vec<u8>, name: &str, ty: &str, value: &[u8]| {
for s in [name, ty] {
hd.extend_from_slice(s.as_bytes());
hd.push(0);
}
hd.extend_from_slice(&(value.len() as i32).to_le_bytes());
hd.extend_from_slice(value);
};
let le = |v: &[f32]| v.iter().flat_map(|f| f.to_le_bytes()).collect::<Vec<u8>>();
let mut channels = Vec::new();
for &c in names {
channels.extend_from_slice(&[c, 0]);
channels.extend_from_slice(&1_i32.to_le_bytes()); // pixel type HALF
channels.extend_from_slice(&[0, 0, 0, 0]); // pLinear 0, reserved
channels.extend_from_slice(&1_i32.to_le_bytes()); // x sampling
channels.extend_from_slice(&1_i32.to_le_bytes()); // y sampling
}
channels.push(0);
let window: Vec<u8> = [0, 0, x_max, y_max].iter().flat_map(|v| v.to_le_bytes()).collect();
attr(&mut hd, "channels", "chlist", &channels);
attr(&mut hd, "chromaticities", "chromaticities", &le(&[0.64, 0.33, 0.30, 0.60, 0.15, 0.06, 0.3127, 0.3290]));
attr(&mut hd, "compression", "compression", &[compression.code()]);
attr(&mut hd, "dataWindow", "box2i", &window);
attr(&mut hd, "displayWindow", "box2i", &window);
attr(&mut hd, "lineOrder", "lineOrder", &[0]); // INCREASING_Y
attr(&mut hd, "pixelAspectRatio", "float", &le(&[1.0]));
attr(&mut hd, "screenWindowCenter", "v2f", &le(&[0.0, 0.0]));
attr(&mut hd, "screenWindowWidth", "float", &le(&[1.0]));
hd.push(0); // end of header
// offset table (one entry per chunk), then the chunks: first y, data size, data
let chunks = (h as usize).div_ceil(lines);
let table = chunks.checked_mul(8);
let body = (h as usize).checked_mul(line + 8);
let size = table.zip(body).and_then(|(t, b)| hd.len().checked_add(t)?.checked_add(b)).ok_or(Error::FrameSize)?;
// the uncompressed size: compressed chunks only shrink it
let mut out = Vec::with_capacity(size);
out.extend_from_slice(&hd);
let table_at = out.len();
out.resize(table_at + chunks * 8, 0);
let lin = linear;
let opaque: [u16; 256] = std::array::from_fn(|i| half(lin[i]));
let row = w as usize * 4;
let wn = w as usize;
let mut px = vec![0_u16; wn * names.len()];
let mut raw = Vec::with_capacity(line * lines);
// the deflate hash tables, shared by the frame's chunks instead of zeroed for each one
let mut tables = crate::zlib::Tables::default();
for (k, block) in rgba[..n].chunks(row * lines).enumerate() {
raw.clear();
for src in block.chunks_exact(row) {
// planar per line: every pixel of the first channel, then the next channel …
for (x, &[r, g, b, a]) in src.as_chunks::<4>().0.iter().enumerate() {
let rgb = [b, g, r];
if alpha {
let k = f32::from(a) / 255.0;
px[x] = half(k);
for (c, &v) in rgb.iter().enumerate() {
px[(c + 1) * wn + x] = if a == 255 { opaque[v as usize] } else { half(lin[v as usize] * k) };
}
} else {
for (c, &v) in rgb.iter().enumerate() {
px[c * wn + x] = opaque[v as usize];
}
}
}
raw.extend(px.iter().flat_map(|v| v.to_le_bytes()));
}
let packed = match compression {
Compression::None => None,
Compression::Rle => Some(rle(&predict(&raw))),
Compression::Zips | Compression::Zip => Some(crate::zlib::zlib(&predict(&raw), &mut tables)),
};
// a chunk that does not shrink is stored as it is (readers compare the sizes)
let data = packed.as_deref().filter(|p| p.len() < raw.len()).unwrap_or(&raw);
let offset = (out.len() as u64).to_le_bytes();
out[table_at + k * 8..table_at + k * 8 + 8].copy_from_slice(&offset);
out.extend_from_slice(&((k * lines) as i32).to_le_bytes());
out.extend_from_slice(&(data.len() as i32).to_le_bytes());
out.extend_from_slice(data);
}
Ok(out)
}
/// The OpenEXR RLE / ZIP predictor: bytes split into even and odd halves, then each byte replaced
/// by its difference from the previous one, plus 128.
fn predict(raw: &[u8]) -> Vec<u8> {
let half = raw.len().div_ceil(2);
let mut t = vec![0_u8; raw.len()];
for (i, &b) in raw.iter().enumerate() {
t[if i % 2 == 0 { i / 2 } else { half + i / 2 }] = b;
}
let mut p = t.first().copied().unwrap_or(0);
for v in t.iter_mut().skip(1) {
let d = v.wrapping_sub(p).wrapping_add(128);
p = *v;
*v = d;
}
t
}
/// OpenEXR run-length coding: a signed count byte, then either `count + 1` copies of one byte
/// (count ≥ 0, runs of 3 to 128) or `-count` literal bytes (1 to 127).
pub fn rle(src: &[u8]) -> Vec<u8> {
let mut out = Vec::with_capacity(src.len() + src.len() / 127 + 1);
let mut i = 0;
while i < src.len() {
let b = src[i];
let run = src[i..].iter().take(128).take_while(|&&x| x == b).count();
if run >= 3 {
out.extend_from_slice(&[(run - 1) as u8, b]);
i += run;
continue;
}
// literals up to the next run of three (or 127 bytes)
let s = i;
while i < src.len() && i - s < 127 {
if src.get(i..i + 3).is_some_and(|t| t[0] == t[1] && t[1] == t[2]) {
break;
}
i += 1;
}
out.push(((i - s) as u8).wrapping_neg());
out.extend_from_slice(&src[s..i]);
}
out
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn writes_all_scanline_compressions() {
let linear = std::array::from_fn(|i| i as f32 / 255.0);
for c in [Compression::None, Compression::Rle, Compression::Zips, Compression::Zip] {
let bytes = write_rgba8(&[128; 16 * 16 * 4], 16, 16, true, c, &linear).unwrap();
assert_eq!(&bytes[..4], &[0x76, 0x2f, 0x31, 1]);
assert!(bytes.len() > 100);
}
assert_eq!(write_rgba8(&[], 1, 1, false, Compression::None, &linear), Err(Error::FrameSize));
}
}
+16
View File
@@ -0,0 +1,16 @@
[package]
name = "craft-fcproj-format"
description = "FilmCraft project envelope and schema migrations"
version.workspace = true
edition.workspace = true
license.workspace = true
rust-version.workspace = true
repository.workspace = true
[lints]
workspace = true
[dependencies]
serde = { workspace = true }
serde_json = { workspace = true }
thiserror = { workspace = true }
+297
View File
@@ -0,0 +1,297 @@
//! FilmCraft `.fcproj` JSON envelope, version detection and historical migrations.
//! Project and editor-view types are supplied by the caller.
#![cfg_attr(not(test), deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable))]
use serde::{Deserialize, Serialize};
use serde_json::Value;
/// The `format` tag written in every envelope.
pub const FORMAT_ID: &str = "filmcraft.project";
/// A migration upgrades a whole document from schema `n` to `n + 1`.
pub type Migration = fn(Value) -> Result<Value, String>;
/// `MIGRATIONS[i]` upgrades schema `i + 1` to `i + 2`. Append one function per schema bump; never
/// edit a shipped one.
pub const MIGRATIONS: &[Migration] = &[
v1_to_v2, v2_to_v3, v3_to_v4, v4_to_v5, v5_to_v6, v6_to_v7, v7_to_v8, v8_to_v9, v9_to_v10, v10_to_v11, v11_to_v12, v12_to_v13, v13_to_v14,
v14_to_v15, v15_to_v16, v16_to_v17,
];
/// The schema version this build writes (and the newest it reads).
pub const SCHEMA_VERSION: u32 = MIGRATIONS.len() as u32 + 1;
/// Oldest schema this build can still upgrade.
pub const OLDEST_SCHEMA: u32 = 1;
#[derive(Debug, thiserror::Error)]
pub enum FormatError {
#[error("not a FilmCraft project: {0}")]
NotAProject(String),
#[error(
"this project was saved by a newer version of FilmCraft (project schema v{found}); this build reads up to v{supported}. Update FilmCraft to open it."
)]
TooNew { found: u32, supported: u32 },
#[error("project schema v{found} is too old for this build (oldest supported: v{oldest})")]
TooOld { found: u32, oldest: u32 },
#[error("upgrading project from schema v{from} to v{}: {msg}", from + 1)]
Migration { from: u32, msg: String },
#[error("project file is damaged: {0}")]
Corrupt(String),
}
/// Serialized current-schema envelope.
#[derive(Serialize)]
pub struct EnvelopeOut<'a, P, V> {
pub format: &'static str,
pub schema_version: u32,
pub generator: String,
pub project: &'a P,
#[serde(skip_serializing_if = "Option::is_none")]
pub view: Option<&'a V>,
}
/// Parsed envelope. View parsing remains optional to preserve forward compatibility.
#[derive(Deserialize)]
pub struct EnvelopeIn<P> {
#[serde(default)]
pub generator: Option<String>,
pub project: P,
#[serde(default)]
pub view: Option<Value>,
}
/// Serialize the current envelope, with optional editor view and caller-provided generator.
pub fn encode<P: Serialize, V: Serialize>(project: &P, view: Option<&V>, generator: String, pretty: bool) -> Vec<u8> {
let envelope = EnvelopeOut { format: FORMAT_ID, schema_version: SCHEMA_VERSION, generator, project, view };
let result = if pretty { serde_json::to_vec_pretty(&envelope) } else { serde_json::to_vec(&envelope) };
result.unwrap_or_default()
}
/// Decode an envelope, migrating older documents while retaining the current-version fast path.
pub fn decode<P: serde::de::DeserializeOwned>(bytes: &[u8]) -> Result<(EnvelopeIn<P>, u32), FormatError> {
let found = detect_bytes(bytes)?;
if found == SCHEMA_VERSION {
let env = serde_json::from_slice(bytes).map_err(|e| FormatError::Corrupt(e.to_string()))?;
return Ok((env, found));
}
let doc: Value = serde_json::from_slice(bytes).map_err(|e| FormatError::Corrupt(e.to_string()))?;
let doc = migrate_with(MIGRATIONS, doc, found)?;
let env = serde_json::from_value(doc).map_err(|e| FormatError::Corrupt(format!("after upgrading from schema v{found}: {e}")))?;
Ok((env, found))
}
/// Probe and validate the schema directly from bytes without building a JSON tree.
pub fn detect_bytes(bytes: &[u8]) -> Result<u32, FormatError> {
let probe: Probe = serde_json::from_slice(bytes)
.map_err(|e| if e.is_syntax() || e.is_eof() { FormatError::Corrupt(e.to_string()) } else { FormatError::NotAProject(e.to_string()) })?;
let found = probe_version(&probe)?;
check_supported(found)?;
Ok(found)
}
/// Just enough of a document to know which schema it is.
#[derive(Deserialize)]
struct Probe {
#[serde(default)]
format: Option<String>,
#[serde(default)]
schema_version: Option<u32>,
/// Bare (pre-envelope) project: its `version` field.
#[serde(default)]
version: Option<u32>,
#[serde(default)]
items: Option<serde::de::IgnoredAny>,
#[serde(default)]
root: Option<serde::de::IgnoredAny>,
}
/// Detect the schema version of a parsed document.
pub fn detect_version(doc: &Value) -> Result<u32, FormatError> {
let probe: Probe = serde_json::from_value(doc.clone()).map_err(|e| FormatError::NotAProject(e.to_string()))?;
probe_version(&probe)
}
fn probe_version(p: &Probe) -> Result<u32, FormatError> {
if let Some(v) = p.schema_version {
if let Some(f) = &p.format
&& f != FORMAT_ID
{
return Err(FormatError::NotAProject(format!("format is `{f}`, expected `{FORMAT_ID}`")));
}
return Ok(v);
}
// Before the envelope (v1) a file was the bare Project object with `version`.
// Its `version` was 1, or 2 on builds that briefly bumped it when caption tracks were added
// (same shape; the new field loads with its default). Anything higher is from the future.
if p.items.is_some() && p.root.is_some() {
return Ok(match p.version.unwrap_or(1) {
0..=2 => 1,
v => v,
});
}
Err(FormatError::NotAProject("no `schema_version` and not a legacy project".into()))
}
pub fn check_supported(found: u32) -> Result<(), FormatError> {
if found > SCHEMA_VERSION {
return Err(FormatError::TooNew { found, supported: SCHEMA_VERSION });
}
if found < OLDEST_SCHEMA {
return Err(FormatError::TooOld { found, oldest: OLDEST_SCHEMA });
}
Ok(())
}
/// Run `table` from schema `from` up to `table.len() + 1`, stamping `schema_version` after each step.
pub fn migrate_with(table: &[Migration], mut doc: Value, from: u32) -> Result<Value, FormatError> {
let target = table.len() as u32 + 1;
if from > target {
return Err(FormatError::TooNew { found: from, supported: target });
}
if from == 0 {
return Err(FormatError::TooOld { found: 0, oldest: 1 });
}
for v in from..target {
let step = table[(v - 1) as usize];
doc = step(doc).map_err(|msg| FormatError::Migration { from: v, msg })?;
match doc.as_object_mut() {
Some(o) => {
o.insert("schema_version".into(), Value::from(v + 1));
}
None => return Err(FormatError::Migration { from: v, msg: "migration produced a non-object document".into() }),
}
}
Ok(doc)
}
/// v1 → v2: wrap the bare project in the envelope and drop the per-project `version` field.
fn v1_to_v2(doc: Value) -> Result<Value, String> {
let Value::Object(mut project) = doc else { return Err("expected a JSON object".into()) };
project.remove("version");
Ok(serde_json::json!({
"format": FORMAT_ID,
"schema_version": 2,
"generator": "FilmCraft (schema v1)",
"project": Value::Object(project),
}))
}
/// v2 → v3: graphic clips added; existing data needs no change.
fn v2_to_v3(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v3 → v4: Essential Sound fields added; existing data needs no change.
fn v3_to_v4(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v4 → v5: colour-management fields added; existing data needs no change.
fn v4_to_v5(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v5 → v6: media identity and ingest settings added; existing data needs no change.
fn v5_to_v6(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v6 → v7: effect masks (Bézier mask paths as keyframable parameters); existing data needs no change.
fn v6_to_v7(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v7 → v8: multi-camera source sequences / clips and merged clips added; existing data needs no
/// change.
fn v7_to_v8(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v8 → v9: per-media-item transcripts (`project.transcripts`) added; existing data needs no change.
fn v8_to_v9(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v9 → v10: clip time interpolation, Hold Filters, Field Options and audio source channels; the
/// Modify ▸ Audio Channels map; subclips' Restrict Trims flag. Existing data needs no change.
fn v9_to_v10(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v10 → v11: search bins (`project.search_bins`), Flash Cue markers, Project Settings safe areas,
/// capture format and scratch disks. Existing data needs no change.
fn v10_to_v11(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v11 → v12: graphics templates, rolls / crawls, responsive design and per-character text styles
/// on graphic clips, and source graphics. Existing data needs no change.
fn v11_to_v12(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v12 → v13: container audio streams and per-clip stream selection. `MediaInfo` reads the old
/// `audio` field as stream zero; `TrackItem::audio_stream` defaults to zero.
fn v12_to_v13(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v13 → v14: narrations (Text to Speech). Existing data needs no change.
fn v13_to_v14(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v14 → v15: project notes. Existing data needs no change.
fn v14_to_v15(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v15 → v16: existing colors remain presets; authors and the named custom palette default empty.
fn v15_to_v16(doc: Value) -> Result<Value, String> {
Ok(doc)
}
/// v16 → v17: marker URLs default empty. Older builds must not silently drop saved URLs.
fn v16_to_v17(doc: Value) -> Result<Value, String> {
Ok(doc)
}
#[cfg(test)]
mod tests {
use super::*;
use serde_json::json;
#[test]
fn legacy_and_current_envelopes_preserve_values() {
let bare = json!({"version": 2, "items": {}, "root": {}, "extra": [1, 2]});
assert_eq!(detect_version(&bare).unwrap(), 1);
let migrated = migrate_with(MIGRATIONS, bare, 1).unwrap();
assert_eq!(migrated["schema_version"], 17);
assert_eq!(migrated["project"]["extra"], json!([1, 2]));
assert_eq!(migrated["generator"], "FilmCraft (schema v1)");
assert_eq!(detect_bytes(serde_json::to_string(&migrated).unwrap().as_bytes()).unwrap(), 17);
let parsed: EnvelopeIn<Value> = serde_json::from_value(migrated).unwrap();
assert!(parsed.view.is_none());
assert_eq!(parsed.project["extra"], json!([1, 2]));
}
#[test]
fn typed_encode_and_decode_current_and_legacy() {
let project = json!({"items": {}, "root": {}, "name": "Cut"});
let view = json!({"active": 3});
for pretty in [false, true] {
let bytes = encode(&project, Some(&view), "FilmCraft test".into(), pretty);
let (file, version): (EnvelopeIn<Value>, _) = decode(&bytes).unwrap();
assert_eq!(version, SCHEMA_VERSION);
assert_eq!(file.project, project);
assert_eq!(file.view, Some(view.clone()));
}
let old = br#"{"version":1,"items":{},"root":{},"name":"Cut"}"#;
let (file, version): (EnvelopeIn<Value>, _) = decode(old).unwrap();
assert_eq!(version, 1);
assert_eq!(file.project["name"], "Cut");
}
#[test]
fn rejects_wrong_future_and_damaged_envelopes() {
assert!(matches!(detect_bytes(br#"{"format":"other","schema_version":1}"#), Err(FormatError::NotAProject(_))));
assert!(matches!(detect_bytes(br#"{"schema_version":18}"#), Err(FormatError::TooNew { found: 18, supported: 17 })));
assert!(matches!(detect_bytes(br#"{"schema_version":0}"#), Err(FormatError::TooOld { found: 0, oldest: 1 })));
assert!(matches!(detect_bytes(b"{"), Err(FormatError::Corrupt(_))));
assert!(matches!(migrate_with(MIGRATIONS, json!([]), 1), Err(FormatError::Migration { from: 1, .. })));
}
}
+1
View File
@@ -15,6 +15,7 @@ default = ["system"]
system = ["dep:fontique"]
[dependencies]
kurbo = { workspace = true }
skrifa = { version = "0.47", default-features = false, features = ["std"] }
thiserror = { workspace = true }
+85
View File
@@ -0,0 +1,85 @@
//! Permission to embed TrueType outline subsets based on the face's OS/2 `fsType`.
use skrifa::{FontRef, Tag};
/// Whether a face can be embedded as a TrueType subset.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub enum SubsetEmbedding {
/// Installable, editable, or preview-and-print embedding, or no readable `fsType`.
Allowed,
/// Restricted licence embedding.
Restricted,
/// Embedding is allowed only without subsetting.
NoSubsetting,
/// Only bitmap embedding is allowed.
BitmapOnly,
/// The face is invalid or lacks a TrueType outline table.
NotTrueType,
}
/// Classify a face's TrueType subset embedding permissions. Missing or truncated OS/2
/// data permits embedding; bitmap-only takes precedence over restricted and no-subsetting.
pub fn subset_embedding(bytes: &[u8], index: u32) -> SubsetEmbedding {
let Ok(face) = FontRef::from_index(bytes, index) else { return SubsetEmbedding::NotTrueType };
if [b"glyf", b"loca", b"head"].iter().any(|tag| face.table_data(Tag::new(tag)).is_none()) {
return SubsetEmbedding::NotTrueType;
}
let fs_type = face.table_data(Tag::new(b"OS/2")).and_then(|table| {
let data = table.as_bytes();
Some(u16::from_be_bytes([*data.get(8)?, *data.get(9)?]))
});
let Some(fs_type) = fs_type else { return SubsetEmbedding::Allowed };
if fs_type & 0x0200 != 0 {
SubsetEmbedding::BitmapOnly
} else if fs_type & 0x000f == 0x0002 {
SubsetEmbedding::Restricted
} else if fs_type & 0x0100 != 0 {
SubsetEmbedding::NoSubsetting
} else {
SubsetEmbedding::Allowed
}
}
#[cfg(test)]
mod tests {
use super::*;
use write_fonts::{FontBuilder, types::Tag};
fn font(fs_type: Option<&[u8]>, missing: Option<&[u8; 4]>) -> Vec<u8> {
let mut builder = FontBuilder::new();
for tag in [b"glyf", b"loca", b"head"] {
if Some(tag) != missing {
builder.add_raw(Tag::new(tag), vec![0; 4]);
}
}
if let Some(data) = fs_type {
builder.add_raw(Tag::new(b"OS/2"), data.to_vec());
}
builder.build()
}
#[test]
fn subset_permissions_and_precedence() {
assert_eq!(subset_embedding(b"junk", 0), SubsetEmbedding::NotTrueType);
for tag in [b"glyf", b"loca", b"head"] {
assert_eq!(subset_embedding(&font(None, Some(tag)), 0), SubsetEmbedding::NotTrueType);
}
assert_eq!(subset_embedding(&font(None, None), 1), SubsetEmbedding::NotTrueType);
assert_eq!(subset_embedding(&font(Some(&[0; 9]), None), 0), SubsetEmbedding::Allowed);
for (bits, expected) in [
(0x0000u16, SubsetEmbedding::Allowed),
(0x0004, SubsetEmbedding::Allowed),
(0x0008, SubsetEmbedding::Allowed),
(0x0006, SubsetEmbedding::Allowed),
(0x0002, SubsetEmbedding::Restricted),
(0x0100, SubsetEmbedding::NoSubsetting),
(0x0102, SubsetEmbedding::Restricted),
(0x0302, SubsetEmbedding::BitmapOnly),
] {
let mut os2 = [0; 10];
os2[8..10].copy_from_slice(&bits.to_be_bytes());
assert_eq!(subset_embedding(&font(Some(&os2), None), 0), expected, "fsType {bits:#06x}");
}
assert_eq!(subset_embedding(&font(None, None), 0), SubsetEmbedding::Allowed);
}
}
+6
View File
@@ -21,16 +21,22 @@
//! ```
mod catalog;
mod embedding;
mod env;
mod fontconfig;
mod outline;
mod registry;
mod scan;
/// Bounded SFNT face metadata discovery over caller-provided random-access readers.
pub mod sfnt;
mod suitcase;
pub mod system;
pub use catalog::{Catalog, FontData, FontFileError, Limits, Lister, LoadedFace, Match, Watch};
pub use embedding::{SubsetEmbedding, subset_embedding};
pub use env::{FontEnv, Os, font_dirs, font_store_dir, office_font_dirs};
pub use fontconfig::fontconfig_dirs;
pub use outline::{FontOutline, GlyphPen, OutlineError};
pub use scan::{FaceInfo, LocalizedName, Source, is_font_file, style_italic, style_weight, style_width};
#[cfg(test)]
+399
View File
@@ -0,0 +1,399 @@
//! Unhinted glyph outlines and metrics for catalog faces.
use kurbo::BezPath;
use skrifa::instance::{Location, Size};
use skrifa::outline::{DrawSettings, OutlinePen};
use skrifa::{FontRef, GlyphId, MetadataProvider, Tag};
use crate::{FontData, LoadedFace};
/// A parsed face and its variation location. Coordinates use font design units, with y up.
/// The bytes can come from a catalog or any other source, including a collection face.
pub struct FontOutline<'a> {
font: FontRef<'a>,
location: Location,
}
/// Receives unhinted glyph commands in design units (y up). Implementations own their
/// storage and resource policy; drawing writes directly to the sink without an intermediate path.
pub trait GlyphPen {
/// Start a contour.
fn move_to(&mut self, x: f32, y: f32);
/// Add a straight segment.
fn line_to(&mut self, x: f32, y: f32);
/// Add a quadratic segment.
fn quad_to(&mut self, x1: f32, y1: f32, x: f32, y: f32);
/// Add a cubic segment.
fn curve_to(&mut self, x1: f32, y1: f32, x2: f32, y2: f32, x: f32, y: f32);
/// Close the current contour.
fn close(&mut self);
}
struct Sink<'a>(&'a mut dyn GlyphPen);
impl OutlinePen for Sink<'_> {
fn move_to(&mut self, x: f32, y: f32) {
self.0.move_to(x, y);
}
fn line_to(&mut self, x: f32, y: f32) {
self.0.line_to(x, y);
}
fn quad_to(&mut self, x1: f32, y1: f32, x: f32, y: f32) {
self.0.quad_to(x1, y1, x, y);
}
fn curve_to(&mut self, x1: f32, y1: f32, x2: f32, y2: f32, x: f32, y: f32) {
self.0.curve_to(x1, y1, x2, y2, x, y);
}
fn close(&mut self) {
self.0.close();
}
}
/// Why a font or glyph outline could not be read.
#[derive(Debug, thiserror::Error)]
pub enum OutlineError {
/// The face index or font data is invalid.
#[error("invalid font face")]
InvalidFace,
/// The glyph has no outline in this face.
#[error("glyph has no outline")]
MissingGlyph,
/// The glyph's outline is malformed.
#[error("cannot draw glyph outline: {0}")]
Draw(#[from] skrifa::outline::DrawError),
/// The glyph emitted more path elements than the safety limit.
#[error("glyph outline exceeds the element limit")]
TooComplex,
/// The outline starts without a move command.
#[error("glyph outline has no initial move")]
InvalidPath,
}
impl<'a> FontOutline<'a> {
/// Parse the given face and select axis values in user units. Unknown axes are ignored and
/// values are clamped to their axis ranges by the font parser.
pub fn new(data: &'a FontData, variations: &[([u8; 4], f32)]) -> Result<Self, OutlineError> {
Self::from_bytes(&data.bytes, data.index, variations)
}
/// Parse borrowed bytes and a collection face index without copying the font.
pub fn from_bytes(bytes: &'a [u8], index: u32, variations: &[([u8; 4], f32)]) -> Result<Self, OutlineError> {
let font = FontRef::from_index(bytes, index).map_err(|_| OutlineError::InvalidFace)?;
let location = font.axes().location(variations.iter().map(|(tag, value)| (Tag::new(tag), *value)));
Ok(Self { font, location })
}
/// Parse a catalog face, retaining the axis settings of a named instance.
pub fn from_loaded(face: &'a LoadedFace) -> Result<Self, OutlineError> {
Self::new(&face.data, &face.info.variations)
}
/// Font-wide metrics in unscaled design units at this variation location.
pub fn metrics(&self) -> skrifa::metrics::Metrics {
self.font.metrics(Size::unscaled(), &self.location)
}
/// Resolve a Unicode scalar to a glyph identifier.
pub fn glyph_for(&self, character: char) -> Option<u32> {
self.font.charmap().map(character).map(|id| id.to_u32())
}
/// Stream an unhinted glyph into the caller's sink. On an error, commands already sent
/// remain in the sink. The sink owns any allocation and enforces its own resource limit.
pub fn draw_to(&self, glyph: u32, pen: &mut dyn GlyphPen) -> Result<(), OutlineError> {
let outline = self.font.outline_glyphs().get(GlyphId::new(glyph)).ok_or(OutlineError::MissingGlyph)?;
outline.draw(DrawSettings::unhinted(Size::unscaled(), &self.location), &mut Sink(pen))?;
Ok(())
}
/// Draw a glyph in design units. Empty glyphs such as spaces can produce an empty path.
/// A malformed or excessively complex glyph returns an error instead of partial geometry.
pub fn outline(&self, glyph: u32) -> Result<BezPath, OutlineError> {
let (path, status) = self.outline_recovering(glyph)?;
status.map(|()| path)
}
/// Draw a glyph while retaining the bounded prefix produced before a draw error. This is
/// useful for consumers preserving existing rendering of damaged fonts. The inner result
/// reports whether the returned path is complete; the outer error means no glyph was found.
/// Paths stop growing at 100,000 elements, even when the font is untrusted.
pub fn outline_recovering(&self, glyph: u32) -> Result<(BezPath, Result<(), OutlineError>), OutlineError> {
let outline = self.font.outline_glyphs().get(GlyphId::new(glyph)).ok_or(OutlineError::MissingGlyph)?;
let mut pen = PathPen::new();
let result = outline.draw(DrawSettings::unhinted(Size::unscaled(), &self.location), &mut pen);
let status = if pen.invalid {
Err(OutlineError::InvalidPath)
} else if pen.truncated {
Err(OutlineError::TooComplex)
} else {
result.map(|_| ()).map_err(OutlineError::Draw)
};
Ok((pen.path, status))
}
}
const MAX_OUTLINE_ELEMENTS: usize = 100_000;
struct PathPen {
path: BezPath,
truncated: bool,
invalid: bool,
}
impl PathPen {
fn new() -> Self {
Self { path: BezPath::new(), truncated: false, invalid: false }
}
fn has_start(&mut self) -> bool {
if self.path.elements().is_empty() {
self.invalid = true;
false
} else {
true
}
}
fn room(&mut self) -> bool {
if self.path.elements().len() >= MAX_OUTLINE_ELEMENTS {
self.truncated = true;
false
} else {
true
}
}
}
impl OutlinePen for PathPen {
fn move_to(&mut self, x: f32, y: f32) {
if self.room() {
self.path.move_to((f64::from(x), f64::from(y)));
}
}
fn line_to(&mut self, x: f32, y: f32) {
if self.has_start() && self.room() {
self.path.line_to((f64::from(x), f64::from(y)));
}
}
fn quad_to(&mut self, x1: f32, y1: f32, x: f32, y: f32) {
if self.has_start() && self.room() {
self.path.quad_to((f64::from(x1), f64::from(y1)), (f64::from(x), f64::from(y)));
}
}
fn curve_to(&mut self, x1: f32, y1: f32, x2: f32, y2: f32, x: f32, y: f32) {
if self.has_start() && self.room() {
self.path.curve_to((f64::from(x1), f64::from(y1)), (f64::from(x2), f64::from(y2)), (f64::from(x), f64::from(y)));
}
}
fn close(&mut self) {
if self.has_start() && self.room() {
self.path.close_path();
}
}
}
#[cfg(test)]
mod tests {
use super::*;
use kurbo::PathEl;
use std::sync::Arc;
impl GlyphPen for PathPen {
fn move_to(&mut self, x: f32, y: f32) {
OutlinePen::move_to(self, x, y);
}
fn line_to(&mut self, x: f32, y: f32) {
OutlinePen::line_to(self, x, y);
}
fn quad_to(&mut self, x1: f32, y1: f32, x: f32, y: f32) {
OutlinePen::quad_to(self, x1, y1, x, y);
}
fn curve_to(&mut self, x1: f32, y1: f32, x2: f32, y2: f32, x: f32, y: f32) {
OutlinePen::curve_to(self, x1, y1, x2, y2, x, y);
}
fn close(&mut self) {
OutlinePen::close(self);
}
}
#[test]
fn rejects_invalid_face_and_collection_index() {
let data = FontData { bytes: Arc::from(&b"not a font"[..]), index: 0 };
assert!(matches!(FontOutline::new(&data, &[]), Err(OutlineError::InvalidFace)));
}
#[test]
fn pen_preserves_geometry_and_upward_y() {
let mut pen = PathPen::new();
OutlinePen::move_to(&mut pen, 1.0, 2.0);
OutlinePen::line_to(&mut pen, 3.0, 4.0);
OutlinePen::quad_to(&mut pen, 5.0, 6.0, 7.0, 8.0);
OutlinePen::curve_to(&mut pen, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0);
OutlinePen::close(&mut pen);
assert_eq!(
pen.path.elements(),
&[
PathEl::MoveTo((1.0, 2.0).into()),
PathEl::LineTo((3.0, 4.0).into()),
PathEl::QuadTo((5.0, 6.0).into(), (7.0, 8.0).into()),
PathEl::CurveTo((9.0, 10.0).into(), (11.0, 12.0).into(), (13.0, 14.0).into()),
PathEl::ClosePath,
]
);
}
#[test]
fn streaming_adapter_forwards_each_command_and_rejects_an_invalid_prefix() {
let mut pen = PathPen::new();
{
let mut sink = Sink(&mut pen);
OutlinePen::move_to(&mut sink, 1.0, 2.0);
OutlinePen::line_to(&mut sink, 3.0, 4.0);
OutlinePen::quad_to(&mut sink, 5.0, 6.0, 7.0, 8.0);
OutlinePen::curve_to(&mut sink, 9.0, 10.0, 11.0, 12.0, 13.0, 14.0);
OutlinePen::close(&mut sink);
}
assert_eq!(pen.path.elements().len(), 5);
assert_eq!(pen.path.elements()[2], PathEl::QuadTo((5.0, 6.0).into(), (7.0, 8.0).into()));
let mut invalid = PathPen::new();
OutlinePen::line_to(&mut invalid, 1.0, 2.0);
assert!(invalid.invalid);
assert!(invalid.path.elements().is_empty());
}
#[test]
fn pen_caps_path_growth() {
let mut pen = PathPen::new();
OutlinePen::move_to(&mut pen, 0.0, 0.0);
for _ in 0..MAX_OUTLINE_ELEMENTS {
OutlinePen::line_to(&mut pen, 1.0, 2.0);
}
assert_eq!(pen.path.elements().len(), MAX_OUTLINE_ELEMENTS);
assert!(pen.truncated);
}
#[test]
fn reads_craft_font_when_available() {
let Ok(dir) = std::env::var("CRAFT_FONTS_DIR") else { return };
let bytes = std::fs::read(std::path::Path::new(&dir).join("fonts/noto-sans-hebrew/NotoSansHebrew-Regular.ttf")).unwrap();
let data = FontData { bytes: bytes.into(), index: 0 };
let face = FontOutline::new(&data, &[]).unwrap();
assert!(face.metrics().units_per_em > 0);
let glyph = face.glyph_for('א').unwrap();
assert!(!face.outline(glyph).unwrap().elements().is_empty());
assert!(matches!(face.outline(u32::MAX), Err(OutlineError::MissingGlyph)));
let invalid_index = FontData { bytes: data.bytes.clone(), index: u32::MAX };
assert!(matches!(FontOutline::new(&invalid_index, &[]), Err(OutlineError::InvalidFace)));
}
#[test]
fn variation_changes_glyph_geometry() {
let Ok(dir) = std::env::var("CRAFT_FONTS_DIR") else { return };
let bytes = std::fs::read(std::path::Path::new(&dir).join("fonts/noto-sans-arabic/NotoSansArabic.ttf")).unwrap();
let data = FontData { bytes: bytes.into(), index: 0 };
let light = FontOutline::new(&data, &[(*b"wght", 100.0)]).unwrap();
let bold = FontOutline::new(&data, &[(*b"wght", 900.0)]).unwrap();
let glyph = light.glyph_for('ب').unwrap();
let light_path = light.outline(glyph).unwrap();
let bold_path = bold.outline(glyph).unwrap();
assert!(!light_path.elements().is_empty());
assert_ne!(light_path, bold_path);
}
// Construct a minimal CFF font so CI can exercise the public API without installed fonts.
fn cff_font(program: &[u8]) -> Vec<u8> {
let mut cff = vec![1, 0, 4, 4, 0, 1, 1, 1, 2, b'X', 0, 1, 1, 1, 7, 29, 0, 0, 0, 25, 17, 0, 0, 0, 0];
cff.extend_from_slice(&[0, 1, 4]);
cff.extend_from_slice(&1u32.to_be_bytes());
cff.extend_from_slice(&((program.len() as u32) + 1).to_be_bytes());
cff.extend_from_slice(program);
let mut builder = write_fonts::FontBuilder::new();
let mut head = vec![0; 54];
head[18..20].copy_from_slice(&1000u16.to_be_bytes());
let mut hhea = vec![0; 36];
hhea[34..36].copy_from_slice(&1u16.to_be_bytes());
builder.add_raw(write_fonts::types::Tag::new(b"head"), head);
builder.add_raw(write_fonts::types::Tag::new(b"hhea"), hhea);
builder.add_raw(write_fonts::types::Tag::new(b"hmtx"), vec![0, 100, 0, 0]);
builder.add_raw(write_fonts::types::Tag::new(b"maxp"), vec![0, 0, 0x50, 0, 0, 1]);
builder.add_raw(write_fonts::types::Tag::new(b"CFF "), cff);
builder.build()
}
#[test]
fn malformed_cff_recovers_the_same_prefix_as_direct_drawing() {
// Move and line, then callsubr without an operand: a prefix is emitted before failure.
let bytes = cff_font(&[139, 139, 21, 239, 139, 5, 10, 14]);
let gid = 0;
let f = FontRef::new(&bytes).unwrap();
let mut old = PathPen::new();
let result =
f.outline_glyphs().get(GlyphId::new(gid)).unwrap().draw(DrawSettings::unhinted(Size::unscaled(), &Location::default()), &mut old);
assert!(result.is_err());
assert!(!old.path.elements().is_empty());
let shared = FontOutline::from_bytes(&bytes, 0, &[]).unwrap();
assert_eq!(shared.metrics().units_per_em, 1000);
assert_eq!(shared.glyph_for('A'), None);
let (prefix, status) = shared.outline_recovering(gid).unwrap();
assert!(matches!(status, Err(OutlineError::Draw(_))));
assert_eq!(prefix, old.path);
let mut streamed = PathPen::new();
assert!(matches!(shared.draw_to(gid, &mut streamed), Err(OutlineError::Draw(_))));
assert_eq!(streamed.path, old.path);
assert!(matches!(shared.outline(gid), Err(OutlineError::Draw(_))));
}
#[test]
fn streaming_preserves_a_large_valid_cff_outline() {
// Minimal CFF with more than 100,000 line segments.
let mut program = vec![139, 139, 21];
for _ in 0..100_001 {
program.extend_from_slice(&[140, 6]);
}
program.push(14);
let bytes = cff_font(&program);
let shared = FontOutline::from_bytes(&bytes, 0, &[]).unwrap();
struct Count(usize);
impl GlyphPen for Count {
fn move_to(&mut self, _: f32, _: f32) {
self.0 += 1;
}
fn line_to(&mut self, _: f32, _: f32) {
self.0 += 1;
}
fn quad_to(&mut self, _: f32, _: f32, _: f32, _: f32) {
self.0 += 1;
}
fn curve_to(&mut self, _: f32, _: f32, _: f32, _: f32, _: f32, _: f32) {
self.0 += 1;
}
fn close(&mut self) {
self.0 += 1;
}
}
impl OutlinePen for Count {
fn move_to(&mut self, x: f32, y: f32) {
GlyphPen::move_to(self, x, y);
}
fn line_to(&mut self, x: f32, y: f32) {
GlyphPen::line_to(self, x, y);
}
fn quad_to(&mut self, x1: f32, y1: f32, x: f32, y: f32) {
GlyphPen::quad_to(self, x1, y1, x, y);
}
fn curve_to(&mut self, x1: f32, y1: f32, x2: f32, y2: f32, x: f32, y: f32) {
GlyphPen::curve_to(self, x1, y1, x2, y2, x, y);
}
fn close(&mut self) {
GlyphPen::close(self);
}
}
let mut old = Count(0);
FontRef::new(&bytes)
.unwrap()
.outline_glyphs()
.get(GlyphId::new(0))
.unwrap()
.draw(DrawSettings::unhinted(Size::unscaled(), &Location::default()), &mut old)
.unwrap();
let mut count = Count(0);
shared.draw_to(0, &mut count).unwrap();
assert_eq!(count.0, old.0);
assert!(count.0 > MAX_OUTLINE_ELEMENTS);
assert!(matches!(shared.outline(0), Err(OutlineError::TooComplex)));
}
}
+178
View File
@@ -0,0 +1,178 @@
//! Minimal SFNT (TrueType / OpenType / collection) header reader for font discovery: reads only
//! the table directory, `name` and `OS/2` of each face, so scanning a system font folder does not
//! load whole files.
use std::io::{Read, Seek, SeekFrom};
/// The tables skrifa reads glyph outlines from: TrueType, CFF, CFF2 and VARC. The renderer draws
/// no glyph of a face that has none of them, such as a face with bitmaps only or with its outlines
/// in Apple's `hvgl` table.
const OUTLINE_TABLES: [&[u8; 4]; 4] = [b"glyf", b"CFF ", b"CFF2", b"VARC"];
/// Names and style attributes of one face in a font file.
#[derive(Clone, Debug, PartialEq)]
pub struct FaceNames {
pub index: u32,
pub family: String,
pub style: String,
pub full_name: String,
pub weight: u16,
pub italic: bool,
}
fn be16(b: &[u8], o: usize) -> Option<u16> {
Some(u16::from_be_bytes([*b.get(o)?, *b.get(o + 1)?]))
}
fn be32(b: &[u8], o: usize) -> Option<u32> {
Some(u32::from_be_bytes([*b.get(o)?, *b.get(o + 1)?, *b.get(o + 2)?, *b.get(o + 3)?]))
}
fn read_at<R: Read + Seek>(r: &mut R, off: u64, len: usize) -> Option<Vec<u8>> {
if len > 4 << 20 {
return None;
}
r.seek(SeekFrom::Start(off)).ok()?;
let mut v = vec![0u8; len];
r.read_exact(&mut v).ok()?;
Some(v)
}
/// Read the names of every face in a font file (a single font or a collection). Faces with none
/// of the `OUTLINE_TABLES` are left out.
pub fn read_faces<R: Read + Seek>(r: &mut R) -> Vec<FaceNames> {
let Some(head) = read_at(r, 0, 12) else { return Vec::new() };
let offsets: Vec<u32> = if &head[0..4] == b"ttcf" {
let n = be32(&head, 8).unwrap_or(0).min(256) as usize;
let Some(t) = read_at(r, 12, n * 4) else { return Vec::new() };
(0..n).filter_map(|i| be32(&t, i * 4)).collect()
} else {
vec![0]
};
offsets.iter().enumerate().filter_map(|(i, &o)| read_face(r, o as u64, i as u32)).collect()
}
/// Names from in-memory font data.
pub fn read_faces_bytes(data: &[u8]) -> Vec<FaceNames> {
read_faces(&mut std::io::Cursor::new(data))
}
fn read_face<R: Read + Seek>(r: &mut R, off: u64, index: u32) -> Option<FaceNames> {
let h = read_at(r, off, 12)?;
let tag = &h[0..4];
if tag != [0, 1, 0, 0] && tag != b"OTTO" && tag != b"true" {
return None;
}
let n = be16(&h, 4)? as usize;
let dir = read_at(r, off + 12, n * 16)?;
if !dir.as_chunks::<16>().0.iter().any(|rec| OUTLINE_TABLES.iter().any(|t| rec.starts_with(*t))) {
return None;
}
let mut name = None;
let mut os2 = None;
for i in 0..n {
let rec = &dir[i * 16..i * 16 + 16];
let (o, l) = (be32(rec, 8)? as u64, be32(rec, 12)? as usize);
match &rec[0..4] {
b"name" => name = Some((o, l)),
b"OS/2" => os2 = Some((o, l)),
_ => {}
}
}
let (no, nl) = name?;
let nb = read_at(r, no, nl)?;
let get = |id: u16| name_string(&nb, id);
let family = get(16).or_else(|| get(1))?;
let style = get(17).or_else(|| get(2)).unwrap_or_else(|| "Regular".into());
let full_name = get(4).unwrap_or_else(|| format!("{family} {style}"));
let (mut weight, mut italic) = (400u16, false);
if let Some((oo, ol)) = os2
&& let Some(ob) = read_at(r, oo, ol.min(78))
{
weight = be16(&ob, 4).unwrap_or(400);
italic = be16(&ob, 62).is_some_and(|fs| fs & 1 != 0);
}
let sl = style.to_ascii_lowercase();
italic |= sl.contains("italic") || sl.contains("oblique");
Some(FaceNames { index, family, style, full_name, weight, italic })
}
/// A name-table string by id, preferring Windows Unicode English, then any Unicode, then Mac Roman.
fn name_string(b: &[u8], id: u16) -> Option<String> {
let count = be16(b, 2)? as usize;
let storage = be16(b, 4)? as usize;
let mut best: Option<(u8, String)> = None;
for i in 0..count {
let r = 6 + i * 12;
let (plat, enc, lang, nid, len, off) =
(be16(b, r)?, be16(b, r + 2)?, be16(b, r + 4)?, be16(b, r + 6)?, be16(b, r + 8)? as usize, be16(b, r + 10)? as usize);
if nid != id {
continue;
}
let rank = match plat {
3 if enc == 1 || enc == 10 => {
if best.as_ref().is_some_and(|(current, _)| *current <= if lang == 0x409 { 0 } else { 1 }) {
continue;
}
if lang == 0x409 { 0 } else { 1 }
}
0 => {
if best.as_ref().is_some_and(|(current, _)| *current <= 2) {
continue;
}
2
}
1 if enc == 0 => {
if best.as_ref().is_some_and(|(current, _)| *current <= 3) {
continue;
}
3
}
_ => continue,
};
// Only decode a record that can improve the selected name. A hostile name table may
// point thousands of records at the same huge string.
let raw = b.get(storage + off..storage + off + len)?;
let s = match plat {
3 => {
let u: Vec<u16> = raw.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect();
String::from_utf16_lossy(&u)
}
0 => {
let u: Vec<u16> = raw.as_chunks::<2>().0.iter().map(|c| u16::from_be_bytes([c[0], c[1]])).collect();
String::from_utf16_lossy(&u)
}
1 => raw.iter().map(|&c| if c < 128 { c as char } else { '?' }).collect(),
_ => return None,
};
best = Some((rank, s));
}
best.map(|(_, s)| s).filter(|s| !s.trim().is_empty())
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn later_non_improving_name_records_are_not_decoded() {
// The first record is the preferred Windows-English value. The second names an invalid
// range: it must be ignored instead of making the whole name lookup fail.
let mut table = vec![0; 30];
table[2..4].copy_from_slice(&2u16.to_be_bytes());
table[4..6].copy_from_slice(&30u16.to_be_bytes());
let first = 6usize;
table[first..first + 2].copy_from_slice(&3u16.to_be_bytes());
table[first + 2..first + 4].copy_from_slice(&1u16.to_be_bytes());
table[first + 4..first + 6].copy_from_slice(&0x409u16.to_be_bytes());
table[first + 6..first + 8].copy_from_slice(&1u16.to_be_bytes());
table[first + 8..first + 10].copy_from_slice(&4u16.to_be_bytes());
let second = first + 12;
table[second..second + 2].copy_from_slice(&3u16.to_be_bytes());
table[second + 2..second + 4].copy_from_slice(&1u16.to_be_bytes());
table[second + 4..second + 6].copy_from_slice(&0x409u16.to_be_bytes());
table[second + 6..second + 8].copy_from_slice(&1u16.to_be_bytes());
table[second + 8..second + 10].copy_from_slice(&u16::MAX.to_be_bytes());
table.extend_from_slice(&[0, b'A', 0, b'B']);
assert_eq!(name_string(&table, 1).as_deref(), Some("AB"));
}
}
+17
View File
@@ -568,3 +568,20 @@ fn a_read_is_capped_where_the_file_has_grown() {
assert!(matches!(read_capped(&path.with_extension("missing"), 9), Err(FontFileError::Io(_))));
let _ = std::fs::remove_file(&path);
}
#[test]
fn bounded_sfnt_reader_preserves_face_names_and_collection_indices() {
let mut bold = spec("Example", "Bold Italic", 700);
bold.italic = true;
let data = font(&bold);
let faces = crate::sfnt::read_faces_bytes(&data);
assert_eq!(faces.len(), 1);
assert_eq!((&*faces[0].family, &*faces[0].style, faces[0].weight, faces[0].italic), ("Example", "Bold Italic", 700, true));
let mut hidden = spec("Hidden", "Regular", 400);
hidden.outlines = false;
let combined = collection(&[font(&hidden), data]);
let faces = crate::sfnt::read_faces_bytes(&combined);
assert_eq!(faces.len(), 1);
assert_eq!((faces[0].index, faces[0].family.as_str()), (1, "Example"));
assert!(crate::sfnt::read_faces_bytes(b"invalid").is_empty());
}
+3 -3
View File
@@ -15,7 +15,7 @@
//! `IRMAK` and `ırmak`. Plain `str::to_lowercase` follows no locale and turns `İ` into `i` plus a
//! combining dot, which nothing typed would match.
//!
//! The Turkish i handling and sigma folding come from PdfCraft's `fold_case` (snipeTR,
//! The Turkish i handling and sigma folding come from `PdfCraft`'s `fold_case` (snipeTR,
//! nevicia2010-hub).
use std::ops::Range;
@@ -85,7 +85,7 @@ impl Folder {
}
/// One cluster, already in NFKD.
fn fold_cluster(&self, cluster: &str, out: &mut String) {
fn fold_cluster(self, cluster: &str, out: &mut String) {
let mut chars = cluster.chars().peekable();
while let Some(c) = chars.next() {
match c {
@@ -363,10 +363,10 @@ mod tests {
#[test]
fn matches_map_back_to_the_source() {
let f = Folder::new("en");
fn find<'a>(f: Folder, haystack: &'a str, needle: &str) -> Option<&'a str> {
f.fold(haystack).find(&f.fold(needle)).map(|r| &haystack[r])
}
let f = Folder::new("en");
let find = |haystack, needle| find(f, haystack, needle);
assert_eq!(find("Große Straße", "strasse"), Some("Straße"));
assert_eq!(find("Große Straße", "SS"), Some("ß"));
+5 -4
View File
@@ -4,7 +4,7 @@
use std::fmt;
use fixed_decimal::{Decimal, Sign};
use icu_decimal::{DecimalFormatter, parts};
use icu_decimal::{DecimalFormatter, options::DecimalFormatterOptions, parts};
use icu_locale_core::Locale;
use icu_locale_core::extensions::unicode::{key, value};
use writeable::{Part, PartsWrite, Writeable};
@@ -46,7 +46,8 @@ impl Format {
if digits == Digits::Latin {
locale.extensions.unicode.keywords.set(key!("nu"), value!("latn"));
}
let decimal = data::provider().and_then(|p| DecimalFormatter::try_new_with_buffer_provider(p, (&locale).into(), Default::default()).ok());
let decimal = data::provider()
.and_then(|p| DecimalFormatter::try_new_with_buffer_provider(p, (&locale).into(), DecimalFormatterOptions::default()).ok());
let mut format = Format { decimal, group: None, point: None, percent: ("", "%"), marks: Marks::default() };
// The locale's own separators and digits, read from a number that shows them all.
let probe = format.parts(&Decimal::try_from_str("-1234567.5").unwrap_or_default());
@@ -212,7 +213,7 @@ impl PartsWrite for Sink<'_> {
_ => return result,
};
if slot.is_empty() {
*slot = written.to_owned();
written.clone_into(slot);
}
}
result
@@ -370,7 +371,7 @@ mod tests {
for (tag, want) in
[("en", "50%"), ("de", "50\u{a0}%"), ("fr", "12,5\u{a0}%"), ("tr", "%50"), ("ar-EG", "٥٠٪\u{61c}"), ("fa", "۵۰٪"), ("hi", "50%")]
{
let decimals = if tag == "fr" { 1 } else { 0 };
let decimals = usize::from(tag == "fr");
let ratio = if tag == "fr" { 0.125 } else { 0.5 };
assert_eq!(Format::from_tag(tag).percent(ratio, decimals), want, "{tag}");
}
+6 -5
View File
@@ -113,7 +113,9 @@ impl Locale {
rows.entry(e.context).or_default().insert(e.source, e.translation);
}
}
problems.iter().for_each(|p| log::warn!("translation catalog: {p}; row skipped"));
for p in &problems {
log::warn!("translation catalog: {p}; row skipped");
}
Parsed { rows, problems }
})
}
@@ -483,14 +485,13 @@ fn wrap(initiator: char, value: &str) -> String {
PDF if open.last() == Some(&false) => {
open.pop();
}
PDF => continue,
PDI if isolates > 0 => {
while open.pop() == Some(false) {
out.push(PDF);
}
isolates -= 1;
}
PDI => continue,
PDF | PDI => continue,
_ => {}
}
out.push(c);
@@ -713,11 +714,11 @@ fn plural_rules(code: &str) -> Option<(PluralRules, Vec<PluralCategory>)> {
categories.push(c);
}
}
categories.sort_by_key(rank);
categories.sort_by_key(|c| rank(*c));
Some((rules, categories))
}
fn rank(c: &PluralCategory) -> u8 {
fn rank(c: PluralCategory) -> u8 {
match c {
PluralCategory::Zero => 0,
PluralCategory::One => 1,
+11
View File
@@ -80,6 +80,12 @@ impl Format {
///
/// Percent signs, units and the space before a unit (`50 %`, `12 px`) are not read; strip them
/// first. Anything else is an error rather than a guess.
///
/// # Errors
///
/// Returns `NumberError::Empty` for an empty input or one reduced to spaces and a sign,
/// `Unexpected` for an invalid character, `MixedDigits` for mixed digit sets, `Separator`
/// for misplaced marks, and `TooLarge` when the parsed value is not finite.
pub fn parse(&self, text: &str) -> Result<f64, NumberError> {
let marks = self.marks;
let text: String = text.chars().filter(|c| !is_bidi_mark(*c)).collect();
@@ -129,6 +135,11 @@ impl Format {
/// The number in `text` as `locale` (a language tag, `de-CH`, `ar_EG.UTF-8`) writes it:
/// [`Format::parse`] for [`Format::from_tag`]. Build the [`Format`] once to read many numbers. A
/// locale CLDR doesn't know reads as CLDR's root does (`1,234.5`).
///
/// # Errors
///
/// Returns the same `NumberError` as [`Format::parse`] for invalid digits, characters, or
/// separators, or when the value is not finite.
pub fn parse_number(text: &str, locale: &str) -> Result<f64, NumberError> {
Format::from_tag(locale).parse(text)
}
+1
View File
@@ -298,6 +298,7 @@ fn from_apple(identifier: &str, metric: bool, decimal: &str, grouping: &str, hou
/// A grouping separator the system sets: none at all when empty (Windows' `sThousand` the user
/// cleared), else one character.
#[cfg(any(test, windows, target_vendor = "apple"))]
#[expect(clippy::option_option, reason = "The public setting distinguishes following the locale, no grouping, and a custom separator")]
fn grouping(s: &str) -> Option<Option<char>> {
if s.is_empty() { Some(None) } else { single_char(s).map(Some) }
}
+17 -5
View File
@@ -113,7 +113,10 @@ pub enum Han {
/// Latin.
// ponytail: the languages a Craft app ships or could plausibly ship; add a row with the locale.
pub fn scripts(tag: &str) -> &'static [Script] {
use Script::*;
use Script::{
Arab, Armn, Beng, Cyrl, Deva, Ethi, Geor, Grek, Gujr, Guru, Hang, Hani, Hebr, Hira, Kana, Khmr, Knda, Laoo, Latn, Mlym, Mymr, Orya, Sinh,
Syrc, Taml, Telu, Thaa, Thai, Tibt,
};
let tag = Subtags::parse(tag);
if let Some(s) = tag.script.as_deref().and_then(subtag_scripts) {
return s;
@@ -175,7 +178,7 @@ pub fn base_direction(text: &str) -> Option<Direction> {
/// The forms a language tag's Han characters take: `zh-CN`, `zh-SG`, `zh-Hans` and plain `zh` →
/// Simplified; `zh-TW`, `zh-Hant` and the other regions CLDR writes in Traditional characters
/// (`zh-US`, `zh-AU`) → Traditional; `zh-HK`, `zh-MO`, `zh-Hant-HK` and `yue` → HongKong; `ja` →
/// (`zh-US`, `zh-AU`) → Traditional; `zh-HK`, `zh-MO`, `zh-Hant-HK` and `yue` → `HongKong`; `ja` →
/// Japanese; `ko` → Korean. `None` for a language not written with Han, which leaves the choice
/// to the font stack.
pub fn han(tag: &str) -> Option<Han> {
@@ -202,8 +205,14 @@ pub fn han(tag: &str) -> Option<Han> {
// ponytail: mn-CN → Mong is left out until vertical Mongolian layout is supported.
pub(crate) fn region_script(language: &str, region: &str) -> Option<&'static str> {
Some(match (language, region) {
("az", "iq" | "ir") | ("ha", "cm" | "sd") | ("kk", "af" | "cn" | "ir" | "mn") | ("ku", "iq" | "ir" | "lb") => "arab",
("ky", "cn") | ("ms", "cc") | ("pa", "pk") | ("tg", "pk") | ("uz", "af") => "arab",
("az", "iq" | "ir")
| ("ha", "cm" | "sd")
| ("kk", "af" | "cn" | "ir" | "mn")
| ("ku", "iq" | "ir" | "lb")
| ("ky", "cn")
| ("ms", "cc")
| ("pa" | "tg", "pk")
| ("uz", "af") => "arab",
("az", "ru") | ("ku", "am" | "az" | "ge" | "tm") | ("ug", "kz" | "mn") | ("uz", "cn") => "cyrl",
("ky", "tr") | ("sr", "me" | "ro" | "tr") => "latn",
("sd", "in") => "deva",
@@ -216,7 +225,10 @@ pub(crate) fn region_script(language: &str, region: &str) -> Option<&'static str
/// The scripts a script subtag stands for, including the CLDR unions (`jpan`, `kore`). `None` for
/// one not in [`Script`], so the language's own scripts apply.
fn subtag_scripts(subtag: &str) -> Option<&'static [Script]> {
use Script::*;
use Script::{
Arab, Armn, Beng, Cyrl, Deva, Ethi, Geor, Grek, Gujr, Guru, Hang, Hani, Hebr, Hira, Kana, Khmr, Knda, Laoo, Latn, Mlym, Mong, Mymr, Orya,
Sinh, Syrc, Taml, Telu, Thaa, Thai, Tibt,
};
Some(match subtag {
"hans" | "hant" | "hani" => &[Hani],
"jpan" => &[Hani, Hira, Kana],
+5
View File
@@ -104,6 +104,10 @@ impl FileSize {
}
/// The unit `bytes` is written in, the number in it and its digits after the point.
#[expect(
clippy::cast_precision_loss,
reason = "File sizes are displayed as rounded f64 values; exact u64 arithmetic is not required for presentation"
)]
fn parts(&self, bytes: u64) -> (SizeUnit, f64, usize) {
let (smallest, largest) = (self.smallest.min(self.largest), self.largest);
let mut unit = smallest;
@@ -137,6 +141,7 @@ impl FileSize {
}
}
#[expect(clippy::cast_precision_loss, reason = "Unit scales are displayed as f64 values; exact u64 arithmetic is not required for presentation")]
fn scale(&self, unit: SizeUnit) -> f64 {
(self.step as f64).powi(unit as i32)
}
+5
View File
@@ -15,6 +15,9 @@ corpus = []
default = []
avif = ["image/avif", "dep:ravif", "dep:rav1e", "dep:avif-serialize"]
heif = ["dep:craft-heif"]
# AVIF decode: craft-video's clean-room pure-Rust AV1 decoder. Native targets only (on wasm32 a
# decoder panic aborts instead of becoming an error), so wasm32 builds leave AVIF unreadable.
avif-decode = ["dep:craft-video", "craft-video/av1-decode"]
[dependencies]
crc32fast = "1.5"
@@ -32,6 +35,7 @@ zune-core = "0.5"
jpeg-encoder = "0.6"
craft-jpeg = { workspace = true }
craft-metadata = { workspace = true }
craft-tiff = { workspace = true }
zune-jpegxl = { version = "=0.5.2", default-features = false, features = ["std"] }
craft-heif = { workspace = true, optional = true }
ravif = { version = "0.13", default-features = false, optional = true }
@@ -41,6 +45,7 @@ hayro-jpeg2000 = { version = "=0.3.5", default-features = false, features = ["st
[target.'cfg(not(target_arch = "wasm32"))'.dependencies]
rayon = { workspace = true }
craft-video = { workspace = true, optional = true }
exr = { version = "1.73", default-features = false, features = ["rayon"] }
[dev-dependencies]
+19 -8
View File
@@ -1,9 +1,10 @@
# craft-image-codecs
Codecs for flat raster image formats, written in pure Rust. This crate defines its own `Image`
type and shares its baseline and extended JPEG decoders through `craft-jpeg`, and its optional
HEIF decoder through `craft-heif`. It builds for `wasm32-unknown-unknown` and does no filesystem
I/O: decoders take `&[u8]` and encoders return `Vec<u8>`.
type and shares its baseline and extended JPEG decoders through `craft-jpeg`, its optional HEIF
decoder through `craft-heif`, and its optional AVIF decoder through `craft-video`'s AV1 decoder.
It builds for `wasm32-unknown-unknown` and does no filesystem I/O: decoders take `&[u8]` and
encoders return `Vec<u8>`.
It follows the "Avoiding GIMP's hole" rules in `docs/architecture.md` §1.1:
@@ -57,7 +58,7 @@ craft-image-codecs = { git = "https://github.com/storytold/craft-libs", rev = "<
| DICOM | yes | **no** | U8, U16 | Gray, RGB | no | no | no | no | no | no | n/a | built in |
| Amiga IFF (ILBM/PBM) | yes | yes (24-bit ILBM) | U8 | RGB, RGBA | yes (1-bit mask plane on write) | no | no | no | no | no | no | built in |
| JPEG-LS (`.jls`) | yes (any NEAR; one scan per component) | yes (lossless) | U8, U16 | Gray, RGB | no | no | no | no | no | no | no | built in |
| AVIF | **no** | only with feature `avif` | U8 | RGB, RGBA | yes | no | no | no | no | no | yes | `image` + `ravif` |
| AVIF | with feature `avif-decode` (native only) | only with feature `avif` | U8, U16 (10/12-bit decodes to U16; PQ/HLG to linear F32) | RGB, RGBA | yes (auxiliary alpha) | read (`colr` prof/rICC) | read | read | no | no | yes | `craft-video` AV1 decoder; `image` + `ravif` to write |
| HEIF/HEIC | with feature `heif` | **no** | U8, U16 (10/12-bit decodes to U16) | RGB, RGBA | yes (auxiliary alpha) | yes (`colr` prof) | yes | yes | no | no | n/a | `heic-rs` |
"Native" means the data is stored and read back without conversion. Anything else is converted by
@@ -178,10 +179,20 @@ embedded table (and a PNG's transparent entry) so `photocraft-io` can open them
decodes to RGB. Image sequences, overlays and identity derivations, multilayer HEVC and some
4:2:2/4:4:4 streams return `CodecError::Unsupported` or `Malformed`, never wrong pixels. Writing
needs an HEVC encoder and every mature one is C, so HEIF is listed in `ASYMMETRIC_EXCEPTIONS`.
* **AVIF.** Encoding uses `ravif`, which is pure Rust. Decoding
needs `dav1d`, which is C. AVIF is therefore read-unsupported, and write support is gated
behind the non-default `avif` feature. In a default build it is neither readable nor writable,
so the symmetric guarantee holds. It is listed in `ASYMMETRIC_EXCEPTIONS`.
* **AVIF.** Encoding uses `ravif`, which is pure Rust, behind the non-default `avif` feature.
Decoding (`codecs::avif_decode`, behind the non-default `avif-decode` feature) reads the HEIF
boxes itself and decodes the AV1 pictures with `craft-video`'s clean-room pure-Rust AV1 decoder:
one `av01` image or a `grid`, 8/10/12-bit, 4:2:0/4:2:2/4:4:4/monochrome, the `nclx` colour (or
the sequence header's) and an ICC profile, an `auxl` alpha plane (`prem` too), the Exif and XMP
items, and `clap`/`irot`/`imir`, which are applied unless `keep_orientation` is set, as for HEIF.
PQ and HLG open as linear light in F32, as HEIF does. Image sequences (animated AVIF), depth and
gain-map auxiliary images and layered progressive images aren't read. It is bounded like the
other decoders: the `Limits` are checked against the declared size before any picture decodes,
against every picture and every output buffer, `max_alloc` caps the AV1 decoder's picture store,
box, item and extent counts are capped, item data can't exceed the file, and a decoder panic is
`CodecError::Malformed`. wasm32 builds leave AVIF unreadable, since a panic there aborts. In a
default build AVIF is neither readable nor writable, so the symmetric guarantee holds; a build
with only one of the two features is listed in `ASYMMETRIC_EXCEPTIONS`.
* **Lossy WebP.** Lossless (VP8L, via `image-webp`) is the default. `webp_lossless: false`
writes a lossy file with our own clean-room VP8 key-frame encoder (`codecs::vp8`, from
RFC 6386; `webp_quality` 0–100 on libwebp's scale sets the quantizer). Alpha travels losslessly
+8 -1
View File
@@ -14,7 +14,7 @@ cargo-fuzz = true
[dependencies]
libfuzzer-sys = "0.4"
craft-image-codecs = { path = "..", features = ["heif"] }
craft-image-codecs = { path = "..", features = ["heif", "avif-decode"] }
# Called directly too: the codec turns its panics into errors (see decode_heif.rs).
heic-rs = "=0.1.4"
@@ -76,3 +76,10 @@ path = "fuzz_targets/decode_webp.rs"
test = false
doc = false
bench = false
[[bin]]
name = "decode_avif"
path = "fuzz_targets/decode_avif.rs"
test = false
doc = false
bench = false
@@ -0,0 +1,14 @@
#![no_main]
use libfuzzer_sys::fuzz_target;
use craft_image_codecs::{decode_as_with, probe_size, DecodeOptions, Format, Limits};
// The AVIF box reader and craft-video's AV1 decoder parse untrusted files: run with `-timeout=10`
// so a hang is reported, not just a panic. The codec turns an AV1 decoder panic into an error, so
// only the box reader's own panics would reach the fuzzer. Both orientation paths are covered.
fuzz_target!(|data: &[u8]| {
let keep_orientation = data.first().is_some_and(|b| b & 1 == 1);
let limits = Limits { max_width: 4096, max_height: 4096, max_pixels: 1 << 22, max_alloc: 256 << 20 };
let _ = probe_size(data);
let _ = decode_as_with(Format::Avif, data, &DecodeOptions { limits, keep_orientation });
});
+80
View File
@@ -247,3 +247,83 @@ fn read_le24(bytes: &[u8], at: usize) -> Option<u32> {
let b = bytes.get(at..at.checked_add(3)?)?;
Some(u32::from_le_bytes([b[0], b[1], b[2], 0]))
}
/// Probe the stored dimensions of the first PNG, JPEG, BMP or TIFF image, without decoding
/// pixels or applying orientation. TIFF uses the first directory even if it is a thumbnail.
/// The caller's limits bound both the header decoder and the declared output dimensions.
pub fn probe_stored_size(bytes: &[u8], limits: &crate::Limits) -> Result<(u32, u32), CodecError> {
use std::io::Cursor;
let format = crate::detect(bytes).ok_or(CodecError::UnknownFormat)?;
if !matches!(format, Format::Png | Format::Jpeg | Format::Bmp | Format::Tiff) {
return Err(CodecError::unsupported(format, "stored-size probe is not available for this format"));
}
// The JPEG header reader owns a copy of its input before applying image limits.
if format == Format::Jpeg && u64::try_from(bytes.len()).map_or(true, |len| len > limits.max_alloc) {
return Err(CodecError::malformed(format, "JPEG input exceeds the allocation budget"));
}
let image_format = match format {
Format::Png => image::ImageFormat::Png,
Format::Jpeg => image::ImageFormat::Jpeg,
Format::Bmp => image::ImageFormat::Bmp,
Format::Tiff => image::ImageFormat::Tiff,
_ => return Err(CodecError::unsupported(format, "stored-size probe is not available for this format")),
};
// Preserve detect's BigTIFF selection; image's signature guesser only knows classic TIFF.
let mut reader = image::ImageReader::with_format(Cursor::new(bytes), image_format);
let mut image_limits = image::Limits::default();
image_limits.max_image_width = Some(limits.max_width);
image_limits.max_image_height = Some(limits.max_height);
image_limits.max_alloc = Some(limits.max_alloc);
reader.limits(image_limits);
let (w, h) = reader.into_dimensions().map_err(|e| CodecError::malformed(format, e))?;
limits.check_size(w, h)?;
Ok((w, h))
}
#[cfg(test)]
mod stored_size_tests {
#![allow(clippy::unwrap_used)]
use super::*;
use std::io::Cursor;
#[test]
fn stored_probe_uses_caller_limits_without_decoding() {
let mut bmp = Cursor::new(Vec::new());
image::write_buffer_with_format(&mut bmp, &vec![0; 60_000 * 3], 1, 60_000, image::ExtendedColorType::Rgb8, image::ImageFormat::Bmp).unwrap();
let bytes = bmp.into_inner();
let limits = crate::Limits::new(u32::MAX, u32::MAX, 128_000_000, 2_048_000_000);
assert_eq!(probe_stored_size(&bytes, &limits).unwrap(), (1, 60_000));
assert!(probe_stored_size(&bytes, &crate::Limits::new(u32::MAX, 50_000, u64::MAX, 2_048_000_000)).is_err());
assert!(probe_stored_size(&bytes[..20], &limits).is_err());
}
#[test]
fn bigtiff_stored_dimensions_preserve_detected_format() {
let mut out = Cursor::new(Vec::new());
tiff::encoder::TiffEncoder::new_big(&mut out).unwrap().write_image::<tiff::encoder::colortype::RGB8>(3, 2, &[10; 18]).unwrap();
let bytes = out.into_inner();
assert_eq!(crate::detect(&bytes), Some(Format::Tiff));
assert_eq!(probe_stored_size(&bytes, &crate::Limits::default()).unwrap(), (3, 2));
}
#[test]
fn jpeg_input_copy_is_bounded_by_allocation_budget() {
let mut out = Cursor::new(Vec::new());
image::write_buffer_with_format(&mut out, &[10; 18], 3, 2, image::ExtendedColorType::Rgb8, image::ImageFormat::Jpeg).unwrap();
let bytes = out.into_inner();
let mut limits = crate::Limits { max_alloc: bytes.len() as u64, ..Default::default() };
assert_eq!(probe_stored_size(&bytes, &limits).unwrap(), (3, 2));
limits.max_alloc -= 1;
assert!(probe_stored_size(&bytes, &limits).is_err());
}
#[test]
fn common_stored_headers_are_probed() {
let limits = crate::Limits::new(100, 100, 10_000, 1 << 20);
for format in [image::ImageFormat::Png, image::ImageFormat::Jpeg, image::ImageFormat::Bmp, image::ImageFormat::Tiff] {
let mut out = Cursor::new(Vec::new());
image::write_buffer_with_format(&mut out, &[10; 18], 3, 2, image::ExtendedColorType::Rgb8, format).unwrap();
assert_eq!(probe_stored_size(&out.into_inner(), &limits).unwrap(), (3, 2), "{format:?}");
}
}
}
+1 -1
View File
@@ -99,7 +99,7 @@ pub fn linear_to_pq(linear: f32) -> f32 {
/// Relative luminance weights of the RGB primaries `code` (BT.2020's for anything else, the
/// space BT.2100 defines HLG in).
fn luma_weights(code: u16) -> [f32; 3] {
pub(crate) fn luma_weights(code: u16) -> [f32; 3] {
match code {
1 => [0.2126, 0.7152, 0.0722],
12 => [0.2290, 0.6917, 0.0793],
+2
View File
@@ -1,4 +1,6 @@
pub(crate) mod avif;
#[cfg(all(feature = "avif-decode", not(target_arch = "wasm32")))]
pub(crate) mod avif_decode;
pub(crate) mod dds;
pub(crate) mod dds_bc;
pub(crate) mod deep_exr;
File diff suppressed because it is too large. Load diff
+22 -1
View File
@@ -654,6 +654,8 @@ pub(crate) fn decode(b: &[u8], limits: &Limits) -> Result<Image, CodecError> {
let layout = if nf == 1 { ChannelLayout::Gray } else { ChannelLayout::Rgb };
let sample = if precision <= 8 { SampleType::U8 } else { SampleType::U16 };
limits.check(width as u32, height as u32, layout, sample)?;
// Each scan retains u16 samples even when the final image is 8-bit.
limits.check_bytes(width as u32, height as u32, 2)?;
let components = (0..nf).map(|i| seg[6 + 3 * i]).collect();
frame = Some(Frame { precision, width, height, components });
}
@@ -731,7 +733,7 @@ fn finish(frame: Option<Frame>, planes: Vec<Vec<u16>>, scans: usize) -> Result<I
}
};
if p <= 8 {
let to8 = |v: u16| -> u8 { if p == 8 { v as u8 } else { (scale(v) >> 8) as u8 } };
let to8 = |v: u16| -> u8 { if p == 8 { v as u8 } else { (u32::from(v) * 255 / ((1u32 << p) - 1)) as u8 } };
let mut data = Vec::with_capacity(w * h * nc);
for i in 0..w * h {
for plane in &planes {
@@ -784,6 +786,25 @@ mod tests {
Plan { layout: img.layout(), sample: img.sample_type() }
}
#[test]
fn low_precision_samples_span_the_full_output_range() {
for precision in 2..=7 {
let max = (1u16 << precision) - 1;
let f = Frame { precision, width: usize::from(max) + 1, height: 1, components: vec![1] };
let image = finish(Some(f), vec![(0..=max).collect()], 1).unwrap();
let expected: Vec<u8> = (0..=max).map(|v| (u32::from(v) * 255 / u32::from(max)) as u8).collect();
assert_eq!(image.data(), expected);
}
}
#[test]
fn eight_bit_scan_intermediate_respects_allocation_limit() {
let img = image(8, 8, ChannelLayout::Gray, false, 0);
let bytes = encode(&img, plan(&img)).unwrap();
assert!(matches!(decode(&bytes, &Limits::new(8, 8, 64, 127)), Err(CodecError::LimitExceeded(_))));
assert!(decode(&bytes, &Limits::new(8, 8, 64, 128)).is_ok());
}
#[test]
fn round_trips_noise_flat_and_smooth_images() {
for layout in [ChannelLayout::Gray, ChannelLayout::Rgb] {
+9 -4
View File
@@ -26,7 +26,8 @@ pub enum Format {
OpenExr,
/// Radiance RGBE.
Hdr,
/// Encode-only behind the `avif` feature; see [`ASYMMETRIC_EXCEPTIONS`].
/// Encoded behind the `avif` feature and decoded behind `avif-decode` (native targets); see
/// [`ASYMMETRIC_EXCEPTIONS`] for a build with only one of them.
Avif,
/// HEIF/HEIC (HEVC-coded): read-only; see [`ASYMMETRIC_EXCEPTIONS`].
Heif,
@@ -91,8 +92,10 @@ pub const ASYMMETRIC_EXCEPTIONS: &[(Format, &str)] = &[
),
(
Format::Avif,
"AVIF encode uses ravif (pure Rust) but decoding requires dav1d (C); read stays unsupported \
until a pure-Rust AV1 decoder is viable. Only enabled with the non-default `avif` feature.",
"AVIF encode (ravif and rav1e, pure Rust) is behind the non-default `avif` feature and AVIF \
decode (craft-video's clean-room pure-Rust AV1 decoder) behind the non-default \
`avif-decode` feature, native targets only (on wasm32 a decoder panic would abort). A build \
with only one of them reads or writes AVIF, not both.",
),
(Format::Jxl, "Lossless JPEG XL export uses the pure-Rust zune-jpegxl encoder; JPEG XL reading is tracked separately and is not yet available."),
(
@@ -304,7 +307,9 @@ pub fn caps(format: Format) -> FormatCaps {
Format::Qoi => base,
Format::OpenExr => FormatCaps { depths: &[S::F16, S::F32], layouts: RGB_GRAY, ..base },
Format::Hdr => FormatCaps { depths: &[S::F32], layouts: &[L::Rgb], alpha: false, lossy: true, ..base },
Format::Avif => FormatCaps { read: false, write: cfg!(feature = "avif"), lossy: true, ..base },
Format::Avif => {
FormatCaps { read: cfg!(all(feature = "avif-decode", not(target_arch = "wasm32"))), write: cfg!(feature = "avif"), lossy: true, ..base }
}
Format::Heif => {
FormatCaps { read: cfg!(feature = "heif"), write: false, depths: &[S::U8, S::U16], icc: true, exif: true, xmp: true, lossy: true, ..base }
}
+19 -8
View File
@@ -33,8 +33,9 @@ pub mod orientation;
pub mod png_probe;
pub mod resolution;
pub mod source_settings;
pub mod tiff_probe;
pub mod web;
pub use crate::allocation::probe_allocation_size;
pub use crate::allocation::{probe_allocation_size, probe_stored_size};
pub use crate::cicp::Cicp;
pub use crate::cicp::ContentLightLevel;
pub use crate::codecs::avif::{HDR_REFERENCE_WHITE_NITS, HdrTransfer, encode_avif_hdr, encode_avif_with_speed};
@@ -110,7 +111,11 @@ pub fn decode_as_with(format: Format, bytes: &[u8], opts: &DecodeOptions) -> Res
Format::Heif => heif::decode(bytes, l, opts.keep_orientation),
Format::Jp2 => jp2::decode(bytes, l),
Format::Jxl => Err(CodecError::unsupported(format, "JPEG XL reading is not yet available; export is supported")),
Format::Gif | Format::Bmp | Format::Tga | Format::Ico | Format::Qoi | Format::Hdr | Format::Avif => via_image::decode(format, bytes, l),
#[cfg(all(feature = "avif-decode", not(target_arch = "wasm32")))]
Format::Avif => codecs::avif_decode::decode(bytes, l, opts.keep_orientation),
#[cfg(not(all(feature = "avif-decode", not(target_arch = "wasm32"))))]
Format::Avif => via_image::decode(format, bytes, l),
Format::Gif | Format::Bmp | Format::Tga | Format::Ico | Format::Qoi | Format::Hdr => via_image::decode(format, bytes, l),
}?;
finish_format(format, bytes, img, opts)
}
@@ -167,10 +172,11 @@ fn finish_format(format: Format, bytes: &[u8], mut img: Image, opts: &DecodeOpti
}
// Turn the pixels upright, like Photoshop: a TIFF records it in the decoded page's own
// directory, the others in their EXIF block. The metadata is rewritten to Orientation = 1
// on the way. HEIF keeps it in its container, and its decoder has already applied it.
// on the way. HEIF and AVIF keep it in their container, and their decoders have already
// applied it.
let o = match format {
Format::Tiff => tiff::orientation(bytes, None),
Format::Heif => 1,
Format::Heif | Format::Avif => 1,
Format::Dpx => dpx::orientation(bytes),
Format::Cineon => dpx::cineon_orientation(bytes),
_ => img.meta.exif.as_deref().map_or(1, exif_orientation),
@@ -199,10 +205,11 @@ pub fn decode_png_rows<E: From<CodecError>>(
}
/// The upright pixel size [`decode`] would return, read from the file's header without decoding
/// pixels, for WebP, OpenEXR (flat) and the GIF/BMP/TGA/ICO/QOI/HDR family. It runs the same
/// pixels, for WebP, OpenEXR (flat), AVIF (with `avif-decode`) and the GIF/BMP/TGA/ICO/QOI/HDR family. It runs the same
/// header reads and size checks as the decoder (default [`Limits`]) and swaps the size for an
/// EXIF orientation of 5–8, so wherever [`decode`] succeeds the two agree. Other formats (and
/// deep EXR or AVIF) return [`CodecError::Unsupported`]: decode those to learn their size.
/// EXIF orientation of 5–8 (AVIF: its container's `clap` and `irot`), so wherever [`decode`]
/// succeeds the two agree. Other formats (and deep EXR) return [`CodecError::Unsupported`]: decode
/// those to learn their size.
pub fn probe_size(bytes: &[u8]) -> Result<(u32, u32), CodecError> {
let format = detect(bytes).ok_or(CodecError::UnknownFormat)?;
if !caps(format).read {
@@ -212,7 +219,11 @@ pub fn probe_size(bytes: &[u8]) -> Result<(u32, u32), CodecError> {
let (w, h, exif) = match format {
Format::WebP => webp::probe(bytes, l)?,
Format::OpenExr => exr::probe(bytes, l).map(|(w, h)| (w, h, None))?,
Format::Gif | Format::Bmp | Format::Tga | Format::Ico | Format::Qoi | Format::Hdr | Format::Avif => via_image::probe(format, bytes, l)?,
#[cfg(all(feature = "avif-decode", not(target_arch = "wasm32")))]
Format::Avif => codecs::avif_decode::probe(bytes, l).map(|(w, h)| (w, h, None))?,
#[cfg(not(all(feature = "avif-decode", not(target_arch = "wasm32"))))]
Format::Avif => via_image::probe(format, bytes, l)?,
Format::Gif | Format::Bmp | Format::Tga | Format::Ico | Format::Qoi | Format::Hdr => via_image::probe(format, bytes, l)?,
_ => return Err(CodecError::unsupported(format, "no header-only size probe")),
};
let o = exif.as_deref().map_or(1, exif_orientation);
+101
View File
@@ -0,0 +1,101 @@
//! First-directory TIFF inspection without decoding pixels.
/// A header inspection failure, distinguishing caller limits from unsupported decoder layouts.
#[derive(Debug, thiserror::Error)]
pub enum Error {
/// Dimensions exceed the caller's pixel limit.
#[error("TIFF dimensions {width}x{height} exceed the pixel limit")]
TooLarge {
/// Stored width.
width: u32,
/// Stored height.
height: u32,
},
/// The shared TIFF decoder does not support this layout.
#[error("unsupported TIFF: {0}")]
Unsupported(&'static str),
/// The file's header, directory or image-data bounds are malformed.
#[error("malformed TIFF: {0}")]
Malformed(String),
}
/// First-directory values needed to preflight decoding.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub struct DecodeInfo {
/// Stored width.
pub width: u32,
/// Stored height.
pub height: u32,
/// First sample's bit depth, defaulting to eight.
pub bit_depth: u8,
/// Raw orientation tag, if present.
pub orientation: Option<u16>,
}
fn first_directory(bytes: &[u8], max_pixels: u64) -> Result<(craft_tiff::Ifd, craft_tiff::image::ImageInfo), Error> {
let (tiff, complete) = craft_tiff::Tiff::parse_with_status(bytes, &Default::default()).map_err(|e| Error::Malformed(e.to_string()))?;
if !complete {
return Err(Error::Malformed("truncated TIFF".into()));
}
let ifd = tiff.ifds.into_iter().next().ok_or_else(|| Error::Malformed("no IFD".into()))?;
let info = ifd.image().map_err(|e| Error::Malformed(e.to_string()))?;
if info.width == 0 || info.height == 0 {
return Err(Error::Malformed("zero dimension".into()));
}
if u64::from(info.width) * u64::from(info.height) > max_pixels {
return Err(Error::TooLarge { width: info.width, height: info.height });
}
Ok((ifd, info))
}
/// Parse the first directory and enforce the pixel limit before decoding.
/// Unlike [`header`], this does not impose layout or strip checks ahead of the decoder.
pub fn decode_info(bytes: &[u8], max_pixels: u64) -> Result<DecodeInfo, Error> {
let (ifd, info) = first_directory(bytes, max_pixels)?;
Ok(DecodeInfo {
width: info.width,
height: info.height,
bit_depth: info.bits_per_sample.first().copied().unwrap_or(8) as u8,
orientation: ifd.u16(craft_tiff::tags::ORIENTATION),
})
}
/// Stored dimensions and orientation of the first directory, after checking the layouts and
/// image-data bounds required by the TIFF decoder. Compressed strips are not decompressed.
pub fn header(bytes: &[u8], max_pixels: u64) -> Result<(u32, u32, u16), Error> {
let (ifd, info) = first_directory(bytes, max_pixels)?;
let bits = info.bits_per_sample.first().copied().unwrap_or(1);
if bits < 8 && info.planar == 2 && info.samples_per_pixel > 1 {
return Err(Error::Unsupported("planar TIFF with samples narrower than a byte"));
}
if !(matches!(info.photometric, 0 | 1 | 2 | 3 | 5) || info.photometric == 6 && info.compression == 7) {
return Err(Error::Unsupported("colour type"));
}
if !matches!(info.compression, 1 | 4 | 5 | 7 | 8 | 32773 | 32946) {
return Err(Error::Unsupported("compression method"));
}
let len = bytes.len() as u64;
if info.offsets.is_empty()
|| info.offsets.iter().zip(&info.byte_counts).any(|(&o, &c)| c > 0 && (o >= len || (info.compression == 1 && o.saturating_add(c) > len)))
{
return Err(Error::Malformed("truncated: image data past the end of the file".into()));
}
let orientation = ifd.u16(craft_tiff::tags::ORIENTATION).filter(|o| (1..=8).contains(o)).unwrap_or(1);
Ok((info.width, info.height, orientation))
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn reads_first_directory_and_enforces_limits_and_bounds() {
let image = crate::Image::from_u8(2, 3, crate::ChannelLayout::Rgb, vec![42; 18]).unwrap();
let bytes = crate::encode(&image, crate::Format::Tiff, &crate::EncodeOptions::default()).unwrap();
assert_eq!(header(&bytes, 6).unwrap(), (2, 3, 1));
let info = decode_info(&bytes, 6).unwrap();
assert_eq!((info.width, info.height, info.bit_depth), (2, 3, 8));
assert!(matches!(decode_info(&bytes, 5), Err(Error::TooLarge { width: 2, height: 3 })));
assert!(matches!(header(&bytes, 5), Err(Error::TooLarge { width: 2, height: 3 })));
assert!(header(&bytes[..8], 6).is_err());
}
}
+12
View File
@@ -0,0 +1,12 @@
# AVIF decode fixtures
Small AVIF files from an independent encoder (libaom through FFmpeg 7.1), for `src/codecs/avif_decode.rs`.
- `quad-source.rgb`: the 33×17 source, raw RGB24 four-colour quadrants (red, green, blue, near-white).
- `quad-420-bt709.avif`: 8-bit 4:2:0, limited range, BT.709 matrix, odd size (FFmpeg leaves the primaries and transfer unspecified):
`ffmpeg -f rawvideo -pix_fmt rgb24 -s 33x17 -i quad-source.rgb -c:v libaom-av1 -crf 12 -still-picture 1 -pix_fmt yuv420p -colorspace bt709 -color_primaries bt709 -color_trc iec61966-2-1 -color_range tv quad-420-bt709.avif`
- `quad-420-bt709.dav1d.yuv`: that file's AV1 picture as libdav1d decodes it, planar 8-bit 4:2:0 (Y, then Cb, then Cr):
`ffmpeg -c:v libdav1d -i quad-420-bt709.avif -f rawvideo -pix_fmt yuv420p quad-420-bt709.dav1d.yuv`
- `quad-444-gbr-lossless.avif`: lossless 8-bit 4:4:4 with the identity (GBR) matrix, full range:
`ffmpeg -f rawvideo -pix_fmt rgb24 -s 33x17 -i quad-source.rgb -c:v libaom-av1 -crf 0 -still-picture 1 -pix_fmt gbrp -colorspace rgb -color_range pc quad-444-gbr-lossless.avif`.
It decodes to `quad-source.rgb` exactly.
Binary file not shown.

After

Width:  |  Height:  |  Size: 369 B

@@ -0,0 +1 @@
OOOOOOOOOOOOOOOOO鋳鋳鋳鋳鋳鋳鋳鋳OOOOOOOOOOOOOOOOO鋳鋳鋳鋳鋳鋳鋳鋳OOOOOOOOOOOOOOOOO鋳鋳鋳鋳鋳鋳鋳鋳OOOOOOOOOOOOOOOOO鋳鋳鋳鋳鋳鋳鋳鋳OOOOOOOOOOOOOOOOO鋳鋳鋳鋳鋳鋳鋳鋳OOOOOOOOOOOOOOOOO鋳鋳鋳鋳鋳鋳鋳鋳OOOOOOOOOOOOOOOOO鋳鋳鋳鋳鋳鋳鋳鋳OOOOOOOOOOOOOOOOO鋳鋳鋳鋳鋳鋳鋳鋳OOOOOOOOOOOOOOOOO鋳鋳鋳鋳鋳鋳鋳鋳HHHHHHHHHHHHHHHHH゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙HHHHHHHHHHHHHHHHH゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙HHHHHHHHHHHHHHHHH゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙HHHHHHHHHHHHHHHHH゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙HHHHHHHHHHHHHHHHH゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙HHHHHHHHHHHHHHHHH゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙HHHHHHHHHHHHHHHHH゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙HHHHHHHHHHHHHHHHH゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙゙ppppppppbUUUUUUUbppppppppbUUUUUUUbppppppppbUUUUUUUbmmmmmmmmbUUUUUUUb����r_______艦ヘヘヘヘヘヘヘヲ===※ノノノノノノノノヲ===※ノノノノノノノノヲ===※ノノノノノノノノヲ===¢ララララララララ�6666666�ラララララララ�6666666�ラララララララ�6666666�ロロロロロロロ�6666666�セセセセセセセォHHHHHHghhhhhhhhv===」llllllllv===」llllllllv===」llllllllv===-
Binary file not shown.

After

Width:  |  Height:  |  Size: 345 B

@@ -0,0 +1 @@
ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(ж(И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<И<<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ьрррррррррррррррррррррррррррррррррррррррррррррррр<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ьрррррррррррррррррррррррррррррррррррррррррррррррр<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ьрррррррррррррррррррррррррррррррррррррррррррррррр<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ьрррррррррррррррррррррррррррррррррррррррррррррррр<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ьрррррррррррррррррррррррррррррррррррррррррррррррр<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ьрррррррррррррррррррррррррррррррррррррррррррррррр<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ьрррррррррррррррррррррррррррррррррррррррррррррррр<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ь<Ьрррррррррррррррррррррррррррррррррррррррррррррррр
+8 -3
View File
@@ -70,10 +70,15 @@ fn default_build_formats_all_symmetric() {
}
#[test]
fn avif_never_readable() {
assert!(!caps(Format::Avif).read);
fn avif_is_readable_only_with_the_decode_feature() {
assert_eq!(caps(Format::Avif).read, cfg!(all(feature = "avif-decode", not(target_arch = "wasm32"))));
assert_eq!(caps(Format::Avif).write, cfg!(feature = "avif"));
assert!(matches!(decode_as(Format::Avif, b"\0\0\0\x1cftypavif"), Err(CodecError::Unsupported { .. })));
let header = decode_as(Format::Avif, b"\0\0\0\x1cftypavif");
if caps(Format::Avif).read {
assert!(matches!(header, Err(CodecError::Malformed { .. })), "{header:?}");
} else {
assert!(matches!(header, Err(CodecError::Unsupported { .. })), "{header:?}");
}
}
#[test]
+40
View File
@@ -0,0 +1,40 @@
//! Adobe APP14 transform inspection for JPEG samples.
/// Read the Adobe APP14 transform byte needed for RGB/CMYK JPEG interpretation.
pub fn adobe_transform(jpeg: &[u8]) -> Option<u8> {
let mut at = 2usize;
if jpeg.get(..2) != Some(&[0xFF, 0xD8]) {
return None;
}
while at + 1 < jpeg.len() && jpeg[at] == 0xFF {
let marker = jpeg[at + 1];
if marker == 0xDA {
return None;
}
let len = usize::from(u16::from_be_bytes([*jpeg.get(at + 2)?, *jpeg.get(at + 3)?]));
if len < 2 {
return None;
}
let end = at.checked_add(2 + len)?;
let segment = jpeg.get(at + 4..end)?;
if marker == 0xEE && segment.get(..5) == Some(b"Adobe") {
return segment.get(11).copied();
}
at = end;
}
None
}
#[cfg(test)]
mod tests {
use super::adobe_transform;
#[test]
fn reads_adobe_transform_and_rejects_truncated_segments() {
let mut jpeg = vec![0xff, 0xd8, 0xff, 0xee, 0, 14];
jpeg.extend_from_slice(b"Adobe\0\x64\0\0\0\0\x02");
assert_eq!(adobe_transform(&jpeg), Some(2));
assert_eq!(adobe_transform(&jpeg[..jpeg.len() - 1]), None);
assert_eq!(adobe_transform(&[0xff, 0xd8, 0xff, 0xda]), None);
assert_eq!(adobe_transform(&[0xff, 0xd8, 0xff, 0xee, 0, 1]), None);
}
}
+6
View File
@@ -1706,3 +1706,9 @@ mod tests;
/// Baseline JPEG encoder (8-bit, Huffman-coded sequential DCT).
mod encode;
pub use encode::{ChromaSubsampling, EncodeError, encode_baseline};
mod app14;
pub use app14::adobe_transform;
mod rgba;
pub use rgba::{UnsupportedComponents, to_rgba8};
+44
View File
@@ -0,0 +1,44 @@
//! Conversion of decoded 8-bit JPEG samples to opaque RGBA.
/// The JPEG component count is not supported by the RGBA conversion.
#[derive(Clone, Copy, Debug, PartialEq, Eq)]
pub struct UnsupportedComponents(pub u8);
/// Convert grayscale, RGB or CMYK samples to opaque RGBA, ignoring incomplete trailing pixels.
pub fn to_rgba8(samples: &[u8], components: u8) -> Result<Vec<u8>, UnsupportedComponents> {
let mut rgba = Vec::with_capacity(samples.len().saturating_mul(4));
match components {
1 => {
for &gray in samples {
rgba.extend_from_slice(&[gray, gray, gray, 255]);
}
}
3 => {
for rgb in samples.as_chunks::<3>().0 {
rgba.extend_from_slice(&[rgb[0], rgb[1], rgb[2], 255]);
}
}
4 => {
for cmyk in samples.as_chunks::<4>().0 {
let (c, m, y, k) = (u16::from(cmyk[0]), u16::from(cmyk[1]), u16::from(cmyk[2]), u16::from(cmyk[3]));
let rgb = [((255 - c) * (255 - k) / 255) as u8, ((255 - m) * (255 - k) / 255) as u8, ((255 - y) * (255 - k) / 255) as u8];
rgba.extend_from_slice(&[rgb[0], rgb[1], rgb[2], 255]);
}
}
n => return Err(UnsupportedComponents(n)),
}
Ok(rgba)
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn gray_rgb_and_cmyk_conversion_matches_integer_rules() -> Result<(), UnsupportedComponents> {
assert_eq!(to_rgba8(&[12], 1)?, [12, 12, 12, 255]);
assert_eq!(to_rgba8(&[1, 2, 3, 4], 3)?, [1, 2, 3, 255]);
assert_eq!(to_rgba8(&[0, 255, 128, 0], 4)?, [255, 0, 127, 255]);
assert_eq!(to_rgba8(&[], 2), Err(UnsupportedComponents(2)));
Ok(())
}
}
+57
View File
@@ -0,0 +1,57 @@
//! Bounded compatibility framing for single-line `{id, method, params}` control requests.
//! This is not JSON-RPC: replies use `{id, ok, result}` or `{id, ok, error}` and every
//! request, including one without an id, receives a reply. Method routing stays with the caller.
use serde_json::{Value, json};
use std::fmt::Display;
/// Process one bounded control line. Blank lines yield no response. Missing `params` becomes null;
/// arbitrary JSON ids are echoed and malformed JSON has a null id, matching the legacy protocol.
pub fn process_line<E: Display>(line: &str, max_bytes: usize, dispatch: impl FnOnce(&str, &Value) -> Result<Value, E>) -> Option<String> {
if line.len() > max_bytes {
return Some(error(None, "request exceeds byte limit"));
}
let trimmed = line.trim();
if trimmed.is_empty() {
return None;
}
let value: Value = match serde_json::from_str(trimmed) {
Ok(v) => v,
Err(e) => return Some(error(None, &format!("bad request envelope: {e}"))),
};
let id = value.get("id").cloned();
let Some(method) = value.get("method").and_then(Value::as_str) else {
return Some(error(id, "missing `method`"));
};
let params = value.get("params").cloned().unwrap_or(Value::Null);
Some(match dispatch(method, &params) {
Ok(result) => json!({"id": id, "ok": true, "result": result}).to_string(),
Err(e) => error(id, &e.to_string()),
})
}
fn error(id: Option<Value>, message: &str) -> String {
json!({"id": id, "ok": false, "error": message}).to_string()
}
#[cfg(test)]
mod tests {
use super::*;
#[test]
fn preserves_legacy_responses_and_null_defaults() {
let call =
|method: &str, params: &Value| -> Result<Value, &'static str> { if method == "echo" { Ok(params.clone()) } else { Err("unknown") } };
assert_eq!(process_line(" ", 20, call), None);
assert_eq!(process_line(r#"{"id":[1],"method":"echo"}"#, 100, call).unwrap(), r#"{"id":[1],"ok":true,"result":null}"#);
assert_eq!(process_line(r#"{"method":"bad"}"#, 100, call).unwrap(), r#"{"error":"unknown","id":null,"ok":false}"#);
assert_eq!(process_line(r#"{"method":"echo"}"#, 100, call).unwrap(), r#"{"id":null,"ok":true,"result":null}"#);
assert!(process_line("{", 100, call).unwrap().contains("bad request envelope:"));
assert_eq!(process_line(r#"{"id":3}"#, 100, call).unwrap(), r#"{"error":"missing `method`","id":3,"ok":false}"#);
assert!(process_line("abcdef", 2, call).unwrap().contains("byte limit"));
let invoked = std::cell::Cell::new(false);
let _ = process_line(" ", 2, |_, _| -> Result<Value, &'static str> {
invoked.set(true);
Ok(Value::Null)
});
assert!(!invoked.get());
}
}
+2
View File
@@ -8,6 +8,8 @@
#![forbid(unsafe_code)]
#![deny(clippy::unwrap_used, clippy::expect_used, clippy::panic, clippy::unimplemented, clippy::todo, clippy::unreachable)]
pub mod control;
use serde_json::{Value, json};
use std::io::BufRead;
+16 -3
View File
@@ -447,7 +447,13 @@ page yet. Damage recovery may read bytes again up to twice the file's length plu
is read at most about three times over; the packets kept and the header packets of a stream are
bounded too, with a warning when a bound is reached.
`OpusTiming` gives each Opus packet's start, the pre-skip and the end trimming of the final page.
No muxer.
The muxer side is `PageWriter`, from FilmCraft's `filmcraft-oggmux` by @JordyUSA
(storytold/filmcraft#4481): it laces the packets of one logical stream into pages (continued
packets, granule positions, BOS/EOS, CRC-32), puts each header packet on pages of its own, closes
audio pages at a byte or packet target, and can replace the final granule position for Ogg Opus
end trimming. `opus_tags` and `vorbis_comment` build the comment headers; tag names that are not
valid field names (Vorbis I §5.2.1) are left out.
## `avi`
@@ -655,6 +661,7 @@ Implemented from the SMPTE documents (editions used):
| SMPTE ST 386 | 2004 | D-10 (IMX) mapping: container label, sound element type |
| SMPTE ST 2019-4 | 2009 | VC-3 (DNxHD / DNxHR) mapping |
| SMPTE RDD 44 | 2017 | Apple ProRes mapping |
| Adobe CinemaDNG Image Data Format Specification | 1.0.0.0 (September 2009), §7 | CinemaDNG in MXF: frame-wrapped DNG picture elements (element type 42h), the essence container labels for CFA / LinearRaw content, RGBA descriptor; the labels are the specification's **provisional** values from Adobe's experimental range (byte 9 = 0Fh), not SMPTE-registered |
| SMPTE RP 224 / RP 210 | registers | labels: data definitions, picture coding, essence containers, operational patterns; property labels of the primer pack (writer) |
| SMPTE ST 330 | 2011 | basic UMIDs of the written packages |
@@ -696,7 +703,10 @@ let pcm = mxf.read_pcm(&file, a, 48_000, 1920)?; // planar f32, sample-exact
orders by the bitstream (the AVC picture order counts).
- **Codecs.** From the picture essence coding label, then the essence container label, then the
essence bytes: AVC / AVC-Intra, VC-3, ProRes (profile from the label), MPEG-2,
MPEG-4 visual, JPEG 2000, DV, uncompressed.
MPEG-4 visual, JPEG 2000, DV, uncompressed, CinemaDNG (the CinemaDNG container labels, the
registered MXF-GC TIFF/EP container and TIFF/EP picture coding labels, a 42h picture element
type, or a TIFF header with the DNGVersion tag at the start of the essence; the DNG pictures
themselves are decoded by `craft-raw`).
- **Sound.** PCM chunks (frame- or clip-wrapped) with sample counts; `read_pcm` decodes
little-endian 8/16/24/32-bit PCM (wave / AES3 descriptors) and ST 331 AES3 elements (D-10).
- **Timecode.** The material package timecode component (start frame count, rounded base,
@@ -769,7 +779,10 @@ w.finish()?;
element types 0x0C / 0x0D), ProRes (RDD 44: coding label profile byte, container `02 1C`),
AVC byte stream (ST 381-3: container `02 10 60`, coding label from `profile_idc`; Annex B access
units with in-band SPS / PPS — the AVC sub-descriptor is not written), Broadcast Wave PCM
(ST 382: container `02 06 01/02`, element types 0x01 / 0x02).
(ST 382: container `02 06 01/02`, element types 0x01 / 0x02), CinemaDNG (frame-wrapped DNG
datasets, element type 0x42, the provisional container label `0F 0A 0D 0B 02 7F 01/02 00`, an
RGBA descriptor with pixel layout and reference levels of the decoded 16-bit RGB picture and no
coding label; OP-Atom is refused because it is clip-wrapped here and DNG datasets cannot be).
- `write_opatom_pcm(&OpAtomPcm, &[i32])` builds a complete in-memory OP-Atom PCM file (AAF media
consolidation); `encode_pcm` interleaves planar f32 as little-endian PCM.
+17
View File
@@ -791,6 +791,23 @@ fn scrambled_packet_is_skipped_with_a_warning() {
assert!(total(&f) < total(&base));
}
#[test]
fn repeated_pat_and_pmt_packets_are_dropped_before_the_section_parser() {
let clean = audio_ts(2);
let first = |pid: u16| {
(0..clean.len() / 188).map(|i| i * 188).find(|&o| (((clean[o + 1] & 0x1F) as u16) << 8 | clean[o + 2] as u16) == pid).expect("packet exists")
};
let mut dup = clean.clone();
for pid in [0x100, 0] {
let o = first(pid);
let copy = dup[o..o + 188].to_vec();
dup.splice(o + 188..o + 188, copy);
}
let f = open(&dup).unwrap();
assert!(f.warnings.iter().any(|w| w.contains("2 duplicate packet(s) dropped")), "{:?}", f.warnings);
assert!(!f.warnings.iter().any(|w| w.contains("continuity") || w.contains("CRC")), "{:?}", f.warnings);
}
#[test]
fn duplicate_packet_is_dropped_but_a_different_payload_with_the_same_counter_is_kept() {
let clean = audio_ts(6);
+8
View File
@@ -497,6 +497,7 @@ pub(crate) fn scan<S: ByteSource + ?Sized>(src: &S, packet_size: usize, sync_off
let mut warnings: Vec<String> = Vec::new();
let mut pat = Psi::default();
let mut pmt = PmtState::default();
let mut psi_dup: HashMap<u16, DupGuard> = HashMap::new();
let mut es: HashMap<u16, EsState> = HashMap::new();
let mut order: Vec<u16> = Vec::new();
// one timestamp unwrapper for the program: its streams share one clock, so a stream whose
@@ -560,6 +561,13 @@ pub(crate) fn scan<S: ByteSource + ?Sized>(src: &S, packet_size: usize, sync_off
}
continue;
}
if pk.pid == 0 || Some(pk.pid) == pmt.pmt_pid {
// a repeated packet would append its payload to the section in progress
if psi_dup.entry(pk.pid).or_default().is_dup(&pk) {
duplicates += 1;
continue;
}
}
if pk.pid == 0 {
feed_pat(&pk, &mut pat, &mut pmt, &mut crc_errors);
continue;
+95 -3
View File
@@ -27,6 +27,9 @@ pub enum Codec {
Dv,
/// Uncompressed pictures (ST 384).
Uncompressed,
/// CinemaDNG: one DNG (TIFF) dataset per frame-wrapped picture element (CinemaDNG Image Data
/// Format Specification §7), or TIFF/EP pictures under the registered MXF-GC TIFF/EP labels.
CinemaDng,
/// Linear PCM, little-endian (Broadcast Wave and AES3 descriptors, ST 382).
Pcm,
/// 8-channel AES3 element data (ST 331, D-10 sound).
@@ -46,13 +49,14 @@ impl Codec {
Codec::Jpeg2000 => "JPEG 2000",
Codec::Dv => "DV",
Codec::Uncompressed => "Uncompressed",
Codec::CinemaDng => "CinemaDNG",
Codec::Pcm => "PCM",
Codec::Aes3Element => "AES3 PCM",
Codec::Unknown => "unknown",
}
}
/// The crate-wide identifier: VC-3 is [`CodecId::Dnxhd`], PCM and AES3 element data are
/// [`CodecId::Pcm`]; JPEG 2000, DV and uncompressed pictures have no identifier.
/// [`CodecId::Pcm`]; JPEG 2000, DV, uncompressed and CinemaDNG pictures have no identifier.
///
/// [`CodecId::Dnxhd`]: crate::CodecId::Dnxhd
/// [`CodecId::Pcm`]: crate::CodecId::Pcm
@@ -65,15 +69,35 @@ impl Codec {
Codec::Mpeg2 => Id::Mpeg2Video,
Codec::Mpeg4Visual => Id::Mpeg4Video,
Codec::Pcm | Codec::Aes3Element => Id::Pcm,
Codec::Jpeg2000 | Codec::Dv | Codec::Uncompressed | Codec::Unknown => Id::Unknown,
Codec::Jpeg2000 | Codec::Dv | Codec::Uncompressed | Codec::CinemaDng | Codec::Unknown => Id::Unknown,
}
}
/// Every picture is coded independently.
pub fn intra_only(&self) -> bool {
matches!(self, Codec::Avc { intra: true } | Codec::Vc3 | Codec::ProRes { .. } | Codec::Jpeg2000 | Codec::Dv | Codec::Uncompressed)
matches!(
self,
Codec::Avc { intra: true } | Codec::Vc3 | Codec::ProRes { .. } | Codec::Jpeg2000 | Codec::Dv | Codec::Uncompressed | Codec::CinemaDng
)
}
}
/// The CinemaDNG essence container labels (CinemaDNG Image Data Format Specification 1.0.0.0,
/// §7.2.1): provisional, unregistered labels from Adobe's experimental range (byte 9 = 0F h),
/// `…0F 0A 0D 0B 02 7F cc 00` with content kind `cc` 01 (CFA) or 02 (LinearRaw).
pub const CINEMADNG_CONTAINER_PREFIX: [u8; 6] = [0x0F, 0x0A, 0x0D, 0x0B, 0x02, 0x7F];
/// Element type (byte 15 of the picture element key) of a frame-wrapped CinemaDNG picture: the
/// "TIFF" type of ST 331 (CinemaDNG specification §7.1.1.2).
pub const CINEMADNG_ELEMENT_TYPE: u8 = 0x42;
/// Whether `ul` is a CinemaDNG essence container label (CFA or LinearRaw content), or the
/// registered MXF-GC TIFF/EP container (`…0D 01 03 01 02 14 ww 00`, RP 224).
pub fn is_cinemadng_container(ul: &Ul) -> bool {
ul.is_smpte()
&& (ul.item_starts_with(&CINEMADNG_CONTAINER_PREFIX) && matches!(ul.0[14], 0x01 | 0x02)
|| ul.item_starts_with(&[0x0D, 0x01, 0x03, 0x01, 0x02, 0x14]))
}
/// Identify a picture codec from the picture essence coding label and the essence container label.
pub fn identify_picture(coding: Option<Ul>, container: Option<Ul>, mpeg_descriptor: bool) -> Codec {
if let Some(c) = coding.filter(Ul::is_smpte) {
@@ -81,6 +105,9 @@ pub fn identify_picture(coding: Option<Ul>, container: Option<Ul>, mpeg_descript
// 04 01 02 02 .. : compressed picture coding
if b[8..12] == [0x04, 0x01, 0x02, 0x02] {
match (b[12], b[13]) {
// TIFF/EP Profile 2 picture coding (RP 224: 03 02 01 01 uncompressed CFA … 04
// compressed LinearRaw), the coding of DNG pictures
(0x03, 0x02) if b[14] == 0x01 => return Codec::CinemaDng,
// 01: MPEG compression (ISO/IEC 13818-2 profiles, 14496-2, 14496-10)
(0x01, 0x01..=0x1F) => return Codec::Mpeg2,
(0x01, 0x20..=0x2F) => return Codec::Mpeg4Visual,
@@ -99,6 +126,9 @@ pub fn identify_picture(coding: Option<Ul>, container: Option<Ul>, mpeg_descript
return Codec::Uncompressed;
}
}
if container.is_some_and(|c| is_cinemadng_container(&c)) {
return Codec::CinemaDng;
}
if let Some(c) = container.filter(Ul::is_smpte)
&& c.item_starts_with(&[0x0D, 0x01, 0x03, 0x01, 0x02])
{
@@ -117,8 +147,38 @@ pub fn identify_picture(coding: Option<Ul>, container: Option<Ul>, mpeg_descript
if mpeg_descriptor { Codec::Mpeg2 } else { Codec::Unknown }
}
/// Read a TIFF `u16` at offset `o`. The end offset is computed with checked arithmetic, so an
/// untrusted offset near `usize::MAX` (a 32-bit target with IFD offset `0xFFFF_FFFF`) is
/// out of bounds instead of overflowing.
fn tiff_u16(b: &[u8], le: bool, o: usize) -> Option<u16> {
let v = b.get(o..o.checked_add(2)?)?;
Some(if le { u16::from_le_bytes([v[0], v[1]]) } else { u16::from_be_bytes([v[0], v[1]]) })
}
/// DNG evidence in the leading bytes of a TIFF: a TIFF 6.0 §2 header whose first IFD, when it lies
/// within `b`, holds the DNGVersion tag (DNG 1.x §2, tag 50706). A plain TIFF has no such tag.
fn is_dng(b: &[u8]) -> bool {
let le = match b.get(..4) {
Some(h) if h == b"II*\0" => true,
Some(h) if h == b"MM\0*" => false,
_ => return false,
};
let u16_at = |o: usize| tiff_u16(b, le, o);
let Some(ifd) = b.get(4..8).map(|v| if le { u32::from_le_bytes([v[0], v[1], v[2], v[3]]) } else { u32::from_be_bytes([v[0], v[1], v[2], v[3]]) })
else {
return false;
};
let Some(count) = usize::try_from(ifd).ok().and_then(|o| u16_at(o).map(|n| (o, n))) else {
return false;
};
(0..usize::from(count.1)).any(|i| u16_at(count.0 + 2 + i * 12) == Some(50706))
}
/// Identify a picture codec from the first bytes of an essence element.
pub fn sniff_picture(b: &[u8]) -> Option<Codec> {
if is_dng(b) {
return Some(Codec::CinemaDng);
}
if b.len() >= 8 && &b[4..8] == b"icpf" {
return Some(Codec::ProRes { profile: None });
}
@@ -367,6 +427,29 @@ mod tests {
assert_eq!(identify_picture(None, None, false), Codec::Unknown);
}
#[test]
fn tiff_offset_near_usize_max_is_out_of_bounds() {
let b = [0x49, 0x49, 0x2A, 0x00, 0xFF, 0xFF, 0xFF, 0xFF];
assert_eq!(tiff_u16(&b, true, usize::MAX), None);
assert_eq!(tiff_u16(&b, true, usize::MAX - 1), None);
assert_eq!(tiff_u16(&b, true, 0), Some(0x4949));
assert!(!is_dng(&b));
}
#[test]
fn identifies_cinemadng() {
// CinemaDNG specification §7.2.1: CFA and LinearRaw containers (any registry version byte)
let adobe = |kind: u8| Ul([0x06, 0x0E, 0x2B, 0x34, 0x04, 0x01, 0x01, 0x01, 0x0F, 0x0A, 0x0D, 0x0B, 0x02, 0x7F, kind, 0x00]);
assert_eq!(identify_picture(None, Some(adobe(1)), false), Codec::CinemaDng);
assert_eq!(identify_picture(None, Some(adobe(2)), false), Codec::CinemaDng);
assert_eq!(identify_picture(None, Some(adobe(3)), false), Codec::Unknown);
// RP 224: MXF-GC frame-wrapped TIFF/EP container, TIFF/EP picture coding
assert_eq!(identify_picture(None, Some(ul(&[0x0D, 1, 3, 1, 2, 0x14, 1])), false), Codec::CinemaDng);
assert_eq!(identify_picture(Some(ul(&[4, 1, 2, 2, 3, 2, 1, 3])), None, false), Codec::CinemaDng);
assert!(Codec::CinemaDng.intra_only());
assert_eq!(Codec::CinemaDng.name(), "CinemaDNG");
}
#[test]
fn sniffs_essence() {
assert_eq!(sniff_picture(&[0, 0, 0, 1, 0x09, 0x10]), Some(Codec::Avc { intra: false }));
@@ -374,6 +457,15 @@ mod tests {
assert_eq!(sniff_picture(&[0, 0, 2, 0x80, 1]), Some(Codec::Vc3));
assert_eq!(sniff_picture(&[0, 0, 0, 9, b'i', b'c', b'p', b'f']), Some(Codec::ProRes { profile: None }));
assert_eq!(sniff_picture(&[1, 2, 3]), None);
// a TIFF header alone is not DNG; an IFD0 with the DNGVersion tag (50706 = 0xC612) is
let tiff_le = |tag: u16| [b"II*\0\x08\0\0\0\x01\0".as_slice(), &tag.to_le_bytes(), &[1, 0, 4, 0, 0, 0, 1, 4, 0, 0], &[0; 8]].concat();
let tiff_be = |tag: u16| [b"MM\0*\0\0\0\x08\0\x01".as_slice(), &tag.to_be_bytes(), &[0, 1, 0, 0, 0, 4, 1, 4, 0, 0], &[0; 8]].concat();
assert_eq!(sniff_picture(&tiff_le(0xC612)), Some(Codec::CinemaDng));
assert_eq!(sniff_picture(&tiff_be(0xC612)), Some(Codec::CinemaDng));
assert_eq!(sniff_picture(&tiff_le(0x0100)), None);
assert_eq!(sniff_picture(&tiff_be(0x0100)), None);
assert_eq!(sniff_picture(b"II*\0\x08\0\0\0"), None);
assert_eq!(sniff_picture(b"II*\0"), None);
}
#[test]
Loaded 100 of 149 files, more files were not shown because too many files have changed in this diff. Show more