Stone_Red/BeatDetector
1
0
Fork 0
mirror of https://github.com/Stone-Red-Code/BeatDetector.git synced 2026-09-04 00:46:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Multiple improvments

Browse Source
This commit is contained in:
Stone_Red
2024-01-02 14:11:31 +01:00
parent 888c017a82
commit ab64e2c987
4 changed files with 84 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
AudioProcessing/AudioBeatDetector.cs
+13 -5
View File
@@ -6,7 +6,7 @@ using System.Linq;
namespace BeatDetector.AudioProcessing;
internal class AudioBeatDetector
internal class AudioBeatDetector : IDisposable
{
public event EventHandler<BeatDetectorEventArgs>? OnBeat;
@@ -20,8 +20,9 @@ internal class AudioBeatDetector
private readonly int chunkCount;
private readonly BeatChunk[] beatChunks;
public AudioBeatDetector(TimeSpan beatDetectionDelay, int fftLength, int chunkCount)
public AudioBeatDetector(IWaveIn waveIn, TimeSpan beatDetectionDelay, int fftLength, int chunkCount)
{
this.waveIn = waveIn;
this.beatDetectionDelay = beatDetectionDelay;
this.chunkCount = chunkCount;
this.fftLength = fftLength;
@@ -38,10 +39,12 @@ internal class AudioBeatDetector
sampleAggregator.FftCalculated += new EventHandler<FftEventArgs>(FftCalculated);
sampleAggregator.PerformFFT = true;
waveIn = new WasapiLoopbackCapture();
waveIn.DataAvailable += OnDataAvailable;
}
waveIn.StartRecording();
public void Dispose()
{
waveIn.DataAvailable -= OnDataAvailable;
}
private void OnDataAvailable(object? sender, WaveInEventArgs e)
@@ -77,7 +80,7 @@ internal class AudioBeatDetector
double averageEnergyLevel = beatChunk.EnergyHistory.Count > 0 ? beatChunk.EnergyHistory.Average() : double.MaxValue;
if (beatChunk.StopWatch.Elapsed >= beatDetectionDelay)
if (beatChunk.StopWatch.Elapsed >= beatDetectionDelay || beatDetectionDelay <= TimeSpan.Zero)
{
double difference = energyLevel - averageEnergyLevel;
@@ -88,6 +91,11 @@ internal class AudioBeatDetector
}
else
{
//if (difference > 0)
//{
// beatChunk.AverageDifference = (difference + beatChunk.AverageDifference) / 2.00001;
//}
OnNoBeat?.Invoke(this, new BeatDetectorEventArgs(chunkIndex, 0));
}
beatChunk.StopWatch.Restart();