react-native-simple-note-pitch-detector 0.2.9 → 0.3.1

package/android/src/main/java/expo/modules/simplenotepitchdetector/PitchAnalyzer.kt

@@ -10,12 +10,18 @@ import kotlin.math.floor
 import kotlin.math.log2
 import kotlin.math.round
 
+data class NoteAndDecibel(
+    val note: String = "",
+    val decibel: Float = 0f
+)
 
 class PitchAnalyzer {
 
     private val notes = arrayOf("C","C#","D","D#","E","F","F#","G","G#","A","A#","B")
+    private val notesBuffer = arrayOf(NoteAndDecibel(), NoteAndDecibel(), NoteAndDecibel(), NoteAndDecibel(), NoteAndDecibel())
+    private var counter = 0
 
-    private lateinit var onChangePitch: (String, Double) -> Unit
+    private lateinit var onChangePitch: (String) -> Unit
     private var isRecording = false
 
     private var dispatcher: AudioDispatcher? = null
@@ -24,9 +30,8 @@ class PitchAnalyzer {
 
     private val handler = PitchDetectionHandler { res, e ->
         val pitchInHz = res.pitch
-        val soundPressure = e.getdBSPL()
-
-        process(pitchInHz, soundPressure)
+        val decibel = e.getdBSPL().toFloat()
+        process(pitchInHz, decibel)
     }
 
     private fun prepare() {
@@ -36,19 +41,30 @@ class PitchAnalyzer {
         dispatcher?.addAudioProcessor(processor)
     }
 
-    private fun process(pitchInHz: Float, soundPressure: Double) {
+    private fun process(pitchInHz: Float, decibel: Float) {
         val freq = round(12 * (log2(pitchInHz / 440) / log2(2f)) + 69)
         val octave = (floor(freq / 12) - 1).toInt()
         val index = freq % 12
 
         if (!index.isNaN() && pitchInHz > 0) {
             val note = notes[index.toInt()]
+            var noteAndDecibel = NoteAndDecibel(note, decibel)
+
+            if (counter == notesBuffer.size) {
+                var s = ""
+                for (noteAndDecibel in notesBuffer) {
+                    s += noteAndDecibel.note + " " + noteAndDecibel.decibel
+                }
+                this.onChangePitch(s)
+                counter = 0
+            }
 
-            this.onChangePitch("$note$octave", soundPressure)
+            notesBuffer[counter] = noteAndDecibel
+            counter += 1
         }
     }
 
-    fun addOnChangePitchListener(onChangePitch: (String, Double) -> Unit) {
+    fun addOnChangePitchListener(onChangePitch: (String) -> Unit) {
         this.onChangePitch = onChangePitch
     }
 

package/android/src/main/java/expo/modules/simplenotepitchdetector/ReactNativeSimpleNotePitchDetectorModule.kt

@@ -20,10 +20,10 @@ class ReactNativeSimpleNotePitchDetectorModule : Module() {
     }
 
     Function("start") {
-      pitchAnalyzer.addOnChangePitchListener { note: String, soundPressure: Double ->
+      pitchAnalyzer.addOnChangePitchListener { note: String->
         this@ReactNativeSimpleNotePitchDetectorModule.sendEvent(
           "onChangePitch",
-          bundleOf("note" to note, "soundPressure" to soundPressure)
+          bundleOf("note" to note, "soundPressure" to "")
         )
       }
 

package/ios/ReactNativeSimpleNotePitchDetectorModule.swift

@@ -4,6 +4,10 @@ import Pitchy
 
 public class ReactNativeSimpleNotePitchDetectorModule: Module {
     
+    var bufferSize = 3
+    var notes = Array(repeating: "", count: 3)
+    var counter = 0
+    
     lazy var pitchEngine: PitchEngine = { [weak self] in
         let config = Config(estimationStrategy: .yin)
         let pitchEngine = PitchEngine(config: config, delegate: self)
@@ -11,6 +15,23 @@ public class ReactNativeSimpleNotePitchDetectorModule: Module {
         return pitchEngine
     }()
     
+    func mostFrequent(array: [String]) -> String? {
+        var counts = [String: Int]()
+
+        // Count the values with using forEach
+        array.forEach { counts[$0] = (counts[$0] ?? 0) + 1 }
+
+        // Find the most frequent value and its count with max(by:)
+        if let (value, count) = counts.max(by: {$0.1 < $1.1}) {
+            if (count <= 1) {
+                return nil
+            }
+            return value
+        }
+
+        return nil
+    }
+    
     var isRecording = false
 
     public func definition() -> ModuleDefinition {
@@ -45,8 +66,24 @@ extension ReactNativeSimpleNotePitchDetectorModule: PitchEngineDelegate {
         guard absOffsetPercentage > 1.0 else {
             return
         }
+        
+        if (counter == bufferSize) {
+            var result = mostFrequent(array: notes)
+            if (result != nil) {
+                self.sendEvent("onChangePitch", ["note" :  result, "soundPressure" : ""])
+            }
+            counter = 0
+        }
+        
+        do {
+            let note = try Note(frequency: pitch.wave.frequency)
+            notes[counter] = note.string
+            counter += 1
+        } catch {
+            
+        }
 
-        self.sendEvent("onChangePitch", ["note" :  pitch.note.string, "soundPressure" : pitchEngine.signalLevel])
+//        self.sendEvent("onChangePitch", ["note" :  pitch.note.string, "soundPressure" : pitchEngine.signalLevel])
     }
 
     public func pitchEngine(_ pitchEngine: PitchEngine, didReceiveError error: Error) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-simple-note-pitch-detector",
-  "version": "0.2.9",
+  "version": "0.3.1",
   "description": "a simple react native library to detect the pitch of the input recording",
   "main": "build/index.js",
   "types": "build/index.d.ts",