Merge pull request #77 from SimformSolutionsPvtLtd/develop

Release v2.1.0

Author: mukesh-simform

README.md

@@ -8,7 +8,7 @@ buildscript {
   }
 
   dependencies {
-    classpath "com.android.tools.build:gradle:7.2.1"
+    classpath "com.android.tools.build:gradle:8.1.0"
     // noinspection DifferentKotlinGradleVersion
     classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
   }
@@ -71,8 +71,12 @@ android {
   }
 
   compileOptions {
-    sourceCompatibility JavaVersion.VERSION_1_8
-    targetCompatibility JavaVersion.VERSION_1_8
+    sourceCompatibility JavaVersion.VERSION_11
+    targetCompatibility JavaVersion.VERSION_11
+  }
+
+  kotlinOptions {
+    jvmTarget = "11"
   }
 }
 
@@ -93,6 +97,7 @@ dependencies {
   implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 
 
-  // Android Audio Playback Dependency
-  implementation "com.google.android.exoplayer:exoplayer:2.17.1"
+  // Android Audio Media3 Dependency
+  implementation 'androidx.media3:media3-exoplayer:1.3.1'
+  implementation 'androidx.media3:media3-common:1.3.1'
 }

android/build.gradle

@@ -1,5 +1,6 @@
-AudioWaveform_kotlinVersion=1.7.0
+AudioWaveform_kotlinVersion=1.6.10
 AudioWaveform_minSdkVersion=21
-AudioWaveform_targetSdkVersion=31
-AudioWaveform_compileSdkVersion=31
+AudioWaveform_targetSdkVersion=34
+AudioWaveform_compileSdkVersion=34
 AudioWaveform_ndkversion=21.4.7075529
+android.suppressUnsupportedCompileSdk=34

android/gradle.properties

@@ -8,9 +8,9 @@ import com.facebook.react.bridge.ReactApplicationContext
 import com.facebook.react.bridge.WritableMap
 import com.facebook.react.common.JavascriptException
 import com.facebook.react.modules.core.DeviceEventManagerModule
-import com.google.android.exoplayer2.ExoPlayer
-import com.google.android.exoplayer2.MediaItem
-import com.google.android.exoplayer2.Player
+import androidx.media3.exoplayer.ExoPlayer
+import androidx.media3.common.MediaItem
+import androidx.media3.common.Player
 
 class AudioPlayer(
     context: ReactApplicationContext,
@@ -25,8 +25,15 @@ class AudioPlayer(
     private var updateFrequency = UpdateFrequency.Low
     private lateinit var audioPlaybackListener: CountDownTimer
 
-    fun preparePlayer(path: String?, volume: Int?, frequency: UpdateFrequency, promise: Promise) {
+    fun preparePlayer(
+        path: String?,
+        volume: Int?,
+        frequency: UpdateFrequency,
+        progress: Long,
+        promise: Promise
+    ) {
         if (path != null) {
+            isPlayerPrepared = false
             updateFrequency = frequency
             val uri = Uri.parse(path)
             val mediaItem = MediaItem.fromUri(uri)
@@ -41,6 +48,7 @@ class AudioPlayer(
                     if (!isPlayerPrepared) {
                         if (state == Player.STATE_READY) {
                             player.volume = (volume ?: 1).toFloat()
+                            player.seekTo(progress)
                             isPlayerPrepared = true
                             val duration = player.duration
                             promise.resolve(duration.toString())
@@ -97,7 +105,18 @@ class AudioPlayer(
         }
     }
 
-    fun start(finishMode: Int?, promise: Promise) {
+    private fun validateAndSetPlaybackSpeed(player: Player, speed: Float?): Boolean {
+        // Validate the speed: if null or less than or equal to 0, set to 1f
+        val validSpeed = if (speed == null || speed <= 0f) 1f else speed
+
+        // Set the playback speed on the player
+        val playbackParameters = player.playbackParameters.withSpeed(validSpeed)
+        player.playbackParameters = playbackParameters
+
+        return true  // Indicate success
+    }
+
+    fun start(finishMode: Int?, speed: Float?, promise: Promise) {
         try {
             if (finishMode != null && finishMode == 0) {
                 this.finishMode = FinishMode.Loop
@@ -106,6 +125,9 @@ class AudioPlayer(
             } else {
                 this.finishMode = FinishMode.Stop
             }
+
+           validateAndSetPlaybackSpeed(player, speed)
+
             player.playWhenReady = true
             player.play()
             promise.resolve(true)
@@ -150,6 +172,18 @@ class AudioPlayer(
         }
     }
 
+    fun setPlaybackSpeed(speed: Float?, promise: Promise) {
+        try {
+            // Call the custom function to validate and set the playback speed
+            val success = validateAndSetPlaybackSpeed(player, speed)
+            promise.resolve(success)  // Resolve the promise with success
+
+        } catch (e: Exception) {
+            // Handle any exceptions and reject the promise
+            promise.reject("setPlaybackSpeed Error", e.toString())
+        }
+    }
+
     private fun startListening(promise: Promise) {
         try {
             audioPlaybackListener = object : CountDownTimer(player.duration, UpdateFrequency.Low.value) {
@@ -172,4 +206,8 @@ class AudioPlayer(
             audioPlaybackListener.cancel()
         }
     }
+
+    fun isHoldingAudioTrack(): Boolean {
+        return ::audioPlaybackListener.isInitialized
+    }
 }

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

@@ -34,6 +34,7 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
 
     companion object {
         const val NAME = "AudioWaveform"
+        const val MAX_NUMBER_OF_AUDIO_PLAYER = 30
     }
 
     override fun getName(): String {
@@ -100,16 +101,27 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
         obj: ReadableMap,
         promise: Promise
     ) {
+        if(audioPlayers.filter { it.value?.isHoldingAudioTrack() == true }.count() >= MAX_NUMBER_OF_AUDIO_PLAYER) {
+            promise.reject(Constants.LOG_TAG, "Too many players have been initialized. Please stop some players before continuing")
+        }
+
         val path = obj.getString(Constants.path)
         val key = obj.getString(Constants.playerKey)
         val frequency = obj.getInt(Constants.updateFrequency)
         val volume = obj.getInt(Constants.volume)
+        val progress = if (!obj.hasKey(Constants.progress) || obj.isNull(Constants.progress)) {
+            0 // Set default progress to zero if null, undefined, or missing
+        } else {
+            obj.getInt(Constants.progress).toLong()
+        }
+
         if (key != null) {
             initPlayer(key)
             audioPlayers[key]?.preparePlayer(
                 path,
                 volume,
                 getUpdateFrequency(frequency),
+                progress,
                 promise
             )
         } else {
@@ -121,8 +133,9 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
     fun startPlayer(obj: ReadableMap, promise: Promise) {
         val finishMode = obj.getInt(Constants.finishMode)
         val key = obj.getString(Constants.playerKey)
+        val speed = obj.getDouble(Constants.speed)
         if (key != null) {
-            audioPlayers[key]?.start(finishMode ?: 2, promise)
+            audioPlayers[key]?.start(finishMode ?: 2, speed.toFloat(),promise)
         } else {
             promise.reject("startPlayer Error", "Player key can't be null")
         }
@@ -133,6 +146,7 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
         val key = obj.getString(Constants.playerKey)
         if (key != null) {
             audioPlayers[key]?.stop(promise)
+            audioPlayers[key] = null // Release the player after stopping it
         } else {
             promise.reject("stopPlayer Error", "Player key can't be null")
         }
@@ -209,6 +223,23 @@ class AudioWaveformModule(context: ReactApplicationContext): ReactContextBaseJav
         }
     }
 
+    @ReactMethod
+    fun setPlaybackSpeed(obj: ReadableMap, promise: Promise) {
+        // If the key doesn't exist or if the value is null or undefined, set default speed to 1.0
+        val speed = if (!obj.hasKey(Constants.speed) || obj.isNull(Constants.speed)) {
+            1.0f // Set default speed to 1.0 if null, undefined, or missing
+        } else {
+            obj.getDouble(Constants.speed).toFloat()
+        }
+
+        val key = obj.getString(Constants.playerKey)
+        if (key != null) {
+            audioPlayers[key]?.setPlaybackSpeed(speed, promise)
+        } else {
+            promise.reject("setPlaybackSpeed Error", "Player key can't be null")
+        }
+    }
+
     private fun initPlayer(playerKey: String) {
         if (audioPlayers[playerKey] == null) {
             val newPlayer = AudioPlayer(

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

@@ -43,6 +43,7 @@ object Constants {
     const val currentDecibel = "currentDecibel"
     const val bitRate = "bitRate"
     const val sampleRate = "sampleRate"
+    const val speed = "speed"
 }
 
 enum class FinishMode(val value:Int) {

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

@@ -16,6 +16,7 @@ import java.nio.ByteBuffer
 import java.util.concurrent.CountDownLatch
 import kotlin.math.pow
 import kotlin.math.sqrt
+import java.io.File
 
 class WaveformExtractor(
     context: ReactApplicationContext,
@@ -66,6 +67,11 @@ class WaveformExtractor(
 
     fun startDecode() {
         try {
+            if (!File(path).exists()) {
+                promise.reject("File Error", "File does not exist at the given path.")
+                return
+            }
+
             val format = getFormat(path) ?: error("No audio format found")
             val mime = format.getString(MediaFormat.KEY_MIME) ?: error("No MIME type found")
             decoder = MediaCodec.createDecoderByType(mime).also {