fix: fixed typos and oscillator perf fix (#990)

maciejmakowski2003 · web-flow · commit 2787143c520f · 2026-03-17T15:28:23.000+01:00
* fix: fixed typos

* refactor: refined processing loop in OscillatorNode for better performance and readability

* fix: constants refinement

* ci: formatting

* refactor: static constexpr to inline constexpr fo global constants

---------

Co-authored-by: maciejmakowski2003 &lt;maciejmakowski2003@users.noreply.github.com&gt;
diff --git a/packages/custom-node-generator/templates/basic/shared/MyProcessorNode.cpp b/packages/custom-node-generator/templates/basic/shared/MyProcessorNode.cpp
@@ -2,7 +2,7 @@
 
 namespace audioapi {
 MyProcessorNode::MyProcessorNode(
-    const std::shared_ptr<BaseAudioContext> &context, )
+    const std::shared_ptr<BaseAudioContext> &context)
     : AudioNode(context) {
   isInitialized_.store(true, std::memory_order_release);
 }
diff --git a/packages/custom-node-generator/templates/basic/shared/MyProcessorNode.h b/packages/custom-node-generator/templates/basic/shared/MyProcessorNode.h
@@ -7,7 +7,7 @@ namespace audioapi {
 
 class MyProcessorNode : public AudioNode {
 public:
-  explicit MyProcessorNode(const std::shared_ptr<BaseAudioContext> &context, );
+  explicit MyProcessorNode(const std::shared_ptr<BaseAudioContext> &context);
 
 protected:
   std::shared_ptr<DSPAudioBuffer>
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/sources/OscillatorNode.cpp b/packages/react-native-audio-api/common/cpp/audioapi/core/sources/OscillatorNode.cpp
@@ -1,5 +1,6 @@
 #include <audioapi/core/BaseAudioContext.h>
 #include <audioapi/core/sources/OscillatorNode.h>
+#include <audioapi/core/utils/Constants.h>
 #include <audioapi/dsp/AudioUtils.hpp>
 #include <audioapi/types/NodeOptions.h>
 #include <audioapi/utils/AudioArray.hpp>
@@ -75,42 +76,38 @@ std::shared_ptr<DSPAudioBuffer> OscillatorNode::processNode(
   }
 
   auto time =
-      context->getCurrentTime() + static_cast<double>(startOffset) * 1.0 / context->getSampleRate();
+      context->getCurrentTime() + static_cast<double>(startOffset) / context->getSampleRate();
   auto detuneSpan = detuneParam_->processARateParam(framesToProcess, time)->getChannel(0)->span();
   auto freqSpan = frequencyParam_->processARateParam(framesToProcess, time)->getChannel(0)->span();
 
   const auto tableSize = static_cast<float>(periodicWave_->getPeriodicWaveSize());
   const auto tableScale = periodicWave_->getScale();
   const auto numChannels = processingBuffer->getNumberOfChannels();
 
-  auto finalPhase = phase_;
+  auto channelSpan = processingBuffer->getChannel(0)->span();
+  float currentPhase = phase_;
 
-  for (size_t ch = 0; ch < numChannels; ch += 1) {
-    auto channelSpan = processingBuffer->getChannel(ch)->span();
-    float currentPhase = phase_;
+  for (size_t i = startOffset; i < offsetLength; i += 1) {
+    auto detuneRatio = detuneSpan[i] == 0 ? 1.0f : exp2f(detuneSpan[i] * CENTS_TO_RATIO);
+    auto detunedFrequency = freqSpan[i] * detuneRatio;
+    auto phaseIncrement = detunedFrequency * tableScale;
 
-    for (size_t i = startOffset; i < offsetLength; i += 1) {
-      auto detuneRatio = detuneSpan[i] == 0 ? 1.0f : std::pow(2.0f, detuneSpan[i] / 1200.0f);
-      auto detunedFrequency = freqSpan[i] * detuneRatio;
-      auto phaseIncrement = detunedFrequency * tableScale;
+    channelSpan[i] = periodicWave_->getSample(detunedFrequency, currentPhase, phaseIncrement);
 
-      channelSpan[i] = periodicWave_->getSample(detunedFrequency, currentPhase, phaseIncrement);
+    currentPhase += phaseIncrement;
 
-      currentPhase += phaseIncrement;
-
-      if (currentPhase >= tableSize) {
-        currentPhase -= tableSize;
-      } else if (currentPhase < 0.0f) {
-        currentPhase += tableSize;
-      }
-    }
-
-    if (ch == 0) {
-      finalPhase = currentPhase;
+    if (currentPhase >= tableSize) {
+      currentPhase -= tableSize;
+    } else if (currentPhase < 0.0f) {
+      currentPhase += tableSize;
     }
   }
 
-  phase_ = finalPhase;
+  phase_ = currentPhase;
+
+  for (size_t ch = 1; ch < numChannels; ch += 1) {
+    processingBuffer->getChannel(ch)->copy(*processingBuffer->getChannel(0));
+  }
   handleStopScheduled();
 
   return processingBuffer;
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/core/utils/Constants.h b/packages/react-native-audio-api/common/cpp/audioapi/core/utils/Constants.h
@@ -9,30 +9,31 @@
 
 namespace audioapi {
 // audio
-static constexpr int RENDER_QUANTUM_SIZE = 128;
-static constexpr size_t MAX_FFT_SIZE = 32768;
-static constexpr int MAX_CHANNEL_COUNT = 32;
-static constexpr float DEFAULT_SAMPLE_RATE = 44100.0f;
-static constexpr int OCTAVE_RANGE = 1200;
-static constexpr int BIQUAD_GAIN_DB_FACTOR = 40;
+inline constexpr int RENDER_QUANTUM_SIZE = 128;
+inline constexpr size_t MAX_FFT_SIZE = 32768;
+inline constexpr int MAX_CHANNEL_COUNT = 32;
+inline constexpr float DEFAULT_SAMPLE_RATE = 44100.0f;
+inline constexpr int OCTAVE_RANGE = 1200;
+inline constexpr int BIQUAD_GAIN_DB_FACTOR = 40;
+inline constexpr float CENTS_TO_RATIO = 1.0f / 1200.0f;
 
 // stretcher
-static constexpr float UPPER_FREQUENCY_LIMIT_DETECTION = 333.0f;
-static constexpr float LOWER_FREQUENCY_LIMIT_DETECTION = 55.0f;
+inline constexpr float UPPER_FREQUENCY_LIMIT_DETECTION = 333.0f;
+inline constexpr float LOWER_FREQUENCY_LIMIT_DETECTION = 55.0f;
 
 // general
-static constexpr float MOST_POSITIVE_SINGLE_FLOAT =
+inline constexpr float MOST_POSITIVE_SINGLE_FLOAT =
     static_cast<float>(std::numeric_limits<float>::max());
-static constexpr float MOST_NEGATIVE_SINGLE_FLOAT =
+inline constexpr float MOST_NEGATIVE_SINGLE_FLOAT =
     static_cast<float>(std::numeric_limits<float>::lowest());
-static float LOG2_MOST_POSITIVE_SINGLE_FLOAT = std::log2(MOST_POSITIVE_SINGLE_FLOAT);
-static float LOG10_MOST_POSITIVE_SINGLE_FLOAT = std::log10(MOST_POSITIVE_SINGLE_FLOAT);
-static constexpr float PI = std::numbers::pi_v<float>;
+inline float LOG2_MOST_POSITIVE_SINGLE_FLOAT = std::log2(MOST_POSITIVE_SINGLE_FLOAT);
+inline float LOG10_MOST_POSITIVE_SINGLE_FLOAT = std::log10(MOST_POSITIVE_SINGLE_FLOAT);
+inline constexpr float PI = std::numbers::pi_v<float>;
 
 // buffer sizes
-static constexpr size_t PROMISE_VENDOR_THREAD_POOL_WORKER_COUNT = 4;
-static constexpr size_t PROMISE_VENDOR_THREAD_POOL_LOAD_BALANCER_QUEUE_SIZE = 32;
-static constexpr size_t PROMISE_VENDOR_THREAD_POOL_WORKER_QUEUE_SIZE = 32;
+inline constexpr size_t PROMISE_VENDOR_THREAD_POOL_WORKER_COUNT = 4;
+inline constexpr size_t PROMISE_VENDOR_THREAD_POOL_LOAD_BALANCER_QUEUE_SIZE = 32;
+inline constexpr size_t PROMISE_VENDOR_THREAD_POOL_WORKER_QUEUE_SIZE = 32;
 
 // Cache line size
 #ifdef __cpp_lib_hardware_interference_size
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/utils/AudioArray.hpp b/packages/react-native-audio-api/common/cpp/audioapi/utils/AudioArray.hpp
@@ -271,8 +271,8 @@ class AlignedAudioArray {
   size_t size_ = 0;
 };
 
-static constexpr size_t kDSPAlignment = 64;
+inline constexpr size_t DSP_ALIGNMENT = 64;
 using AudioArray = AlignedAudioArray<alignof(std::max_align_t)>;
-using DSPAudioArray = AlignedAudioArray<kDSPAlignment>;
+using DSPAudioArray = AlignedAudioArray<DSP_ALIGNMENT>;
 
 } // namespace audioapi
diff --git a/packages/react-native-audio-api/common/cpp/audioapi/utils/AudioBuffer.hpp b/packages/react-native-audio-api/common/cpp/audioapi/utils/AudioBuffer.hpp
@@ -453,6 +453,6 @@ class AlignedAudioBuffer {
 };
 
 using AudioBuffer = AlignedAudioBuffer<alignof(std::max_align_t)>;
-using DSPAudioBuffer = AlignedAudioBuffer<kDSPAlignment>;
+using DSPAudioBuffer = AlignedAudioBuffer<DSP_ALIGNMENT>;
 
 } // namespace audioapi

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`
`3`	`3`	`namespace audioapi {`
`4`	`4`	`MyProcessorNode::MyProcessorNode(`
`5`		`- const std::shared_ptr<BaseAudioContext> &context, )`
	`5`	`+ const std::shared_ptr<BaseAudioContext> &context)`
`6`	`6`	`: AudioNode(context) {`
`7`	`7`	`isInitialized_.store(true, std::memory_order_release);`
`8`	`8`	`}`