Bound runtime sync analysis
This commit is contained in:
parent
c64fd9050e
commit
200186d4d5
8 changed files with 112 additions and 37 deletions
|
|
@ -11,7 +11,8 @@ public sealed class MimirAudioSynchronizationAnalyzer
|
|||
public IReadOnlyList<MimirAudioSynchronizationReport> Analyze(
|
||||
IEnumerable<MimirRollingStreamBuffer> buffers,
|
||||
string referenceSourceId,
|
||||
double approximateTimelineSeconds)
|
||||
double approximateTimelineSeconds,
|
||||
IReadOnlySet<string>? candidateSourceIds = null)
|
||||
{
|
||||
var audioBuffers = buffers
|
||||
.Where(buffer => buffer.Descriptor.Kind == MimirStreamKind.Audio)
|
||||
|
|
@ -47,6 +48,11 @@ public sealed class MimirAudioSynchronizationAnalyzer
|
|||
continue;
|
||||
}
|
||||
|
||||
if (candidateSourceIds != null && !candidateSourceIds.Contains(buffer.Descriptor.SourceId))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
var commonEndNs = Math.Min(referenceLatest.Value.TimestampNs, buffer.Latest?.TimestampNs ?? 0);
|
||||
var candidateSamples = ExtractMonoWindow(buffer, out var candidateBlock);
|
||||
if (candidateSamples.Length == 0 || candidateBlock == null)
|
||||
|
|
@ -363,7 +369,11 @@ public sealed class MimirAudioSynchronizationAnalyzer
|
|||
return (0.0, 0.0, 0);
|
||||
}
|
||||
|
||||
var candidateByEvent = candidateObservations.ToDictionary(observation => observation.EventIndex);
|
||||
var candidateByEvent = candidateObservations
|
||||
.GroupBy(observation => observation.EventIndex)
|
||||
.ToDictionary(
|
||||
group => group.Key,
|
||||
group => group.OrderByDescending(observation => observation.Energy).First());
|
||||
var delays = new List<(double Delay, double Weight)>();
|
||||
foreach (var reference in referenceObservations)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -5,7 +5,9 @@ public sealed class MimirSynchronizationHub : IDisposable
|
|||
private readonly List<IMimirStreamSource> sources = [];
|
||||
private readonly MimirAudioSynchronizationAnalyzer audioSynchronization = new();
|
||||
private readonly MimirAudioSynchronizationStateTracker audioSynchronizationState = new();
|
||||
private readonly Dictionary<string, MimirAudioSynchronizationReport> audioSynchronizationReports = new(StringComparer.Ordinal);
|
||||
private ulong ingestedSamples;
|
||||
private int nextAudioSynchronizationCandidate;
|
||||
|
||||
public MimirSynchronizationHub(MimirSynchronizationSettings settings)
|
||||
{
|
||||
|
|
@ -28,6 +30,9 @@ public sealed class MimirSynchronizationHub : IDisposable
|
|||
public IReadOnlyList<MimirAudioSynchronizationState> AudioSynchronizationStates =>
|
||||
audioSynchronizationState.States;
|
||||
|
||||
public IReadOnlyList<MimirAudioSynchronizationReport> AudioSynchronizationReports =>
|
||||
audioSynchronizationReports.Values.OrderBy(report => report.SourceId, StringComparer.Ordinal).ToArray();
|
||||
|
||||
public void AddSource(IMimirStreamSource source)
|
||||
{
|
||||
ObjectDisposedException.ThrowIf(disposed, this);
|
||||
|
|
@ -68,7 +73,42 @@ public sealed class MimirSynchronizationHub : IDisposable
|
|||
{
|
||||
ObjectDisposedException.ThrowIf(disposed, this);
|
||||
var reports = audioSynchronization.Analyze(Buffers.Buffers, referenceSourceId, approximateTimelineSeconds);
|
||||
audioSynchronizationState.Update(reports);
|
||||
StoreAudioSynchronizationReports(reports);
|
||||
return reports;
|
||||
}
|
||||
|
||||
public IReadOnlyList<MimirAudioSynchronizationReport> AnalyzeAudioSynchronizationStep(
|
||||
string referenceSourceId,
|
||||
double approximateTimelineSeconds,
|
||||
int maxCandidates = 1)
|
||||
{
|
||||
ObjectDisposedException.ThrowIf(disposed, this);
|
||||
var candidates = Buffers.Buffers
|
||||
.Where(buffer =>
|
||||
buffer.Descriptor.Kind == MimirStreamKind.Audio &&
|
||||
!string.Equals(buffer.Descriptor.SourceId, referenceSourceId, StringComparison.Ordinal) &&
|
||||
buffer.Latest?.AudioBlock != null)
|
||||
.OrderBy(buffer => buffer.Descriptor.SourceId, StringComparer.Ordinal)
|
||||
.Select(buffer => buffer.Descriptor.SourceId)
|
||||
.ToArray();
|
||||
if (candidates.Length == 0)
|
||||
{
|
||||
return [];
|
||||
}
|
||||
|
||||
var selected = new HashSet<string>(StringComparer.Ordinal);
|
||||
for (var count = 0; count < Math.Min(maxCandidates, candidates.Length); count++)
|
||||
{
|
||||
selected.Add(candidates[nextAudioSynchronizationCandidate % candidates.Length]);
|
||||
nextAudioSynchronizationCandidate++;
|
||||
}
|
||||
|
||||
var reports = audioSynchronization.Analyze(
|
||||
Buffers.Buffers,
|
||||
referenceSourceId,
|
||||
approximateTimelineSeconds,
|
||||
selected);
|
||||
StoreAudioSynchronizationReports(reports);
|
||||
return reports;
|
||||
}
|
||||
|
||||
|
|
@ -87,6 +127,16 @@ public sealed class MimirSynchronizationHub : IDisposable
|
|||
|
||||
private bool disposed;
|
||||
|
||||
private void StoreAudioSynchronizationReports(IReadOnlyList<MimirAudioSynchronizationReport> reports)
|
||||
{
|
||||
foreach (var report in reports)
|
||||
{
|
||||
audioSynchronizationReports[report.SourceId] = report;
|
||||
}
|
||||
|
||||
audioSynchronizationState.Update(reports);
|
||||
}
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
if (disposed)
|
||||
|
|
|
|||
Loading…
Reference in a new issue