Add audio synchronization mode policy

This commit is contained in:
Meta Vens 2026-05-22 18:49:01 +01:00
commit 7e4348bfe7
12 changed files with 205 additions and 18 deletions

View file

@ -29,6 +29,8 @@ public sealed class MimirRuntimeConfiguration
var bufferDuration = model.BufferSeconds > 0.0
? TimeSpan.FromSeconds(Math.Clamp(model.BufferSeconds, 0.25, 60.0))
: MimirSynchronizationSettings.FromEnvironment().BufferDuration;
var audio = (model.AudioSync?.ToSettings(new MimirAudioSynchronizationSettings()) ?? new MimirAudioSynchronizationSettings())
.WithEnvironmentOverrides();
var sourceModels = model.Streams
.Where(stream => stream.Enabled)
@ -47,6 +49,7 @@ public sealed class MimirRuntimeConfiguration
Settings = new MimirSynchronizationSettings
{
BufferDuration = bufferDuration,
Audio = audio,
Streams = streams,
},
Sources = sources,
@ -183,9 +186,34 @@ public sealed class MimirRuntimeConfigFile
{
public double BufferSeconds { get; set; } = 5.0;
public MimirAudioSyncConfig? AudioSync { get; set; }
public List<MimirStreamConfig> Streams { get; set; } = [];
}
public sealed class MimirAudioSyncConfig
{
public string Mode { get; set; } = "";
public string ReferenceSourceId { get; set; } = "";
public float CalibrationGain { get; set; } = float.NaN;
public MimirAudioSynchronizationSettings ToSettings(MimirAudioSynchronizationSettings fallback)
{
return new MimirAudioSynchronizationSettings
{
Mode = MimirAudioSynchronizationSettings.ParseMode(Mode, fallback.Mode),
ReferenceSourceId = string.IsNullOrWhiteSpace(ReferenceSourceId)
? fallback.ReferenceSourceId
: ReferenceSourceId.Trim(),
CalibrationGain = float.IsFinite(CalibrationGain)
? Math.Clamp(CalibrationGain, 0.0f, 4.0f)
: fallback.CalibrationGain,
};
}
}
public sealed class MimirStreamConfig
{
public string SourceId { get; set; } = "";

View file

@ -4,6 +4,8 @@ public sealed class MimirSynchronizationSettings
{
public TimeSpan BufferDuration { get; init; } = TimeSpan.FromSeconds(5);
public MimirAudioSynchronizationSettings Audio { get; init; } = new();
public IReadOnlyList<MimirStreamDescriptor> Streams { get; init; } = [];
public static MimirSynchronizationSettings FromEnvironment()
@ -18,6 +20,7 @@ public sealed class MimirSynchronizationSettings
return new MimirSynchronizationSettings
{
BufferDuration = duration,
Audio = MimirAudioSynchronizationSettings.FromEnvironment(),
Streams = streams,
};
}
@ -48,3 +51,68 @@ public sealed class MimirSynchronizationSettings
}
}
}
public sealed class MimirAudioSynchronizationSettings
{
public const string DefaultReferenceSourceId = "loopback-scarlett-speakers";
public const float DefaultCalibrationGain = 2.0f;
public MimirAudioSyncMode Mode { get; init; } = MimirAudioSyncMode.Hybrid;
public string ReferenceSourceId { get; init; } = DefaultReferenceSourceId;
public float CalibrationGain { get; init; } = DefaultCalibrationGain;
public static MimirAudioSynchronizationSettings FromEnvironment()
{
return new MimirAudioSynchronizationSettings().WithEnvironmentOverrides();
}
public MimirAudioSynchronizationSettings WithEnvironmentOverrides()
{
return new MimirAudioSynchronizationSettings
{
Mode = ParseMode(Environment.GetEnvironmentVariable("MIMIR_AUDIO_SYNC_MODE"), Mode),
ReferenceSourceId = ReadReferenceSourceId(ReferenceSourceId),
CalibrationGain = ReadCalibrationGain(CalibrationGain),
};
}
public static MimirAudioSyncMode ParseMode(string? value, MimirAudioSyncMode fallback)
{
if (string.IsNullOrWhiteSpace(value))
{
return fallback;
}
return value.Trim().ToLowerInvariant() switch
{
"chirp-only" or "chirponly" or "chirp" or "active" => MimirAudioSyncMode.ChirpOnly,
"no-chirp" or "nochirp" or "passive" or "passive-only" or "passiveonly" => MimirAudioSyncMode.NoChirp,
"hybrid" => MimirAudioSyncMode.Hybrid,
_ => fallback,
};
}
private static string ReadReferenceSourceId(string fallback)
{
var sourceId = Environment.GetEnvironmentVariable("MIMIR_AUDIO_SYNC_REFERENCE");
return string.IsNullOrWhiteSpace(sourceId)
? fallback
: sourceId.Trim();
}
private static float ReadCalibrationGain(float fallback)
{
return float.TryParse(Environment.GetEnvironmentVariable("MIMIR_CHIRPLET_GAIN"), out var gain)
? Math.Clamp(gain, 0.0f, 4.0f)
: fallback;
}
}
public enum MimirAudioSyncMode
{
ChirpOnly,
NoChirp,
Hybrid,
}