Effect fixes

Drewol · May 8, 2021 · 102ca00 · 102ca00
1 parent 1a26e73
commit 102ca00
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/Audio/src/AudioBase.cpp b/Audio/src/AudioBase.cpp
@@ -5,7 +5,7 @@
 
 uint32 DSP::GetStartSample() const
 {
- return static_cast<uint32>(startTime * static_cast<double>(m_sampleRate) / 1000.0);
+ return static_cast<uint32>(startTime * static_cast<double>(m_audioBase->GetSampleRate()) / 1000.0);
 }
 
 uint32 DSP::GetCurrentSample() const

diff --git a/Audio/src/DSP.cpp b/Audio/src/DSP.cpp
@@ -354,11 +354,12 @@ void RetriggerDSP::Process(float *out, uint32 numSamples)
 
  const uint32 startSample = GetStartSample();
  const uint32 nowSample = GetCurrentSample();
+ const auto maxSample = m_audioBase->GetPCMCount();
 
  float *pcmSource = m_audioBase->GetPCM();
  double rateMult = (double)m_audioBase->GetSampleRate() / m_sampleRate;
  uint32 pcmStartSample = static_cast<uint32>(lastTimingPoint * ((double)m_audioBase->GetSampleRate() / 1000.0));
- uint32 baseStartRepeat = static_cast<uint32>(lastTimingPoint * ((double)m_sampleRate / 1000.0));
+ uint32 baseStartRepeat = static_cast<uint32>(lastTimingPoint * ((double)m_audioBase->GetSampleRate() / 1000.0));
 
  for (uint32 i = 0; i < numSamples; i++)
  {
@@ -370,21 +371,25 @@ void RetriggerDSP::Process(float *out, uint32 numSamples)
  int startOffset = 0;
  if (m_resetDuration > 0)
  {
- startOffset = (nowSample + i - baseStartRepeat) / (int)m_resetDuration;
+ startOffset = (nowSample + i - baseStartRepeat) / (int)(m_resetDuration * rateMult);
  startOffset = static_cast<int>(startOffset * m_resetDuration * rateMult);
  }
  else
  {
- startOffset = static_cast<int>((startSample - baseStartRepeat) * rateMult);
+ startOffset = static_cast<int>((startSample - baseStartRepeat));
  }
 
  int pcmSample = static_cast<int>(pcmStartSample) + startOffset + static_cast<int>(m_currentSample * rateMult);
  float gating = 1.0f;
  if (m_currentSample > m_gateLength)
  gating = 0;
  // Sample from buffer
- out[i * 2] = gating * pcmSource[pcmSample * 2] * mix + out[i * 2] * (1 - mix);
- out[i * 2 + 1] = gating * pcmSource[pcmSample * 2 + 1] * mix + out[i * 2 + 1] * (1 - mix);
+ assert(pcmSample < maxSample);
+ if (pcmSample < maxSample) //TODO: Improve whatever is necessary to make sure this never happens
+ {
+ out[i * 2] = gating * pcmSource[pcmSample * 2] * mix + out[i * 2] * (1 - mix);
+ out[i * 2 + 1] = gating * pcmSource[pcmSample * 2 + 1] * mix + out[i * 2 + 1] * (1 - mix);
+ }
 
  // Increase index
  m_currentSample = (m_currentSample + 1) % m_length;