mirror of
https://github.com/storytold/craft-libs.git
synced 2026-11-17 07:44:40 +00:00
* audio: pure-Rust Vorbis encoder, and an Ogg page writer in craft-media Replace the libvorbis wrapper (vorbis_rs, C, desktop only) behind `vorbis-encode` with FilmCraft's clean-room Vorbis I encoder by @JordyUSA (storytold/filmcraft#4481), and move its Ogg page writer into craft-media's `ogg` module. craft-audio: - `vorbis::encoder::{Encoder, EncoderConfig, Error}`: 1-8 channels in Vorbis order, any sample rate, quality -1 to 10 (VBR), streaming packets with granule positions. - `encode_ogg_vorbis` with `OggVorbisOptions` (quality, vendor, tags, serial) writes a whole Ogg Vorbis file with a comment header. - `encode_ogg(buf, kbps)` and `OGG_BITRATES` keep working: the bit rate picks the quality whose nominal rate it is (`quality_for_bitrate`). - `encode` with `EncodeFormat::Ogg` takes 1-8 channel WAV-order layouts and writes them in Vorbis order, and `RateControl::Quality`. - Ogg is built on wasm32 too. - Residue partitions hold whole sample frames (48, 40, 48 or 56 values for 3, 5, 6 and 7 channels): libvorbis decodes each partition from channel 0, so 32-value partitions came out scrambled for those counts. - The first audio packet gets a page of its own, so a short file's first audio page is never also its last (ffmpeg then kept the padding). craft-media: `ogg::PageWriter`, `opus_tags`, `vorbis_comment`. Part of storytold/craft-libs#778. * audio, media: address review on the Vorbis encoder and Ogg writer - Encoder: read cursor into the pending input, compacted once per call, so a large encode() call no longer moves the tail on every block. - Tests: check ffmpeg's libvorbis decoder only when ffmpeg has it. - PageWriter::finish: the end granule replaces the last page's only when a packet completes on it (RFC 7845 4.4); documented and tested. - README: Ogg Opus packet granules are the samples decoded so far. * audio: pick Ogg by extension on wasm32 too The Vorbis encoder is pure Rust now, so encode_format_for("ogg") follows the vorbis-encode feature alone, as EncodeFormat::Ogg.is_built() and ENCODE_EXTENSIONS already do.
108 lines
4.1 KiB
TOML
108 lines
4.1 KiB
TOML
[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, Vorbis encoder, MP1/MP2 decoders."
|
|
version.workspace = true
|
|
edition.workspace = true
|
|
license.workspace = true
|
|
rust-version.workspace = true
|
|
repository.workspace = true
|
|
|
|
[package.metadata.docs.rs]
|
|
all-features = true
|
|
|
|
[lints]
|
|
workspace = true
|
|
|
|
[features]
|
|
# Probe and decode files: WAV and AIFF natively; AAC, ALAC, Opus, AC-3/E-AC-3, MP1/MP2/MP3 and
|
|
# PCM through craft-media's demuxers and this crate's decoders; FLAC, Vorbis, CAF, ADPCM, A-law,
|
|
# µ-law and free-format MP3 through symphonia.
|
|
decode = ["decode-native", "symphonia"]
|
|
# `decode` without symphonia: only the formats with a native decoder (others are Unsupported).
|
|
decode-native = ["aac-decode", "alac-decode", "opus-decode", "ac3-decode", "mpa-decode", "mp3-decode", "craft-media/isobmff", "craft-media/matroska", "craft-media/ogg", "dep:log", "dep:craft-xml"]
|
|
# The symphonia fallback for the formats with no native decoder yet.
|
|
symphonia = ["decode-native", "dep:symphonia"]
|
|
# Every encoder: the lossless file writers and the AAC, ALAC, AC-3/E-AC-3, MP3 and Opus encoders.
|
|
# All but Opus are also file formats of `encode` and `FileEncoder`.
|
|
encode = ["lossless-encode", "aac-encode", "alac-encode", "ac3-encode", "eac3-encode", "mp3-encode", "opus-encode", "vorbis-encode"]
|
|
# Encode WAV/BWF/RF64, AIFF/AIFF-C and FLAC files.
|
|
lossless-encode = ["pcm-encode", "flac-encode"]
|
|
# Encode WAV/BWF/RF64 and AIFF/AIFF-C files.
|
|
pcm-encode = []
|
|
# Encode FLAC files.
|
|
flac-encode = ["craft-media/bitstream"]
|
|
# 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`.
|
|
aac-encode = ["craft-media/bitstream", "craft-media/isobmff"]
|
|
opus-decode = []
|
|
# QOA (Quite OK Audio) files: decoder and encoder in the `qoa` module, each on its own.
|
|
qoa = ["qoa-decode", "qoa-encode"]
|
|
qoa-decode = []
|
|
qoa-encode = []
|
|
opus-encode = []
|
|
ac3-decode = ["craft-media/bitstream"]
|
|
mpa-decode = ["craft-media/bitstream"]
|
|
# MPEG-1/2 Layer III (MP3) decoder (`mp3::Decoder`).
|
|
mp3-decode = ["mpa-decode"]
|
|
# ALAC packet decoder and encoder (`alac`), ported from Apple's reference implementation. The
|
|
# encoder also writes ALAC in M4A through `encode` and `FileEncoder`.
|
|
alac-decode = []
|
|
alac-encode = ["craft-media/isobmff"]
|
|
ac3-encode = ["craft-media/bitstream"]
|
|
eac3-encode = ["craft-media/bitstream"]
|
|
# MPEG-1/2 Layer III (MP3) encoder (`mp3`).
|
|
mp3-encode = ["craft-media/bitstream"]
|
|
# Multi-resolution waveform overviews (`peaks`).
|
|
peaks = []
|
|
# Encode AAC channels in parallel (with `aac-encode`).
|
|
rayon = ["dep:rayon"]
|
|
# Serialize and Deserialize for the shared types.
|
|
serde = ["dep:serde", "craft-media/serde"]
|
|
|
|
[dependencies]
|
|
craft-media = { workspace = true }
|
|
craft-xml = { workspace = true, optional = true }
|
|
thiserror = { workspace = true }
|
|
serde = { workspace = true, optional = true }
|
|
log = { version = "0.4", optional = true }
|
|
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"] }
|
|
|
|
[dev-dependencies]
|
|
craft-media-testkit = { workspace = true }
|
|
proptest = { workspace = true }
|
|
serde_json = { workspace = true }
|
|
|
|
[[test]]
|
|
name = "audio"
|
|
required-features = ["decode", "lossless-encode", "peaks"]
|
|
|
|
[[test]]
|
|
name = "codecs"
|
|
required-features = ["decode", "encode"]
|
|
|
|
[[test]]
|
|
name = "qoa_oracle"
|
|
required-features = ["qoa"]
|
|
|
|
[[example]]
|
|
name = "info"
|
|
required-features = ["decode"]
|
|
|
|
[[example]]
|
|
name = "stream"
|
|
required-features = ["decode"]
|
|
|
|
[[example]]
|
|
name = "packets"
|
|
required-features = ["decode"]
|
|
|
|
[[example]]
|
|
name = "encode"
|
|
required-features = ["lossless-encode", "aac-encode"]
|