Merge pull request #41 from SimformSolutionsPvtLtd/develop

Release v2.0.0

Author: mukesh-simform

README.md

@@ -129,12 +129,15 @@ You can check out the full example at [Example](./example/src/App.tsx).
 | path\* | - | ✅ | ❌ | string | Used for `static` type. It is the resource path of an audio source file. |
 | candleSpace | 2 | ✅ | ✅ | number | Space between two candlesticks of waveform |
 | candleWidth | 5 | ✅ | ✅ | number | Width of single candlestick of waveform |
+| candleHeightScale | 3 | ✅ | ✅ | number | Scaling height of candlestick of waveform | 
 | containerStyle | - | ✅ | ✅ | `StyleProp<ViewStyle>` | style of the container |
 | waveColor | #545454 | ✅ | ✅ | string | color of candlestick of waveform |
 | scrubColor | #7b7b7b | ✅ | ❌ | string | color of candlestick of waveform which has played |
 | onPlayerStateChange | - | ✅ | ❌ | ( playerState : PlayerState ) => void | callback function, which returns player state whenever player state changes. |
 | onPanStateChange | - | ✅ | ❌ | ( panMoving : boolean ) => void | callback function which returns boolean indicating whether audio seeking is active or not. |
 | onRecorderStateChange | - | ❌ | ✅ | ( recorderState : RecorderState ) => void | callback function which returns the recorder state whenever the recorder state changes. Check RecorderState for more details |
+| onCurrentProgressChange | - | ✅ | ❌ | ( currentProgress : number, songDuration: number ) => void | callback function, which returns current progress of audio and total song duration. |
+| onChangeWaveformLoadState | - | ✅ | ❌ | ( state : boolean ) => void | callback function which returns the loading state of waveform candlestick. |
 | onError | - | ✅ | ❌ | ( error : Error ) => void | callback function which returns the error for static audio waveform |
 
 ##### Know more about [ViewStyle](https://reactnative.dev/docs/view-style-props), [PlayerState](#playerstate), and [RecorderState](#recorderstate)
@@ -318,6 +321,8 @@ To use example app you need to first run below command
 cd example && npx react-native-asset
 ```
 
+> Note: If link-assets-manifest.json file already exists then make sure to delete that before running npx react-native-asset command.
+
 This command will add our example audio sample files to the iOS bundle so that we can access them inside the iOS app.
 
 ```sh

android/src/main/java/com/audiowaveform/AudioPlayer.kt

@@ -47,27 +47,28 @@ class AudioPlayer(
                         }
                     }
                     if (state == Player.STATE_ENDED) {
-                        val args: MutableMap<String, Any?> = HashMap()
+                        val args: WritableMap = Arguments.createMap()
                         when (finishMode) {
                             FinishMode.Loop -> {
                                 player.seekTo(0)
                                 player.play()
-                                args[Constants.finishType] = 0
+                                args.putInt(Constants.finishType, 0)
                             }
                             FinishMode.Pause -> {
                                 player.seekTo(0)
                                 player.playWhenReady = false
                                 stopListening()
-                                args[Constants.finishType] = 1
+                                args.putInt(Constants.finishType, 1)
                             }
                             else -> {
                                 player.stop()
                                 player.release()
                                 stopListening()
-                                args[Constants.finishType] = 2
+                                args.putInt(Constants.finishType, 2)
                             }
                         }
-                        args[Constants.playerKey] = key
+                        args.putString(Constants.playerKey, key)
+                        appContext.getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter::class.java)?.emit("onDidFinishPlayingAudio", args)
                     }
                 }
             }

android/src/main/java/com/audiowaveform/AudioRecorder.kt

@@ -54,15 +54,34 @@ class AudioRecorder {
 
     fun getDecibel(recorder: MediaRecorder?): Double? {
         if (useLegacyNormalization) {
-            val db = 20 * log10((recorder?.maxAmplitude?.toDouble() ?: (0.0 / 32768.0)))
-            if (db == Double.NEGATIVE_INFINITY) {
-                Log.e(Constants.LOG_TAG, "Microphone might be turned off")
-            } else {
-                return db
+            if (recorder != null) {
+                try {
+                    val db = 20 * log10((recorder?.maxAmplitude?.toDouble() ?: (0.0 / 32768.0)))
+                    if (db == Double.NEGATIVE_INFINITY) {
+                        Log.e(Constants.LOG_TAG, "Microphone might be turned off")
+                    } else {
+                        return db
+                    }
+                    return db;
+                } catch (e: IllegalStateException) {
+                    e.printStackTrace()
+                    return null
+                }
+            }
+            else {
+                return null
             }
-            return db;
         } else {
-            return recorder?.maxAmplitude?.toDouble() ?: 0.0
+            if (recorder != null) {
+                try {
+                    return recorder?.maxAmplitude?.toDouble() ?: 0.0
+                } catch (e: IllegalStateException) {
+                    e.printStackTrace()
+                    return null
+                }
+            } else {
+                return null
+            }
         }
     }
 
@@ -72,21 +91,29 @@ class AudioRecorder {
         encoder: Int,
         outputFormat: Int,
         sampleRate: Int,
-        bitRate: Int?,
+        bitRate: Int,
         promise: Promise
     ) {
+        if (recorder == null) {
+            promise.reject("RECORDER_NULL", "MediaRecorder instance is null")
+            return
+        }
+
         recorder?.apply {
-            setAudioSource(MediaRecorder.AudioSource.MIC)
-            setOutputFormat(getOutputFormat(outputFormat))
-            setAudioEncoder(getEncoder(encoder))
-            setAudioSamplingRate(sampleRate)
-            if (bitRate != null) {
-                setAudioEncodingBitRate(bitRate)
-            }
-            setOutputFile(path)
             try {
+                setAudioSource(MediaRecorder.AudioSource.MIC)
+                setOutputFormat(getOutputFormat(outputFormat))
+                setAudioEncoder(getEncoder(encoder))
+                setAudioSamplingRate(sampleRate)
+                if (bitRate != null) {
+                    setAudioEncodingBitRate(bitRate)
+                }
+                setOutputFile(path)
                 prepare()
                 promise.resolve(true)
+            } catch (e: IllegalArgumentException) {
+                Log.e(Constants.LOG_TAG, "Invalid MediaRecorder configuration", e)
+                promise.reject("CONFIGURATION_ERROR", "Invalid MediaRecorder configuration: ${e.message}")
             } catch (e: IOException) {
                 Log.e(Constants.LOG_TAG, "Failed to stop initialize recorder")
             }
@@ -103,10 +130,10 @@ class AudioRecorder {
             val tempArrayForCommunication : MutableList<String> = mutableListOf()
             val duration = getDuration(path)
             tempArrayForCommunication.add(path)
-            tempArrayForCommunication.add(duration)
+            tempArrayForCommunication.add(duration.toString())
             promise.resolve(Arguments.fromList(tempArrayForCommunication))
         } catch (e: IllegalStateException) {
-            Log.e(Constants.LOG_TAG, "Failed to stop recording")
+            Log.e(Constants.LOG_TAG, "Failed to stop recording",e)
         }
     }
 
@@ -127,7 +154,9 @@ class AudioRecorder {
     fun startRecorder(recorder: MediaRecorder?, useLegacy: Boolean, promise: Promise) {
         try {
             useLegacyNormalization = useLegacy
-            recorder?.start()
+            recorder?.apply {
+                start()
+            }
             promise.resolve(true)
         } catch (e: IllegalStateException) {
             Log.e(Constants.LOG_TAG, "Failed to start recording")

android/src/main/java/com/audiowaveform/AudioWaveformModule.kt

@@ -29,7 +29,7 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
     private var path: String? = null
     private var outputFormat: Int = 0
     private var sampleRate: Int = 44100
-    private var bitRate: Int? = null
+    private var bitRate: Int = 128000
     private val handler = Handler(Looper.getMainLooper())
 
     companion object {
@@ -51,8 +51,8 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
     }
 
     @ReactMethod
-    fun initRecorder(promise: Promise) {
-        checkPathAndInitialiseRecorder(encoder, outputFormat, sampleRate, bitRate, promise)
+    fun initRecorder(obj: ReadableMap?, promise: Promise) {
+        checkPathAndInitialiseRecorder(encoder, outputFormat, sampleRate, bitRate, promise, obj)
     }
 
     @ReactMethod
@@ -62,7 +62,7 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
 
     @ReactMethod
     fun startRecording(obj: ReadableMap?, promise: Promise) {
-        initRecorder(promise)
+        initRecorder(obj, promise)
         val useLegacyNormalization = true
         audioRecorder.startRecorder(recorder, useLegacyNormalization, promise)
         startEmittingRecorderValue()
@@ -84,9 +84,15 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
 
     @ReactMethod
     fun stopRecording(promise: Promise) {
+        if (audioRecorder == null || recorder == null || path == null) {
+            promise.reject("STOP_RECORDING_ERROR", "Recording resources not properly initialized")
+            return
+        }
+
         audioRecorder.stopRecording(recorder, path!!, promise)
         stopEmittingRecorderValue()
         recorder = null
+        path = null
     }
 
     @ReactMethod
@@ -231,10 +237,12 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
             key = playerKey,
             extractorCallBack = object : ExtractorCallBack {
                 override fun onProgress(value: Float) {
-                    if (value == 1.0F) {
-                        val tempArrayForCommunication : MutableList<MutableList<Float>> = mutableListOf()
-                        extractors[playerKey]?.sampleData?.let { tempArrayForCommunication.add(it) }
-                        promise.resolve(Arguments.fromList(tempArrayForCommunication))
+                     if (value == 1.0F) {
+                        extractors[playerKey]?.sampleData?.let { data ->
+                            val normalizedData = normalizeWaveformData(data, 0.12f)
+                            val tempArrayForCommunication: MutableList<MutableList<Float>> = mutableListOf(normalizedData)
+                            promise.resolve(Arguments.fromList(tempArrayForCommunication))
+                        }
                     }
                 }
             },
@@ -244,6 +252,16 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
         extractors[playerKey]?.stop()
     }
 
+    private fun normalizeWaveformData(data: MutableList<Float>, scale: Float = 0.25f, threshold: Float = 0.01f): MutableList<Float> {
+        val filteredData = data.filter { kotlin.math.abs(it) >= threshold }
+        val maxAmplitude = filteredData.maxOrNull() ?: 1.0f
+        return if (maxAmplitude > 0) {
+            data.map { if (kotlin.math.abs(it) < threshold) 0.0f else (it / maxAmplitude) * scale }.toMutableList()
+        } else {
+            data
+        }
+    }
+
     private fun getUpdateFrequency(frequency: Int?): UpdateFrequency {
         if (frequency == 2) {
             return UpdateFrequency.High
@@ -257,9 +275,24 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
         encoder: Int,
         outputFormat: Int,
         sampleRate: Int,
-        bitRate: Int?,
-        promise: Promise
+        bitRate: Int,
+        promise: Promise,
+        obj: ReadableMap?
     ) {
+
+        var sampleRateVal = sampleRate.toInt();
+        var bitRateVal = bitRate.toInt();
+
+        if(obj != null) {
+            if(obj.hasKey(Constants.bitRate)){
+                bitRateVal = obj.getInt(Constants.bitRate);                
+            }
+
+            if(obj.hasKey(Constants.sampleRate)){
+                sampleRateVal = obj.getInt(Constants.sampleRate);
+            }
+        }
+
         try {
             recorder = MediaRecorder()
         } catch (e: Exception) {
@@ -278,8 +311,8 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
                     recorder,
                     encoder,
                     outputFormat,
-                    sampleRate,
-                    bitRate,
+                    sampleRateVal,
+                    bitRateVal,
                     promise,
                 )
             } catch (e: IOException) {
@@ -291,8 +324,8 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
                 recorder,
                 encoder,
                 outputFormat,
-                sampleRate,
-                bitRate,
+                sampleRateVal,
+                bitRateVal,
                 promise,
             )
         }

android/src/main/java/com/audiowaveform/Utils.kt

@@ -41,6 +41,8 @@ object Constants {
     const val waveformData = "waveformData"
     const val updateFrequency = "updateFrequency"
     const val currentDecibel = "currentDecibel"
+    const val bitRate = "bitRate"
+    const val sampleRate = "sampleRate"
 }
 
 enum class FinishMode(val value:Int) {

example/.gitignore

@@ -21,6 +21,7 @@ DerivedData
 *.ipa
 *.xcuserstate
 ios/.xcode.env.local
+ios/link-assets-manifest.json
 
 # Android/IntelliJ
 #
@@ -31,6 +32,7 @@ local.properties
 *.iml
 *.hprof
 .cxx/
+android/link-assets-manifest.json
 
 # node.js
 #