eric/pmomusic
1
0
Fork 0
Code Issues 5 Pull Requests Actions Packages Projects Releases 3 Wiki Activity
Files
6285c8ccc802bcf4cccb849e984f9dfa468a2dac
pmomusic/pmoaudio-ext/Cargo.toml

43 lines
1.3 KiB
TOML
Raw Normal View History

Ajout d'un noeud puis vers le cache audio
2025-11-03 06:55:45 +01:00
[package]
name = "pmoaudio-ext"
version = "0.1.0"
:recycle: refactor(pmowebrenderer): factoriser handlers et supprimer duplications - Remplacer les Arc+Box::pin manuels par la macro action_handler!(captures(...)) - Supprimer helpers locaux dupliqués dans renderer.rs (add_var, add_action) - Extraire handlers génériques pour GET requests - Factoriser extraction metadata dans set_uri_handler /set_next_uriHandler - Simplifier build_renderingcontrol en retirant pipeline inutile - Mettre à jour edition Rust de 2021 vers 2024 dans tous les Cargo.toml - Corriger pattern matching inutile `ref` sur déréférencement dans pmoaudio et pmoflac
2026-04-05 14:06:32 +02:00
edition = "2024"
Ajout d'un noeud puis vers le cache audio
2025-11-03 06:55:45 +01:00
[dependencies]
# Core audio types
pmoaudio = { path = "../pmoaudio" }
Ajout de la gestion des couvertures d'albums par le FlacCacheSink
2025-11-03 14:52:04 +01:00
pmocovers = { path = "../pmocovers"}
Ajout d'un noeud puis vers le cache audio
2025-11-03 06:55:45 +01:00
# Optional dependencies for cache-sink feature
pmoaudiocache = { path = "../pmoaudiocache", optional = true }
pmoflac = { path = "../pmoflac", optional = true }
pmometadata = { path = "../pmometadata", optional = true }
feat: Add PlaylistSource and ResamplingNode for playlist playback This commit implements a new audio source that reads from pmoplaylist and streams tracks continuously, along with a resampling node to normalize sample rates. ## New Components ### PlaylistSource (pmoaudio-ext) - New source in pmoaudio-ext/src/sources/playlist_source.rs - Reads from pmoplaylist ReadHandle - Decodes tracks from audio cache (pmoaudiocache) - Emits PCM with heterogeneous sample_rate and bit_depth - Polls playlist when empty (configurable interval, default 100ms) - Emits TrackBoundary markers between tracks - Graceful shutdown with EndOfStream on stop - Gated behind 'playlist' feature flag **Design Philosophy:** - Keeps each node simple (single responsibility) - Emits raw PCM without format normalization - Pipeline designer chooses how to handle heterogeneity - Ideal for Radio Paradise (homogeneous streams) - Requires ResamplingNode + ToI24Node for mixed playlists ### ResamplingNode (pmoaudio) - Generic resampling node in pmoaudio/src/nodes/resampling_node.rs - Normalizes variable sample rates to a target rate - Uses libsoxr for high-quality resampling - Automatically detects sample rate changes - Recreates resampler as needed - Preserves chunk type (I16/I24/I32/F32/F64) - Quality adapts to bit depth (Medium/High/Very High) ## Architecture PlaylistSource is placed in pmoaudio-ext to avoid circular dependencies: - pmoaudio-ext depends on: pmoaudio, pmoplaylist, pmoaudiocache - No reverse dependencies = clean dependency graph ## Configuration ### pmoaudio-ext/Cargo.toml - Updated 'playlist' feature to include pmoaudiocache, pmocache, pmoflac - Added sources module export ### pmoaudio - Added resampling_node module - Public export: ResamplingNode ## System Requirements ⚠️ **IMPORTANT**: libsoxr-dev must be installed for compilation See INSTALL_NOTES.md for installation instructions per platform. ## Usage Example ```rust // Radio Paradise (homogeneous 44.1kHz/16bit) let mut source = PlaylistSource::new(playlist, cache); let to_i24 = ToI24Node::new(); source.register(Box::new(to_i24)); // Mixed playlist (needs normalization) let mut source = PlaylistSource::new(playlist, cache); let mut resampler = ResamplingNode::new(48000); // Force 48kHz let to_i24 = ToI24Node::new(); source.register(Box::new(resampler)); resampler.register(Box::new(to_i24)); ``` ## Files Changed - pmoaudio-ext/Cargo.toml: Update playlist feature - pmoaudio-ext/src/lib.rs: Add sources module - pmoaudio-ext/src/sources/mod.rs: New sources module - pmoaudio-ext/src/sources/playlist_source.rs: New PlaylistSource (580 lines) - pmoaudio/src/nodes/resampling_node.rs: New ResamplingNode (350 lines) - pmoaudio/src/nodes/mod.rs: Register resampling_node - pmoaudio/src/lib.rs: Export ResamplingNode - INSTALL_NOTES.md: System requirements documentation ## Future Work - GapInsertionNode (inserts silence between tracks) - CrossfadeNode (fade-in/fade-out mixing) - Examples (deferred until implementation validated)
2025-11-05 13:44:24 +00:00
# Optional dependencies for playlist integration
Ajout d'un noeud puis vers le cache audio
2025-11-03 06:55:45 +01:00
pmoplaylist = { path = "../pmoplaylist", optional = true }
feat: Add PlaylistSource and ResamplingNode for playlist playback This commit implements a new audio source that reads from pmoplaylist and streams tracks continuously, along with a resampling node to normalize sample rates. ## New Components ### PlaylistSource (pmoaudio-ext) - New source in pmoaudio-ext/src/sources/playlist_source.rs - Reads from pmoplaylist ReadHandle - Decodes tracks from audio cache (pmoaudiocache) - Emits PCM with heterogeneous sample_rate and bit_depth - Polls playlist when empty (configurable interval, default 100ms) - Emits TrackBoundary markers between tracks - Graceful shutdown with EndOfStream on stop - Gated behind 'playlist' feature flag **Design Philosophy:** - Keeps each node simple (single responsibility) - Emits raw PCM without format normalization - Pipeline designer chooses how to handle heterogeneity - Ideal for Radio Paradise (homogeneous streams) - Requires ResamplingNode + ToI24Node for mixed playlists ### ResamplingNode (pmoaudio) - Generic resampling node in pmoaudio/src/nodes/resampling_node.rs - Normalizes variable sample rates to a target rate - Uses libsoxr for high-quality resampling - Automatically detects sample rate changes - Recreates resampler as needed - Preserves chunk type (I16/I24/I32/F32/F64) - Quality adapts to bit depth (Medium/High/Very High) ## Architecture PlaylistSource is placed in pmoaudio-ext to avoid circular dependencies: - pmoaudio-ext depends on: pmoaudio, pmoplaylist, pmoaudiocache - No reverse dependencies = clean dependency graph ## Configuration ### pmoaudio-ext/Cargo.toml - Updated 'playlist' feature to include pmoaudiocache, pmocache, pmoflac - Added sources module export ### pmoaudio - Added resampling_node module - Public export: ResamplingNode ## System Requirements ⚠️ **IMPORTANT**: libsoxr-dev must be installed for compilation See INSTALL_NOTES.md for installation instructions per platform. ## Usage Example ```rust // Radio Paradise (homogeneous 44.1kHz/16bit) let mut source = PlaylistSource::new(playlist, cache); let to_i24 = ToI24Node::new(); source.register(Box::new(to_i24)); // Mixed playlist (needs normalization) let mut source = PlaylistSource::new(playlist, cache); let mut resampler = ResamplingNode::new(48000); // Force 48kHz let to_i24 = ToI24Node::new(); source.register(Box::new(resampler)); resampler.register(Box::new(to_i24)); ``` ## Files Changed - pmoaudio-ext/Cargo.toml: Update playlist feature - pmoaudio-ext/src/lib.rs: Add sources module - pmoaudio-ext/src/sources/mod.rs: New sources module - pmoaudio-ext/src/sources/playlist_source.rs: New PlaylistSource (580 lines) - pmoaudio/src/nodes/resampling_node.rs: New ResamplingNode (350 lines) - pmoaudio/src/nodes/mod.rs: Register resampling_node - pmoaudio/src/lib.rs: Export ResamplingNode - INSTALL_NOTES.md: System requirements documentation ## Future Work - GapInsertionNode (inserts silence between tracks) - CrossfadeNode (fade-in/fade-out mixing) - Examples (deferred until implementation validated)
2025-11-05 13:44:24 +00:00
pmocache = { path = "../pmocache", optional = true }
Add StreamingFlacSink for multi-client HTTP streaming Implements a new sink for broadcasting FLAC audio to multiple concurrent HTTP clients (UPnP renderers, web players, etc.) with dynamic metadata updates. Key features: - Lazy encoder initialization (auto-detects sample rate from first chunk) - Broadcast architecture: one encoder, multiple concurrent clients - Dual streaming modes: * Pure FLAC mode (standard HTTP streaming) * ICY metadata mode (Icecast/Shoutcast protocol with "Now Playing") - Automatic lifecycle management (starts on first client, stops when last disconnects) - Full metadata support via TrackBoundary sync markers Architecture: AudioSegments → PCM conversion → FLAC encoder → Broadcaster task ↓ broadcast::channel ↓ Multiple clients (FlacClientStream/IcyClientStream) New components: - StreamingFlacSink: Terminal sink node for audio pipeline - StreamHandle: Clonable handle for HTTP handlers to subscribe clients - FlacClientStream: Pure FLAC AsyncRead implementation - IcyClientStream: ICY-wrapped FLAC with metadata injection - MetadataSnapshot: Serializable metadata for SSE/JSON endpoints Feature: http-stream (requires pmoflac, pmometadata, bytes, serde)
2025-11-11 19:27:39 +00:00
Ajout d'un noeud puis vers le cache audio
2025-11-03 06:55:45 +01:00
# Async runtime
Migration vers une forme unifiée des cargos
2025-12-30 16:12:30 +01:00
tokio = { workspace = true }
Ajout d'un noeud puis vers le cache audio
2025-11-03 06:55:45 +01:00
tokio-util = { version = "0.7" }
async-trait = "0.1"
# Utilities
tracing = "0.1"
Implement complete OGG-FLAC streaming with proper container wrapping This commit implements full OGG container support for FLAC streaming, wrapping FLAC frames in proper OGG pages with CRC32 validation. ## Changes ### pmoaudio-ext/src/sinks/streaming_ogg_flac_sink.rs - Implemented `broadcast_ogg_flac_stream()` with actual OGG wrapping - Added `OggPageWriter` struct for generating OGG pages with proper: - BOS (Beginning of Stream) flag for stream start - EOS (End of Stream) flag for stream end - Page segmentation (255-byte chunks) - CRC32 checksum calculation - Added `read_flac_header()` to extract FLAC header for OGG BOS packet - Added `create_empty_vorbis_comment()` for metadata block - Header caching: BOS + Vorbis Comment pages sent to late-joining clients - Streaming architecture: FLAC frames wrapped in ~4KB OGG pages ### pmoparadise/examples/stream_block.rs - Added dual pipeline support (FLAC + OGG-FLAC) - Added `/test/stream-ogg` endpoint for OGG-FLAC streaming - Updated help messages and documentation - Both pipelines run in parallel with separate sources ### pmoaudio-ext/Cargo.toml - Added `rand = "0.8"` dependency for OGG stream serial generation ## Architecture ``` PCM Input → FLAC Encoder → OGG Wrapper → Broadcast ↓ ↓ ↓ FLAC frames OGG pages HTTP clients ``` ## OGG-FLAC Format 1. BOS page: Contains FLAC identification ("fLaC" + STREAMINFO) 2. Comment page: Contains Vorbis Comment block (metadata) 3. Data pages: Contain FLAC audio frames (~4KB per page) 4. EOS page: Marks end of logical bitstream ## Testing Verified with Radio Paradise streaming: - OGG-FLAC encoder initializes correctly (44100 Hz) - FLAC header extracted (86 bytes) - OGG header cached (176 bytes: BOS + Comment) - Stream generates proper OGG pages (654KB test stream) ## Endpoints - `/test/stream` - Pure FLAC - `/test/stream-ogg` - OGG-FLAC container (NEW) - `/test/stream-icy` - FLAC + ICY metadata - `/test/metadata` - JSON metadata ## TODO (Deferred) OGG chaining on TrackBoundary: Would require encoder restart and new logical bitstream per track. Currently metadata is served via `/test/metadata` endpoint for real-time updates.
2025-11-12 00:26:00 +00:00
rand = "0.8"
Ajout d'un noeud puis vers le cache audio
2025-11-03 06:55:45 +01:00
Add StreamingFlacSink for multi-client HTTP streaming Implements a new sink for broadcasting FLAC audio to multiple concurrent HTTP clients (UPnP renderers, web players, etc.) with dynamic metadata updates. Key features: - Lazy encoder initialization (auto-detects sample rate from first chunk) - Broadcast architecture: one encoder, multiple concurrent clients - Dual streaming modes: * Pure FLAC mode (standard HTTP streaming) * ICY metadata mode (Icecast/Shoutcast protocol with "Now Playing") - Automatic lifecycle management (starts on first client, stops when last disconnects) - Full metadata support via TrackBoundary sync markers Architecture: AudioSegments → PCM conversion → FLAC encoder → Broadcaster task ↓ broadcast::channel ↓ Multiple clients (FlacClientStream/IcyClientStream) New components: - StreamingFlacSink: Terminal sink node for audio pipeline - StreamHandle: Clonable handle for HTTP handlers to subscribe clients - FlacClientStream: Pure FLAC AsyncRead implementation - IcyClientStream: ICY-wrapped FLAC with metadata injection - MetadataSnapshot: Serializable metadata for SSE/JSON endpoints Feature: http-stream (requires pmoflac, pmometadata, bytes, serde)
2025-11-11 19:27:39 +00:00
# HTTP streaming dependencies
bytes = { version = "1.0", optional = true }
Migration vers une forme unifiée des cargos
2025-12-30 16:12:30 +01:00
serde = { workspace = true, optional = true }
serde_json = { workspace = true, optional = true }
Refactor WebRenderer to use server-side streaming with OGG-FLAC sink This commit refactors the WebRenderer to use a server-side streaming architecture with OGG-FLAC sink instead of the previous WebSocket-based approach. The changes include: - Replaced WebSocket communication with HTTP streaming using DirectOggFlacSink - Implemented a new pipeline architecture with dedicated handlers for UPnP commands - Added new modules for registration, registry, and streaming - Updated the renderer to work with a pipeline control system - Removed old WebSocket session management - Added support for HTTP streaming with gapless playback - Updated dependencies and features for the new architecture The WebRenderer now acts as a MediaRenderer UPnP device that serves audio streams via HTTP endpoints, with commands relayed to the audio pipeline through a new control system.
2026-02-26 19:58:37 +01:00
reqwest = { workspace = true, features = ["stream"], optional = true }
futures = { version = "0.3", optional = true }
:arrow_up: ureq v2→v3, add continuous stream detection - Updateurequest dependency from v2 to latest major (v3.14) - Add ureq as optional dependency in pmoaudio-ext - Introduce is_continuous flag to UriSource and PlayerState for proper StreamType handling (Finite vs Continuous) - Implement detect_continuous_stream() with URL pattern matching and HTTP HEAD header inspection (ICY, chunked encoding) - Update send_track_boundary() to accept StreamType parameter
2026-04-04 18:00:20 +02:00
ureq = { version = "2", optional = true }
Add StreamingFlacSink for multi-client HTTP streaming Implements a new sink for broadcasting FLAC audio to multiple concurrent HTTP clients (UPnP renderers, web players, etc.) with dynamic metadata updates. Key features: - Lazy encoder initialization (auto-detects sample rate from first chunk) - Broadcast architecture: one encoder, multiple concurrent clients - Dual streaming modes: * Pure FLAC mode (standard HTTP streaming) * ICY metadata mode (Icecast/Shoutcast protocol with "Now Playing") - Automatic lifecycle management (starts on first client, stops when last disconnects) - Full metadata support via TrackBoundary sync markers Architecture: AudioSegments → PCM conversion → FLAC encoder → Broadcaster task ↓ broadcast::channel ↓ Multiple clients (FlacClientStream/IcyClientStream) New components: - StreamingFlacSink: Terminal sink node for audio pipeline - StreamHandle: Clonable handle for HTTP handlers to subscribe clients - FlacClientStream: Pure FLAC AsyncRead implementation - IcyClientStream: ICY-wrapped FLAC with metadata injection - MetadataSnapshot: Serializable metadata for SSE/JSON endpoints Feature: http-stream (requires pmoflac, pmometadata, bytes, serde)
2025-11-11 19:27:39 +00:00
Ajout d'un noeud puis vers le cache audio
2025-11-03 06:55:45 +01:00
[features]
default = []
metadonnée technique dans le cache audio
2025-11-22 10:51:14 +01:00
cache-sink = ["dep:pmoaudiocache", "dep:pmoflac", "dep:pmometadata", "dep:serde_json"]
fix: Correct play_and_cache example API usage Corrections pour que l'exemple utilise les bonnes API: - Utilisation directe de Cache::new() au lieu de méthodes de config - Suppression des appels à root() qui n'existent pas - Utilisation du singleton PlaylistManager() au lieu de new() - Ajout de cache-sink comme dépendance de playlist feature dans pmoaudio-ext L'exemple devrait maintenant compiler correctement avec: cargo run --example play_and_cache --features full -- <channel_id>
2025-11-05 15:55:57 +00:00
playlist = ["cache-sink", "dep:pmoplaylist", "dep:pmocache"]
:arrow_up: ureq v2→v3, add continuous stream detection - Updateurequest dependency from v2 to latest major (v3.14) - Add ureq as optional dependency in pmoaudio-ext - Introduce is_continuous flag to UriSource and PlayerState for proper StreamType handling (Finite vs Continuous) - Implement detect_continuous_stream() with URL pattern matching and HTTP HEAD header inspection (ICY, chunked encoding) - Update send_track_boundary() to accept StreamType parameter
2026-04-04 18:00:20 +02:00
http-stream = ["dep:pmoflac", "dep:pmometadata", "dep:bytes", "dep:serde", "dep:reqwest", "dep:futures", "dep:ureq"]
Add StreamingFlacSink for multi-client HTTP streaming Implements a new sink for broadcasting FLAC audio to multiple concurrent HTTP clients (UPnP renderers, web players, etc.) with dynamic metadata updates. Key features: - Lazy encoder initialization (auto-detects sample rate from first chunk) - Broadcast architecture: one encoder, multiple concurrent clients - Dual streaming modes: * Pure FLAC mode (standard HTTP streaming) * ICY metadata mode (Icecast/Shoutcast protocol with "Now Playing") - Automatic lifecycle management (starts on first client, stops when last disconnects) - Full metadata support via TrackBoundary sync markers Architecture: AudioSegments → PCM conversion → FLAC encoder → Broadcaster task ↓ broadcast::channel ↓ Multiple clients (FlacClientStream/IcyClientStream) New components: - StreamingFlacSink: Terminal sink node for audio pipeline - StreamHandle: Clonable handle for HTTP handlers to subscribe clients - FlacClientStream: Pure FLAC AsyncRead implementation - IcyClientStream: ICY-wrapped FLAC with metadata injection - MetadataSnapshot: Serializable metadata for SSE/JSON endpoints Feature: http-stream (requires pmoflac, pmometadata, bytes, serde)
2025-11-11 19:27:39 +00:00
all = ["cache-sink", "playlist", "http-stream"]
Reference in New Issue Copy Permalink