Fix/unpushed changes (#279)

* refactor: refactored types and constants in AudioArray

* refactor: refactored types and constants in AnalyserNode

* refactor: refactored types and constants in AudioBus

* fix: added necessary include

* refactor: refactored types and constants in AudioBuffer

* refactor: refactored types and constants in AudioBufferSourceNode

* refactor: refactored types and constants in BaseAudioContext

* refactor: refactored types and constants in AudioContext

* refactor: refactored types and constants in AudioDecoder and AudioDestinationNode

* refactor: refactored types and constants in AudioNode

* refactor: refactored types and constants in AudioNodeManager

* refactor: refactored types and constants in AudioParam

* refactor: refactored types and constants in AudioScheduledSourceNode

* refactor: refactored types and constants in BiquadFilterNode

* refactor: refactored types and constants in GainNode

* refactor: refactored types and constants in OscillatorNode

* refactor: refactored types and constants in StereoPannerNode

* refactor: refactored types and constants in PeriodicWave

* refactor: refactored types in utils

* ci: yarn format

* fix: fixed analyser types

* refactor: host objects

* fix: fixed analyser node

* refactor: refactored ios audio player

* ci: yarn format

* refactor: replaced M_PI with our PI constant

---------

Co-authored-by: Maciej Makowski <maciej.makowski2608@gmail.com>

Author: maciejmakowski2003

packages/react-native-audio-api/common/cpp/HostObjects/AnalyserNodeHostObject.h

@@ -126,25 +126,25 @@ class AnalyserNodeHostObject : public AudioNodeHostObject {
 
   JSI_PROPERTY_SETTER(fftSize) {
     auto analyserNode = std::static_pointer_cast<AnalyserNode>(node_);
-    auto fftSize = static_cast<size_t>(value.getNumber());
+    auto fftSize = static_cast<int>(value.getNumber());
     analyserNode->setFftSize(fftSize);
   }
 
   JSI_PROPERTY_SETTER(minDecibels) {
     auto analyserNode = std::static_pointer_cast<AnalyserNode>(node_);
-    auto minDecibels = static_cast<int>(value.getNumber());
+    auto minDecibels = static_cast<float>(value.getNumber());
     analyserNode->setMinDecibels(minDecibels);
   }
 
   JSI_PROPERTY_SETTER(maxDecibels) {
     auto analyserNode = std::static_pointer_cast<AnalyserNode>(node_);
-      auto maxDecibels = static_cast<int>(value.getNumber());
+      auto maxDecibels = static_cast<float>(value.getNumber());
       analyserNode->setMaxDecibels(maxDecibels);
   }
 
   JSI_PROPERTY_SETTER(smoothingTimeConstant) {
     auto analyserNode = std::static_pointer_cast<AnalyserNode>(node_);
-    auto smoothingTimeConstant = static_cast<int>(value.getNumber());
+    auto smoothingTimeConstant = static_cast<float>(value.getNumber());
     analyserNode->setSmoothingTimeConstant(smoothingTimeConstant);
   }
 };

packages/react-native-audio-api/common/cpp/core/AnalyserNode.cpp

@@ -80,7 +80,7 @@ void AnalyserNode::getByteFrequencyData(uint8_t *data, int length) {
   doFFTAnalysis();
 
   auto magnitudeBufferData = magnitudeBuffer_->getData();
-    length = std::min(static_cast<int>(magnitudeBuffer_->getSize()), length);
+  length = std::min(static_cast<int>(magnitudeBuffer_->getSize()), length);
 
   const auto rangeScaleFactor =
       maxDecibels_ == minDecibels_ ? 1 : 1 / (maxDecibels_ - minDecibels_);
@@ -103,7 +103,7 @@ void AnalyserNode::getByteFrequencyData(uint8_t *data, int length) {
 }
 
 void AnalyserNode::getFloatTimeDomainData(float *data, int length) {
-  auto size = fftSize_ ? fftSize_ < length : length;
+  auto size = std::min(fftSize_, length);
 
   for (int i = 0; i < size; i++) {
     data[i] = inputBuffer_->getData()
@@ -113,7 +113,7 @@ void AnalyserNode::getFloatTimeDomainData(float *data, int length) {
 }
 
 void AnalyserNode::getByteTimeDomainData(uint8_t *data, int length) {
-  auto size = fftSize_ ? fftSize_ < length : length;
+  auto size = std::min(fftSize_, length);
 
   for (int i = 0; i < size; i++) {
     auto value = inputBuffer_->getData()
@@ -148,7 +148,7 @@ void AnalyserNode::processNode(
 
   if (vWriteIndex_ + framesToProcess > inputBuffer_->getSize()) {
     auto framesToCopy =
-        static_cast<int>(inputBuffer_->getSize() - vWriteIndex_);
+        static_cast<int>(inputBuffer_->getSize()) - vWriteIndex_;
     memcpy(
         inputBuffer_->getData() + vWriteIndex_,
         downMixBus_->getChannel(0)->getData(),
@@ -229,8 +229,7 @@ void AnalyserNode::applyWindow(float *data, int length) {
 
   for (int i = 0; i < length; ++i) {
     auto x = static_cast<float>(i) / static_cast<float>(length);
-    auto window = a0 - a1 * cos(2 * static_cast<float>(M_PI) * x) +
-        a2 * cos(4 * static_cast<float>(M_PI) * x);
+    auto window = a0 - a1 * cos(2 * PI * x) + a2 * cos(4 * PI * x);
     data[i] *= window;
   }
 }

packages/react-native-audio-api/common/cpp/core/BiquadFilterNode.cpp

@@ -67,8 +67,7 @@ void BiquadFilterNode::getFrequencyResponse(
   float a2 = a2_;
 
   for (size_t i = 0; i < frequencyArraySize; i++) {
-    auto omega = static_cast<float>(M_PI) * frequencyArray[i] /
-        context_->getNyquistFrequency();
+    auto omega = PI * frequencyArray[i] / context_->getNyquistFrequency();
     auto z = std::complex<float>(cos(omega), sin(omega));
     auto response = ((b0 * z + b1) * z + b2) / ((z + a1) * z + a2);
     magResponseOutput[i] = static_cast<float>(abs(response));
@@ -113,7 +112,7 @@ void BiquadFilterNode::setLowpassCoefficients(float frequency, float Q) {
   Q = std::max(0.0f, Q);
   float g = std::pow(10.0f, 0.05f * Q);
 
-  float theta = M_PI * frequency;
+  float theta = PI * frequency;
   float alpha = std::sin(theta) / (2 * g);
   float cosW = std::cos(theta);
   float beta = (1 - cosW) / 2;
@@ -136,7 +135,7 @@ void BiquadFilterNode::setHighpassCoefficients(float frequency, float Q) {
   Q = std::max(0.0f, Q);
   float g = std::pow(10.0f, 0.05f * Q);
 
-  float theta = M_PI * frequency;
+  float theta = PI * frequency;
   float alpha = std::sin(theta) / (2 * g);
   float cosW = std::cos(theta);
   float beta = (1 - cosW) / 2;
@@ -159,7 +158,7 @@ void BiquadFilterNode::setBandpassCoefficients(float frequency, float Q) {
     return;
   }
 
-  float w0 = M_PI * frequency;
+  float w0 = PI * frequency;
   float alpha = std::sin(w0) / (2 * Q);
   float k = std::cos(w0);
 
@@ -181,7 +180,7 @@ void BiquadFilterNode::setLowshelfCoefficients(float frequency, float gain) {
     return;
   }
 
-  float w0 = M_PI * frequency;
+  float w0 = PI * frequency;
   float alpha =
       0.5f * std::sin(w0) * std::sqrt((A + 1 / A) * (1 / 1.0f - 1) + 2);
   float k = std::cos(w0);
@@ -210,7 +209,7 @@ void BiquadFilterNode::setHighshelfCoefficients(float frequency, float gain) {
     return;
   }
 
-  float w0 = M_PI * frequency;
+  float w0 = PI * frequency;
   float alpha =
       0.5f * std::sin(w0) * std::sqrt((A + 1 / A) * (1 / 1.0f - 1) + 2);
   float k = std::cos(w0);
@@ -243,7 +242,7 @@ void BiquadFilterNode::setPeakingCoefficients(
     return;
   }
 
-  float w0 = M_PI * frequency;
+  float w0 = PI * frequency;
   float alpha = std::sin(w0) / (2 * Q);
   float k = std::cos(w0);
 
@@ -270,7 +269,7 @@ void BiquadFilterNode::setNotchCoefficients(float frequency, float Q) {
     return;
   }
 
-  float w0 = M_PI * frequency;
+  float w0 = PI * frequency;
   float alpha = std::sin(w0) / (2 * Q);
   float k = std::cos(w0);
 
@@ -291,7 +290,7 @@ void BiquadFilterNode::setAllpassCoefficients(float frequency, float Q) {
     return;
   }
 
-  float w0 = M_PI * frequency;
+  float w0 = PI * frequency;
   float alpha = std::sin(w0) / (2 * Q);
   float k = std::cos(w0);
 

packages/react-native-audio-api/ios/core/AudioPlayer.h

@@ -12,13 +12,13 @@ typedef void (^RenderAudioBlock)(AudioBufferList *outputBuffer, int numFrames);
 @property (nonatomic, strong) AVAudioFormat *format;
 @property (nonatomic, strong) AVAudioSourceNode *sourceNode;
 @property (nonatomic, copy) RenderAudioBlock renderAudio;
-@property (nonatomic, assign) int sampleRate;
+@property (nonatomic, assign) float sampleRate;
 
 - (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio;
 
-- (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio sampleRate:(int)sampleRate;
+- (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio sampleRate:(float)sampleRate;
 
-- (int)getSampleRate;
+- (float)getSampleRate;
 
 - (void)start;
 

packages/react-native-audio-api/ios/core/AudioPlayer.m

@@ -49,7 +49,7 @@ - (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio
   return self;
 }
 
-- (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio sampleRate:(int)sampleRate
+- (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio sampleRate:(float)sampleRate
 {
   if (self = [super init]) {
     self.renderAudio = [renderAudio copy];
@@ -96,7 +96,7 @@ - (instancetype)initWithRenderAudioBlock:(RenderAudioBlock)renderAudio sampleRat
   return self;
 }
 
-- (int)getSampleRate
+- (float)getSampleRate
 {
   return self.sampleRate;
 }

packages/react-native-audio-api/ios/core/IOSAudioPlayer.h

@@ -24,10 +24,10 @@ class IOSAudioPlayer {
       const std::function<void(AudioBus *, int)> &renderAudio);
   IOSAudioPlayer(
       const std::function<void(AudioBus *, int)> &renderAudio,
-      int sampleRate);
+      float sampleRate);
   ~IOSAudioPlayer();
 
-  int getSampleRate() const;
+  float getSampleRate() const;
 
   void start();
   void stop();

packages/react-native-audio-api/ios/core/IOSAudioPlayer.mm

@@ -37,7 +37,7 @@
   audioBus_ = new AudioBus([audioPlayer_ getSampleRate], RENDER_QUANTUM_SIZE, CHANNEL_COUNT);
 }
 
-IOSAudioPlayer::IOSAudioPlayer(const std::function<void(AudioBus *, int)> &renderAudio, int sampleRate)
+IOSAudioPlayer::IOSAudioPlayer(const std::function<void(AudioBus *, int)> &renderAudio, float sampleRate)
     : renderAudio_(renderAudio), audioBus_(0)
 {
   RenderAudioBlock renderAudioBlock = ^(AudioBufferList *outputData, int numFrames) {
@@ -86,7 +86,7 @@
   return [audioPlayer_ stop];
 }
 
-int IOSAudioPlayer::getSampleRate() const
+float IOSAudioPlayer::getSampleRate() const
 {
   return [audioPlayer_ getSampleRate];
 }