react-native-simple-note-pitch-detector 0.3.3 → 0.3.5

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

@@ -6,7 +6,6 @@ import be.tarsos.dsp.io.android.AudioDispatcherFactory
 import be.tarsos.dsp.pitch.PitchDetectionHandler
 import be.tarsos.dsp.pitch.PitchProcessor
 import be.tarsos.dsp.pitch.PitchProcessor.PitchEstimationAlgorithm
-import kotlin.math.floor
 import kotlin.math.log2
 import kotlin.math.round
 
@@ -21,7 +20,7 @@ class PitchAnalyzer {
     private val notesBuffer = Array(6) { NoteAndDecibel() }
     private var counter = 0
 
-    private lateinit var onChangePitch: (String) -> Unit
+    private lateinit var onChangeNote: (String) -> Unit
     private var isRecording = false
 
     private var dispatcher: AudioDispatcher? = null
@@ -42,21 +41,18 @@ class PitchAnalyzer {
     }
 
     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
+        val index = round(12 * (log2(pitchInHz / 440) / log2(2f)) + 69) % 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 + ","
+                var mostFrequentNote = getMostFrequentNote(notesBuffer)
+
+                if (mostFrequentNote != null) {
+                    onChangeNote(mostFrequentNote)
                 }
-                this.onChangePitch(s.substring(0, s.length - 1))
-                counter = 0
             }
 
             notesBuffer[counter] = noteAndDecibel
@@ -64,8 +60,8 @@ class PitchAnalyzer {
         }
     }
 
-    fun addOnChangePitchListener(onChangePitch: (String) -> Unit) {
-        this.onChangePitch = onChangePitch
+    fun addOnChangeNoteListener(onChangeNote: (String) -> Unit) {
+        this.onChangeNote = onChangeNote
     }
 
     fun start() {
@@ -83,4 +79,31 @@ class PitchAnalyzer {
     fun isRecording(): Boolean {
         return isRecording
     }
+
+    private fun getMostFrequentNote(notes: Array<NoteAndDecibel>) : String? {
+        val noteToDecibel = mutableMapOf<String, Float>();
+        notes.forEach {
+            if (!noteToDecibel.containsKey(it.note)) {
+                noteToDecibel[it.note] = 0f
+            }
+
+            noteToDecibel[it.note] = noteToDecibel[it.note]!! + it.decibel
+        }
+
+        var mostFrequentNote = ""
+        var maxDecibel = 0f
+
+        noteToDecibel.forEach {
+            if (mostFrequentNote == "" || it.value < maxDecibel) {
+                mostFrequentNote = it.key
+                maxDecibel = it.value
+            }
+        }
+
+        if (mostFrequentNote == "") {
+            return null
+        }
+
+        return mostFrequentNote
+    }
 }

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

@@ -13,17 +13,17 @@ class ReactNativeSimpleNotePitchDetectorModule : Module() {
 
     Name("ReactNativeSimpleNotePitchDetector")
 
-    Events("onChangePitch")
+    Events("onChangeNote")
 
     Function("isRecording") {
       pitchAnalyzer.isRecording()
     }
 
     Function("start") {
-      pitchAnalyzer.addOnChangePitchListener { note: String->
+      pitchAnalyzer.addOnChangeNoteListener { note: String ->
         this@ReactNativeSimpleNotePitchDetectorModule.sendEvent(
-          "onChangePitch",
-          bundleOf("note" to note, "soundPressure" to "")
+          "onChangeNote",
+          bundleOf("note" to note)
         )
       }
 

package/build/ReactNativeSimpleNotePitchDetector.types.d.ts

@@ -1,6 +1,5 @@
 export type ChangeEventPayload = {
     note: string;
-    soundPressure: number;
 };
 export type ReactNativeSimpleNotePitchDetectorViewProps = {
     name: string;

package/build/ReactNativeSimpleNotePitchDetector.types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeSimpleNotePitchDetector.types.d.ts","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;CACvB,CAAC;AAEF,MAAM,MAAM,2CAA2C,GAAG;IACxD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}
+{"version":3,"file":"ReactNativeSimpleNotePitchDetector.types.d.ts","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,kBAAkB,GAAG;IAC/B,IAAI,EAAE,MAAM,CAAC;CACd,CAAC;AAEF,MAAM,MAAM,2CAA2C,GAAG;IACxD,IAAI,EAAE,MAAM,CAAC;CACd,CAAC"}

package/build/ReactNativeSimpleNotePitchDetector.types.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeSimpleNotePitchDetector.types.js","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.types.ts"],"names":[],"mappings":"","sourcesContent":["export type ChangeEventPayload = {\n  note: string;\n  soundPressure: number;\n};\n\nexport type ReactNativeSimpleNotePitchDetectorViewProps = {\n  name: string;\n};\n"]}
+{"version":3,"file":"ReactNativeSimpleNotePitchDetector.types.js","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.types.ts"],"names":[],"mappings":"","sourcesContent":["export type ChangeEventPayload = {\n  note: string;\n};\n\nexport type ReactNativeSimpleNotePitchDetectorViewProps = {\n  name: string;\n};\n"]}

package/build/ReactNativeSimpleNotePitchDetector.web.d.ts

@@ -1,4 +1,4 @@
 import * as React from "react";
 import { ReactNativeSimpleNotePitchDetectorViewProps } from "./ReactNativeSimpleNotePitchDetector.types";
-export default function ExpoSettingsView(props: ReactNativeSimpleNotePitchDetectorViewProps): React.JSX.Element;
+export default function ReactNativeSimpleNotePitchDetectorView(props: ReactNativeSimpleNotePitchDetectorViewProps): React.JSX.Element;
 //# sourceMappingURL=ReactNativeSimpleNotePitchDetector.web.d.ts.map

package/build/ReactNativeSimpleNotePitchDetector.web.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeSimpleNotePitchDetector.web.d.ts","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,2CAA2C,EAAE,MAAM,4CAA4C,CAAC;AAEzG,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,KAAK,EAAE,2CAA2C,qBAOnD"}
+{"version":3,"file":"ReactNativeSimpleNotePitchDetector.web.d.ts","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAE/B,OAAO,EAAE,2CAA2C,EAAE,MAAM,4CAA4C,CAAC;AAEzG,MAAM,CAAC,OAAO,UAAU,sCAAsC,CAC5D,KAAK,EAAE,2CAA2C,qBAOnD"}

package/build/ReactNativeSimpleNotePitchDetector.web.js

@@ -1,5 +1,5 @@
 import * as React from "react";
-export default function ExpoSettingsView(props) {
+export default function ReactNativeSimpleNotePitchDetectorView(props) {
     return (React.createElement("div", null,
         React.createElement("span", null, props.name)));
 }

package/build/ReactNativeSimpleNotePitchDetector.web.js.map

@@ -1 +1 @@
-{"version":3,"file":"ReactNativeSimpleNotePitchDetector.web.js","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,MAAM,CAAC,OAAO,UAAU,gBAAgB,CACtC,KAAkD;IAElD,OAAO,CACL;QACE,kCAAO,KAAK,CAAC,IAAI,CAAQ,CACrB,CACP,CAAC;AACJ,CAAC","sourcesContent":["import * as React from \"react\";\n\nimport { ReactNativeSimpleNotePitchDetectorViewProps } from \"./ReactNativeSimpleNotePitchDetector.types\";\n\nexport default function ExpoSettingsView(\n  props: ReactNativeSimpleNotePitchDetectorViewProps\n) {\n  return (\n    <div>\n      <span>{props.name}</span>\n    </div>\n  );\n}\n"]}
+{"version":3,"file":"ReactNativeSimpleNotePitchDetector.web.js","sourceRoot":"","sources":["../src/ReactNativeSimpleNotePitchDetector.web.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,OAAO,CAAC;AAI/B,MAAM,CAAC,OAAO,UAAU,sCAAsC,CAC5D,KAAkD;IAElD,OAAO,CACL;QACE,kCAAO,KAAK,CAAC,IAAI,CAAQ,CACrB,CACP,CAAC;AACJ,CAAC","sourcesContent":["import * as React from \"react\";\n\nimport { ReactNativeSimpleNotePitchDetectorViewProps } from \"./ReactNativeSimpleNotePitchDetector.types\";\n\nexport default function ReactNativeSimpleNotePitchDetectorView(\n  props: ReactNativeSimpleNotePitchDetectorViewProps\n) {\n  return (\n    <div>\n      <span>{props.name}</span>\n    </div>\n  );\n}\n"]}

package/build/index.d.ts

@@ -3,6 +3,6 @@ import { ChangeEventPayload, ReactNativeSimpleNotePitchDetectorViewProps } from
 export declare function start(): any;
 export declare function stop(): any;
 export declare function isRecording(): any;
-export declare function onChangePitch(listener: (event: ChangeEventPayload) => void): Subscription;
+export declare function onChangeNote(listener: (event: ChangeEventPayload) => void): Subscription;
 export { ReactNativeSimpleNotePitchDetectorViewProps, ChangeEventPayload };
 //# sourceMappingURL=index.d.ts.map

package/build/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACb,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,kBAAkB,EAClB,2CAA2C,EAC5C,MAAM,4CAA4C,CAAC;AAEpD,wBAAgB,KAAK,QAEpB;AAED,wBAAgB,IAAI,QAEnB;AAED,wBAAgB,WAAW,QAE1B;AAOD,wBAAgB,aAAa,CAC3B,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,GAC5C,YAAY,CAEd;AAED,OAAO,EAAE,2CAA2C,EAAE,kBAAkB,EAAE,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,YAAY,EACb,MAAM,mBAAmB,CAAC;AAG3B,OAAO,EACL,kBAAkB,EAClB,2CAA2C,EAC5C,MAAM,4CAA4C,CAAC;AAEpD,wBAAgB,KAAK,QAEpB;AAED,wBAAgB,IAAI,QAEnB;AAED,wBAAgB,WAAW,QAE1B;AAOD,wBAAgB,YAAY,CAC1B,QAAQ,EAAE,CAAC,KAAK,EAAE,kBAAkB,KAAK,IAAI,GAC5C,YAAY,CAEd;AAED,OAAO,EAAE,2CAA2C,EAAE,kBAAkB,EAAE,CAAC"}

package/build/index.js

@@ -11,7 +11,7 @@ export function isRecording() {
 }
 const emitter = new EventEmitter(ReactNativeSimpleNotePitchDetectorModule ??
     NativeModulesProxy.ReactNativeSimpleNotePitchDetector);
-export function onChangePitch(listener) {
-    return emitter.addListener("onChangePitch", listener);
+export function onChangeNote(listener) {
+    return emitter.addListener("onChangeNote", listener);
 }
 //# sourceMappingURL=index.js.map

package/build/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,GAEb,MAAM,mBAAmB,CAAC;AAE3B,OAAO,wCAAwC,MAAM,4CAA4C,CAAC;AAMlG,MAAM,UAAU,KAAK;IACnB,OAAO,wCAAwC,CAAC,KAAK,EAAE,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,IAAI;IAClB,OAAO,wCAAwC,CAAC,IAAI,EAAE,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,WAAW;IACzB,OAAO,wCAAwC,CAAC,WAAW,EAAE,CAAC;AAChE,CAAC;AAED,MAAM,OAAO,GAAG,IAAI,YAAY,CAC9B,wCAAwC;IACtC,kBAAkB,CAAC,kCAAkC,CACxD,CAAC;AAEF,MAAM,UAAU,aAAa,CAC3B,QAA6C;IAE7C,OAAO,OAAO,CAAC,WAAW,CAAqB,eAAe,EAAE,QAAQ,CAAC,CAAC;AAC5E,CAAC","sourcesContent":["import {\n  NativeModulesProxy,\n  EventEmitter,\n  Subscription,\n} from \"expo-modules-core\";\n\nimport ReactNativeSimpleNotePitchDetectorModule from \"./ReactNativeSimpleNotePitchDetectorModule\";\nimport {\n  ChangeEventPayload,\n  ReactNativeSimpleNotePitchDetectorViewProps,\n} from \"./ReactNativeSimpleNotePitchDetector.types\";\n\nexport function start() {\n  return ReactNativeSimpleNotePitchDetectorModule.start();\n}\n\nexport function stop() {\n  return ReactNativeSimpleNotePitchDetectorModule.stop();\n}\n\nexport function isRecording() {\n  return ReactNativeSimpleNotePitchDetectorModule.isRecording();\n}\n\nconst emitter = new EventEmitter(\n  ReactNativeSimpleNotePitchDetectorModule ??\n    NativeModulesProxy.ReactNativeSimpleNotePitchDetector\n);\n\nexport function onChangePitch(\n  listener: (event: ChangeEventPayload) => void\n): Subscription {\n  return emitter.addListener<ChangeEventPayload>(\"onChangePitch\", listener);\n}\n\nexport { ReactNativeSimpleNotePitchDetectorViewProps, ChangeEventPayload };\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,kBAAkB,EAClB,YAAY,GAEb,MAAM,mBAAmB,CAAC;AAE3B,OAAO,wCAAwC,MAAM,4CAA4C,CAAC;AAMlG,MAAM,UAAU,KAAK;IACnB,OAAO,wCAAwC,CAAC,KAAK,EAAE,CAAC;AAC1D,CAAC;AAED,MAAM,UAAU,IAAI;IAClB,OAAO,wCAAwC,CAAC,IAAI,EAAE,CAAC;AACzD,CAAC;AAED,MAAM,UAAU,WAAW;IACzB,OAAO,wCAAwC,CAAC,WAAW,EAAE,CAAC;AAChE,CAAC;AAED,MAAM,OAAO,GAAG,IAAI,YAAY,CAC9B,wCAAwC;IACtC,kBAAkB,CAAC,kCAAkC,CACxD,CAAC;AAEF,MAAM,UAAU,YAAY,CAC1B,QAA6C;IAE7C,OAAO,OAAO,CAAC,WAAW,CAAqB,cAAc,EAAE,QAAQ,CAAC,CAAC;AAC3E,CAAC","sourcesContent":["import {\n  NativeModulesProxy,\n  EventEmitter,\n  Subscription,\n} from \"expo-modules-core\";\n\nimport ReactNativeSimpleNotePitchDetectorModule from \"./ReactNativeSimpleNotePitchDetectorModule\";\nimport {\n  ChangeEventPayload,\n  ReactNativeSimpleNotePitchDetectorViewProps,\n} from \"./ReactNativeSimpleNotePitchDetector.types\";\n\nexport function start() {\n  return ReactNativeSimpleNotePitchDetectorModule.start();\n}\n\nexport function stop() {\n  return ReactNativeSimpleNotePitchDetectorModule.stop();\n}\n\nexport function isRecording() {\n  return ReactNativeSimpleNotePitchDetectorModule.isRecording();\n}\n\nconst emitter = new EventEmitter(\n  ReactNativeSimpleNotePitchDetectorModule ??\n    NativeModulesProxy.ReactNativeSimpleNotePitchDetector\n);\n\nexport function onChangeNote(\n  listener: (event: ChangeEventPayload) => void\n): Subscription {\n  return emitter.addListener<ChangeEventPayload>(\"onChangeNote\", listener);\n}\n\nexport { ReactNativeSimpleNotePitchDetectorViewProps, ChangeEventPayload };\n"]}

package/ios/ReactNativeSimpleNotePitchDetectorModule.swift

@@ -2,12 +2,33 @@ import ExpoModulesCore
 import Beethoven
 import Pitchy
 
+
+let NOTE_BUFFER_SIZE = 3
+
 public class ReactNativeSimpleNotePitchDetectorModule: Module {
     
-    var bufferSize = 3
-    var notes = Array(repeating: "", count: 3)
+    var notes = Array(repeating: "", count: NOTE_BUFFER_SIZE)
     var counter = 0
     
+    public func definition() -> ModuleDefinition {
+
+        Name("ReactNativeSimpleNotePitchDetector")
+
+        Events("onChangeNote")
+
+        Function("start") {
+            pitchEngine.start()
+        }
+
+        Function("stop") {
+            pitchEngine.stop()
+        }
+        
+        Function("isRecording") {
+            return pitchEngine.active
+        }
+    }
+    
     lazy var pitchEngine: PitchEngine = { [weak self] in
         let config = Config(estimationStrategy: .yin)
         let pitchEngine = PitchEngine(config: config, delegate: self)
@@ -15,13 +36,11 @@ public class ReactNativeSimpleNotePitchDetectorModule: Module {
         return pitchEngine
     }()
     
-    func mostFrequent(array: [String]) -> String? {
+    func getMostFrequentNote(notes: [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:)
+        notes.forEach { counts[$0] = (counts[$0] ?? 0) + 1 }
+        
         if let (value, count) = counts.max(by: {$0.1 < $1.1}) {
             if (count <= 1) {
                 return nil
@@ -31,29 +50,6 @@ public class ReactNativeSimpleNotePitchDetectorModule: Module {
 
         return nil
     }
-    
-    var isRecording = false
-
-    public func definition() -> ModuleDefinition {
-
-        Name("ReactNativeSimpleNotePitchDetector")
-
-        Events("onChangePitch")
-
-        Function("start") {
-            pitchEngine.start()
-            isRecording = true
-        }
-
-        Function("stop") {
-            pitchEngine.stop()
-            isRecording = false
-        }
-        
-        Function("isRecording") {
-            return isRecording
-        }
-    }
 }
 
 extension ReactNativeSimpleNotePitchDetectorModule: PitchEngineDelegate {
@@ -67,10 +63,10 @@ extension ReactNativeSimpleNotePitchDetectorModule: PitchEngineDelegate {
             return
         }
         
-        if (counter == bufferSize) {
-            var result = mostFrequent(array: notes)
-            if (result != nil) {
-                self.sendEvent("onChangePitch", ["note" :  result, "soundPressure" : ""])
+        if (counter == notes.count) {
+            var note = getMostFrequentNote(notes: notes)
+            if (note != nil) {
+                self.sendEvent("onChangePitch", ["note" :  note])
             }
             counter = 0
         }
@@ -82,8 +78,6 @@ extension ReactNativeSimpleNotePitchDetectorModule: PitchEngineDelegate {
         } catch {
             
         }
-
-//        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.3.3",
+  "version": "0.3.5",
   "description": "a simple react native library to detect the pitch of the input recording",
   "main": "build/index.js",
   "types": "build/index.d.ts",

package/src/ReactNativeSimpleNotePitchDetector.types.ts

@@ -1,6 +1,5 @@
 export type ChangeEventPayload = {
   note: string;
-  soundPressure: number;
 };
 
 export type ReactNativeSimpleNotePitchDetectorViewProps = {

package/src/ReactNativeSimpleNotePitchDetector.web.tsx

@@ -2,7 +2,7 @@ import * as React from "react";
 
 import { ReactNativeSimpleNotePitchDetectorViewProps } from "./ReactNativeSimpleNotePitchDetector.types";
 
-export default function ExpoSettingsView(
+export default function ReactNativeSimpleNotePitchDetectorView(
   props: ReactNativeSimpleNotePitchDetectorViewProps
 ) {
   return (

package/src/index.ts

@@ -27,10 +27,10 @@ const emitter = new EventEmitter(
     NativeModulesProxy.ReactNativeSimpleNotePitchDetector
 );
 
-export function onChangePitch(
+export function onChangeNote(
   listener: (event: ChangeEventPayload) => void
 ): Subscription {
-  return emitter.addListener<ChangeEventPayload>("onChangePitch", listener);
+  return emitter.addListener<ChangeEventPayload>("onChangeNote", listener);
 }
 
 export { ReactNativeSimpleNotePitchDetectorViewProps, ChangeEventPayload };