gramps
2670ac022b
A video file was picture-only: the decode pipe passed `-an`, so a starting-soon or BRB clip with music played silent everywhere. Adds sound to every clip and collapses the two decoders into one. - `Services/VideoClipPipe.cs`: the shared pipe behind `MediaVideoSource` (TASK 21) and `AlertClipDecoder` (TASK 47) — video (`rawvideo bgra`, scaled) + audio (`f32le -ac 2 -ar 48000`, 50 ms chunks, byte-carry across reads), both paced to real time, loop restarts both so picture and sound stay together. Alert behaviour is unchanged. - `MediaVideoSourceManager` applies the layer's Level/Mute per session and raises `AudioAvailable`; `MainViewModel` feeds it to the new `AudioMixer.EnqueueDesktopMediaAudio`, which joins the DESKTOP/GAME ring so the desktop fader and the mic auto-ducker apply exactly as they do for game audio and TRAX (creator ruling 2026-11-05: audio joins the group). - Per-layer `MediaMuted` + existing `MediaVolume` surfaced as Mute/Level in the properties panel; `MediaMuted` persisted (ALTER TABLE guard + SELECT/INSERT). - Level/mute are per SESSION because one decoder is shared per file path — the last layer touched wins; one decoder per layer would play the file twice. Test: `MediaSourceAudioTests` — the pipe emits 50 ms chunks at 48k stereo, the manager scales by level and drops when muted, and a media layer's sound moves the desktop meter. Alert/decode suites unchanged and green. Docs: task-21 closed on item 10, the "silent soundtrack" facts corrected in frame-pipeline/output/overlays, HANDOFF rewritten. verify.sh green (529 passed; the two documented pre-existing failures only).
54 lines
1.9 KiB
C#
54 lines
1.9 KiB
C#
using ytLive.Services.Audio;
|
|
using ytLive.Services.Encoder;
|
|
|
|
namespace ytLive.Services;
|
|
|
|
/// <summary>
|
|
/// TASK 21: decodes a local media file (any format ffmpeg handles) into
|
|
/// <see cref="VideoFrame"/>s for a MediaSource. This is the <see cref="IMediaFrameSource"/>
|
|
/// shape over the shared <see cref="VideoClipPipe"/> — the same pipe an alert clip uses
|
|
/// (TASK 47), so the two features cannot drift apart again in how they decode.
|
|
/// <para>Video AND the file's own soundtrack are decoded. The manager scales the audio by
|
|
/// the layer's level/mute and hands it to the mixer's desktop group.</para>
|
|
/// </summary>
|
|
public sealed class MediaVideoSource : IMediaFrameSource
|
|
{
|
|
public event Action<VideoFrame>? FrameAvailable;
|
|
public event Action<AudioSample>? AudioAvailable;
|
|
public event Action? Completed;
|
|
|
|
public string Key => _path;
|
|
|
|
public bool Looping
|
|
{
|
|
get => _clip.Looping;
|
|
set => _clip.Looping = value;
|
|
}
|
|
|
|
private readonly string _path;
|
|
private readonly VideoClipPipe _clip;
|
|
|
|
public MediaVideoSource(
|
|
string path,
|
|
int width,
|
|
int height,
|
|
IFfmpegLocator locator,
|
|
Func<IDecodeProcess> processFactory,
|
|
IFrameRateProbe? frameRateProbe = null,
|
|
Func<TimeSpan, CancellationToken, Task>? delay = null)
|
|
{
|
|
_path = path;
|
|
_clip = new VideoClipPipe(
|
|
path, width, height, locator, processFactory, frameRateProbe, delay, audio: true);
|
|
_clip.FrameAvailable += frame => FrameAvailable?.Invoke(frame);
|
|
_clip.AudioAvailable += sample => AudioAvailable?.Invoke(sample);
|
|
_clip.Completed += () => Completed?.Invoke();
|
|
}
|
|
|
|
public Task StartAsync(CancellationToken cancellationToken = default) => _clip.StartAsync(cancellationToken);
|
|
|
|
public Task StopAsync() => _clip.StopAsync();
|
|
|
|
public void Dispose() => _clip.Dispose();
|
|
}
|