@capgo/native-audio 8.2.12 → 8.2.13

package/android/src/main/java/ee/forgr/audio/AudioAsset.java

@@ -4,29 +4,55 @@ import android.content.res.AssetFileDescriptor;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.Log;
+import androidx.media3.common.util.UnstableApi;
 import java.util.ArrayList;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.ScheduledFuture;
+import java.util.concurrent.TimeUnit;
 
-public class AudioAsset {
+@UnstableApi
+public class AudioAsset implements AutoCloseable {
 
-    private final String TAG = "AudioAsset";
+    public static final double DEFAULT_FADE_DURATION_MS = 1000.0;
+
+    private static final String TAG = "AudioAsset";
+    protected static final Logger logger = new Logger(TAG);
 
     private final ArrayList<AudioDispatcher> audioList;
-    private int playIndex = 0;
+    protected int playIndex = 0;
     protected final NativeAudio owner;
     protected AudioCompletionListener completionListener;
     protected String assetId;
-    private Handler currentTimeHandler;
-    private Runnable currentTimeRunnable;
-    private static final float FADE_STEP = 0.05f;
-    private static final int FADE_DELAY_MS = 80;
-    private float initialVolume;
+    protected Handler currentTimeHandler;
+    protected Runnable currentTimeRunnable;
+    protected static final int FADE_DELAY_MS = 80;
+
+    protected ScheduledExecutorService fadeExecutor;
+    protected ScheduledFuture<?> fadeTask;
+
+    protected Map<String, Boolean> dispatchedCompleteMap = new ConcurrentHashMap<>();
+
+    protected enum FadeState {
+        NONE,
+        FADE_IN,
+        FADE_OUT,
+        FADE_TO
+    }
+
+    protected FadeState fadeState = FadeState.NONE;
+
+    protected final float zeroVolume = 0.001f;
+    protected final float maxVolume = 1.0f;
 
     AudioAsset(NativeAudio owner, String assetId, AssetFileDescriptor assetFileDescriptor, int audioChannelNum, float volume)
         throws Exception {
         audioList = new ArrayList<>();
         this.owner = owner;
         this.assetId = assetId;
-        this.initialVolume = volume;
+        this.fadeExecutor = Executors.newSingleThreadScheduledExecutor();
 
         if (audioChannelNum < 0) {
             audioChannelNum = 1;
@@ -40,27 +66,38 @@ public class AudioAsset {
     }
 
     public void dispatchComplete() {
+        if (dispatchedCompleteMap.getOrDefault(this.assetId, false)) {
+            return;
+        }
         this.owner.dispatchComplete(this.assetId);
+        dispatchedCompleteMap.put(this.assetId, true);
     }
 
-    public void play(Double time) throws Exception {
+    public void play(double time, float volume) throws Exception {
+        if (audioList.isEmpty() || playIndex < 0 || playIndex >= audioList.size()) {
+            throw new Exception("AudioDispatcher is null or playIndex out of bounds");
+        }
         AudioDispatcher audio = audioList.get(playIndex);
         if (audio != null) {
+            cancelFade();
             audio.play(time);
+            audio.setVolume(volume);
             playIndex++;
             playIndex = playIndex % audioList.size();
-            Log.d(TAG, "Starting timer from play"); // Debug log
+            logger.debug("Starting timer from play"); // Debug log
             startCurrentTimeUpdates(); // Make sure this is called
         } else {
             throw new Exception("AudioDispatcher is null");
         }
     }
 
-    public double getDuration() {
-        if (audioList.size() != 1) return 0;
+    public void play(double time) throws Exception {
+        play(time, 1.0f);
+    }
 
+    public double getDuration() {
+        if (audioList.size() != 1 || playIndex < 0 || playIndex >= audioList.size()) return 0;
         AudioDispatcher audio = audioList.get(playIndex);
-
         if (audio != null) {
             return audio.getDuration();
         }
@@ -68,20 +105,16 @@ public class AudioAsset {
     }
 
     public void setCurrentPosition(double time) {
-        if (audioList.size() != 1) return;
-
+        if (audioList.size() != 1 || playIndex < 0 || playIndex >= audioList.size()) return;
         AudioDispatcher audio = audioList.get(playIndex);
-
         if (audio != null) {
             audio.setCurrentPosition(time);
         }
     }
 
     public double getCurrentPosition() {
-        if (audioList.size() != 1) return 0;
-
+        if (audioList.size() != 1 || playIndex < 0 || playIndex >= audioList.size()) return 0;
         AudioDispatcher audio = audioList.get(playIndex);
-
         if (audio != null) {
             return audio.getCurrentPosition();
         }
@@ -94,6 +127,10 @@ public class AudioAsset {
 
         for (int x = 0; x < audioList.size(); x++) {
             AudioDispatcher audio = audioList.get(x);
+            if (audio == null) {
+                continue;
+            }
+            cancelFade();
             wasPlaying |= audio.pause();
         }
 
@@ -105,7 +142,7 @@ public class AudioAsset {
             AudioDispatcher audio = audioList.get(0);
             if (audio != null) {
                 audio.resume();
-                Log.d(TAG, "Starting timer from resume"); // Debug log
+                logger.debug("Starting timer from resume"); // Debug log
                 startCurrentTimeUpdates(); // Make sure this is called
             } else {
                 throw new Exception("AudioDispatcher is null");
@@ -115,10 +152,12 @@ public class AudioAsset {
 
     public void stop() throws Exception {
         stopCurrentTimeUpdates(); // Stop updates when stopping
+        dispatchComplete();
         for (int x = 0; x < audioList.size(); x++) {
             AudioDispatcher audio = audioList.get(x);
 
             if (audio != null) {
+                cancelFade();
                 audio.stop();
             } else {
                 throw new Exception("AudioDispatcher is null");
@@ -152,20 +191,40 @@ public class AudioAsset {
         }
 
         audioList.clear();
+        stopCurrentTimeUpdates();
+        close();
     }
 
-    public void setVolume(float volume) throws Exception {
+    public void setVolume(float volume, double duration) throws Exception {
         for (int x = 0; x < audioList.size(); x++) {
             AudioDispatcher audio = audioList.get(x);
 
+            cancelFade();
             if (audio != null) {
-                audio.setVolume(volume);
+                if (isPlaying() && duration > 0) {
+                    fadeTo(audio, duration, volume);
+                } else {
+                    audio.setVolume(volume);
+                }
             } else {
                 throw new Exception("AudioDispatcher is null");
             }
         }
     }
 
+    public void setVolume(float volume) throws Exception {
+        setVolume(volume, 0);
+    }
+
+    public float getVolume() throws Exception {
+        if (audioList.size() != 1 || playIndex < 0 || playIndex >= audioList.size()) return 0;
+        AudioDispatcher audio = audioList.get(playIndex);
+        if (audio != null) {
+            return audio.getVolume();
+        }
+        throw new Exception("AudioDispatcher is null");
+    }
+
     public void setRate(float rate) throws Exception {
         for (int x = 0; x < audioList.size(); x++) {
             AudioDispatcher audio = audioList.get(x);
@@ -176,9 +235,10 @@ public class AudioAsset {
     }
 
     public boolean isPlaying() throws Exception {
-        if (audioList.size() != 1) return false;
-
-        return audioList.get(playIndex).isPlaying();
+        for (AudioDispatcher ad : audioList) {
+            if (ad != null && ad.isPlaying()) return true;
+        }
+        return false;
     }
 
     public void setCompletionListener(AudioCompletionListener listener) {
@@ -196,13 +256,14 @@ public class AudioAsset {
     }
 
     public void setCurrentTime(double time) throws Exception {
+        if (owner == null || owner.getActivity() == null) return;
         owner
             .getActivity()
             .runOnUiThread(
                 new Runnable() {
                     @Override
                     public void run() {
-                        if (audioList.size() != 1) {
+                        if (audioList.size() != 1 || playIndex < 0 || playIndex >= audioList.size()) {
                             return;
                         }
                         AudioDispatcher audio = audioList.get(playIndex);
@@ -215,12 +276,11 @@ public class AudioAsset {
     }
 
     protected void startCurrentTimeUpdates() {
-        Log.d(TAG, "Starting timer updates in AudioAsset");
+        logger.debug("Starting timer updates");
         if (currentTimeHandler == null) {
             currentTimeHandler = new Handler(Looper.getMainLooper());
         }
-
-        // Add small delay to let audio start playing
+        dispatchedCompleteMap.put(assetId, false);
         currentTimeHandler.postDelayed(
             new Runnable() {
                 @Override
@@ -229,103 +289,321 @@ public class AudioAsset {
                 }
             },
             100
-        ); // 100ms delay
+        );
     }
 
     private void startTimeUpdateLoop() {
         currentTimeRunnable = new Runnable() {
             @Override
             public void run() {
+                AudioDispatcher audio = null;
+                try {
+                    if (audioList.isEmpty() || playIndex < 0 || playIndex >= audioList.size()) {
+                        logger.verbose("Audio dispatcher does not exist at index " + playIndex);
+                        return;
+                    }
+                    audio = audioList.get(playIndex);
+                } catch (Exception e) {
+                    logger.verbose("Audio dispatcher does not exist at index " + playIndex);
+                }
+                if (audio == null) {
+                    logger.debug("Audio dispatcher does not exist - aborting timer update");
+                    return;
+                }
                 try {
-                    AudioDispatcher audio = audioList.get(playIndex);
                     if (audio != null && audio.isPlaying()) {
                         double currentTime = getCurrentPosition();
-                        Log.d(TAG, "Timer update: currentTime = " + currentTime);
-                        owner.notifyCurrentTime(assetId, currentTime);
+                        logger.verbose("Play timer update: currentTime = " + currentTime);
+                        if (owner != null) owner.notifyCurrentTime(assetId, currentTime);
                         currentTimeHandler.postDelayed(this, 100);
                     } else {
-                        Log.d(TAG, "Stopping timer - not playing");
+                        logger.debug("Audio is not not playing");
                         stopCurrentTimeUpdates();
+                        if (audio.isPaused()) {
+                            logger.verbose("Audio is paused");
+                        } else {
+                            logger.verbose("Audio is not paused - dispatching complete");
+                            dispatchComplete();
+                        }
                     }
                 } catch (Exception e) {
-                    Log.e(TAG, "Error getting current time", e);
+                    logger.error("Error getting current time", e);
                     stopCurrentTimeUpdates();
                 }
             }
         };
-        currentTimeHandler.post(currentTimeRunnable);
+        try {
+            if (currentTimeHandler == null) {
+                currentTimeHandler = new Handler(Looper.getMainLooper());
+            }
+            currentTimeHandler.post(currentTimeRunnable);
+        } catch (Exception e) {
+            logger.error("Error starting current time updates", e);
+        }
     }
 
     void stopCurrentTimeUpdates() {
-        Log.d(TAG, "Stopping timer updates in AudioAsset");
+        logger.verbose("Stopping play timer updates");
         if (currentTimeHandler != null && currentTimeRunnable != null) {
             currentTimeHandler.removeCallbacks(currentTimeRunnable);
+            currentTimeHandler = null;
+            currentTimeRunnable = null;
         }
     }
 
-    public void playWithFade(Double time) throws Exception {
+    public void playWithFadeIn(double time, float volume, double fadeInDurationMs) throws Exception {
         AudioDispatcher audio = audioList.get(playIndex);
         if (audio != null) {
             audio.setVolume(0);
             audio.play(time);
-            fadeIn(audio);
+            fadeIn(audio, fadeInDurationMs, volume);
             startCurrentTimeUpdates();
         }
     }
 
-    private void fadeIn(final AudioDispatcher audio) {
-        final Handler handler = new Handler(Looper.getMainLooper());
-        final Runnable fadeRunnable = new Runnable() {
-            float currentVolume = 0;
+    public void playWithFade(double time) throws Exception {
+        playWithFadeIn(time, 1.0f, DEFAULT_FADE_DURATION_MS);
+    }
 
-            @Override
-            public void run() {
-                if (currentVolume < initialVolume) {
-                    currentVolume += FADE_STEP;
+    private void fadeIn(final AudioDispatcher audio, double fadeInDurationMs, float targetVolume) {
+        cancelFade();
+        fadeState = FadeState.FADE_IN;
+
+        final int steps = Math.max(1, (int) (fadeInDurationMs / FADE_DELAY_MS));
+        final float fadeStep = targetVolume / steps;
+
+        Log.d(
+            TAG,
+            "Beginning fade in at time " +
+                getCurrentPosition() +
+                " over " +
+                (fadeInDurationMs / 1000.0) +
+                "s to target volume " +
+                targetVolume +
+                " in " +
+                steps +
+                " steps (step duration: " +
+                (FADE_DELAY_MS / 1000.0) +
+                "s"
+        );
+
+        fadeTask = fadeExecutor.scheduleWithFixedDelay(
+            new Runnable() {
+                float currentVolume = 0;
+
+                @Override
+                public void run() {
+                    if (fadeState != FadeState.FADE_IN || currentVolume >= targetVolume) {
+                        fadeState = FadeState.NONE;
+                        cancelFade();
+                        logger.debug("Fade in complete at time " + getCurrentPosition());
+                        return;
+                    }
+                    final float previousCurrentVolume = currentVolume;
+                    currentVolume += fadeStep;
                     try {
-                        audio.setVolume(currentVolume);
-                        handler.postDelayed(this, FADE_DELAY_MS);
+                        final float resolvedTargetVolume = Math.min(Math.max(currentVolume, 0), targetVolume);
+                        Log.v(
+                            TAG,
+                            "Fade in step: from " + previousCurrentVolume + " to " + currentVolume + " to target " + resolvedTargetVolume
+                        );
+                        if (audio != null) audio.setVolume(resolvedTargetVolume);
                     } catch (Exception e) {
-                        Log.e(TAG, "Error during fade in", e);
+                        logger.error("Error during fade in", e);
+                        cancelFade();
                     }
                 }
-            }
-        };
-        handler.post(fadeRunnable);
+            },
+            0,
+            FADE_DELAY_MS,
+            TimeUnit.MILLISECONDS
+        );
     }
 
-    public void stopWithFade() throws Exception {
+    public void stopWithFade(double fadeOutDurationMs, boolean toPause) throws Exception {
         AudioDispatcher audio = audioList.get(playIndex);
         if (audio != null && audio.isPlaying()) {
-            fadeOut(audio);
+            cancelFade();
+            fadeOut(audio, fadeOutDurationMs, toPause);
         }
     }
 
-    private void fadeOut(final AudioDispatcher audio) {
-        final Handler handler = new Handler(Looper.getMainLooper());
-        final Runnable fadeRunnable = new Runnable() {
-            float currentVolume = initialVolume;
+    public void stopWithFade() throws Exception {
+        stopWithFade(DEFAULT_FADE_DURATION_MS, false);
+    }
+
+    private void fadeOut(final AudioDispatcher audio, double fadeOutDurationMs, boolean toPause) {
+        cancelFade();
+        fadeState = FadeState.FADE_OUT;
+
+        if (audio == null) return;
+
+        final int steps = Math.max(1, (int) (fadeOutDurationMs / FADE_DELAY_MS));
+        final float initialVolume = audio.getVolume();
+        final float fadeStep = initialVolume / steps;
+
+        Log.d(
+            TAG,
+            "Beginning fade out from volume " +
+                initialVolume +
+                " at time " +
+                getCurrentPosition() +
+                " over " +
+                (fadeOutDurationMs / 1000.0) +
+                "s in " +
+                steps +
+                " steps (step duration: " +
+                (FADE_DELAY_MS / 1000.0) +
+                "s)"
+        );
+
+        fadeTask = fadeExecutor.scheduleWithFixedDelay(
+            new Runnable() {
+                float currentVolume = initialVolume;
 
-            @Override
-            public void run() {
-                if (currentVolume > FADE_STEP) {
-                    currentVolume -= FADE_STEP;
+                @Override
+                public void run() {
                     try {
-                        audio.setVolume(currentVolume);
-                        handler.postDelayed(this, FADE_DELAY_MS);
+                        if (fadeState != FadeState.FADE_OUT || currentVolume <= 0) {
+                            fadeState = FadeState.NONE;
+                            if (toPause) {
+                                logger.verbose("Faded out to pause audio at time " + getCurrentPosition());
+                                audio.pause();
+                            } else {
+                                logger.verbose("Faded out to stop at time " + getCurrentPosition());
+                                stop();
+                            }
+                            cancelFade();
+                            logger.debug("Fade out complete at time " + getCurrentPosition());
+                            return;
+                        }
+                        final float previousCurrentVolume = currentVolume;
+                        currentVolume -= fadeStep;
+
+                        final float thisTargetVolume = Math.max(currentVolume, 0);
+                        Log.v(
+                            TAG,
+                            "Fade out step: from " + previousCurrentVolume + " to " + currentVolume + " to target " + thisTargetVolume
+                        );
+                        if (audio != null) audio.setVolume(thisTargetVolume);
                     } catch (Exception e) {
-                        Log.e(TAG, "Error during fade out", e);
+                        logger.error("Error during fade out", e);
+                        cancelFade();
                     }
-                } else {
+                }
+            },
+            0,
+            FADE_DELAY_MS,
+            TimeUnit.MILLISECONDS
+        );
+    }
+
+    protected void fadeTo(final AudioDispatcher audio, double fadeDurationMs, float targetVolume) {
+        cancelFade();
+        fadeState = FadeState.FADE_TO;
+
+        if (audio == null) return;
+
+        final int steps = Math.max(1, (int) (fadeDurationMs / FADE_DELAY_MS));
+        final float minVolume = zeroVolume;
+        final float initialVolume = Math.max(audio.getVolume(), minVolume);
+        final float finalTargetVolume = Math.max(targetVolume, minVolume);
+
+        // Clamp values to avoid overflow/underflow and invalid pow inputs
+        final float safeInitialVolume = Math.max(initialVolume, minVolume);
+        final float safeFinalTargetVolume = Math.max(finalTargetVolume, minVolume);
+
+        double ratio;
+        if (steps <= 0 || safeInitialVolume <= 0f || safeFinalTargetVolume <= 0f) {
+            ratio = 1.0; // No fade or invalid, just set directly
+        } else if (safeInitialVolume == safeFinalTargetVolume) {
+            ratio = 1.0;
+        } else {
+            ratio = Math.pow(safeFinalTargetVolume / safeInitialVolume, 1.0 / steps);
+            // Clamp ratio to reasonable bounds to avoid overflow
+            if (Double.isNaN(ratio) || Double.isInfinite(ratio) || ratio <= 0.0) {
+                ratio = 1.0;
+            }
+        }
+
+        Log.d(
+            TAG,
+            "Beginning exponential fade from volume " +
+                initialVolume +
+                " to " +
+                finalTargetVolume +
+                " over " +
+                (fadeDurationMs / 1000.0) +
+                "s in " +
+                steps +
+                " steps (step duration: " +
+                (FADE_DELAY_MS / 1000.0) +
+                "s, ratio: " +
+                ratio +
+                ")"
+        );
+
+        double finalRatio = ratio;
+        fadeTask = fadeExecutor.scheduleWithFixedDelay(
+            new Runnable() {
+                int currentStep = 0;
+                float currentVolume = initialVolume;
+
+                @Override
+                public void run() {
+                    if ((audio != null && fadeState != FadeState.FADE_TO) || !audio.isPlaying() || currentStep >= steps) {
+                        fadeState = FadeState.NONE;
+                        cancelFade();
+                        logger.debug("Fade to complete at time " + getCurrentPosition());
+                        return;
+                    }
+
                     try {
-                        audio.setVolume(0);
-                        stop();
+                        if (finalRatio == 1.0) {
+                            currentVolume = safeFinalTargetVolume;
+                        } else {
+                            currentVolume *= (float) finalRatio;
+                        }
+                        currentVolume = Math.min(Math.max(currentVolume, minVolume), maxVolume); // Clamp between minVolume and maxVolume
+                        if (audio != null) audio.setVolume(currentVolume);
+                        logger.verbose("Fade to step " + currentStep + ": volume set to " + currentVolume);
+                        currentStep++;
                     } catch (Exception e) {
-                        Log.e(TAG, "Error stopping after fade", e);
+                        logger.error("Error during fade to", e);
+                        cancelFade();
                     }
                 }
-            }
-        };
-        handler.post(fadeRunnable);
+            },
+            0,
+            FADE_DELAY_MS,
+            TimeUnit.MILLISECONDS
+        );
+    }
+
+    /**
+     * Cancels the fade task if it is running.
+     */
+    protected void cancelFade() {
+        if (fadeTask != null && !fadeTask.isCancelled()) {
+            fadeTask.cancel(true);
+        }
+        fadeState = FadeState.NONE;
+        fadeTask = null;
+    }
+
+    @Override
+    public void close() {
+        if (fadeExecutor != null && !fadeExecutor.isShutdown()) {
+            fadeExecutor.shutdown();
+        }
+    }
+
+    @Override
+    protected void finalize() throws Throwable {
+        try {
+            close();
+        } finally {
+            super.finalize();
+        }
     }
 }

package/android/src/main/java/ee/forgr/audio/AudioDispatcher.java

@@ -13,15 +13,20 @@ import android.media.AudioAttributes;
 import android.media.MediaPlayer;
 import android.os.Build;
 import android.util.Log;
+import androidx.media3.common.util.UnstableApi;
 
+@UnstableApi
 public class AudioDispatcher
-    implements MediaPlayer.OnPreparedListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnSeekCompleteListener {
+    implements MediaPlayer.OnPreparedListener, MediaPlayer.OnCompletionListener, MediaPlayer.OnSeekCompleteListener
+{
 
     private final String TAG = "AudioDispatcher";
     private final MediaPlayer mediaPlayer;
     private int mediaState;
     private AudioAsset owner;
 
+    private float currentVolume = 1.0f;
+
     public AudioDispatcher(AssetFileDescriptor assetFileDescriptor, float volume) throws Exception {
         mediaState = INVALID;
 
@@ -41,6 +46,7 @@ public class AudioDispatcher
                 .build()
         );
         mediaPlayer.setVolume(volume, volume);
+        currentVolume = volume;
         mediaPlayer.setPlaybackParams(mediaPlayer.getPlaybackParams().setSpeed(1.0f));
         mediaPlayer.prepare();
     }
@@ -91,6 +97,11 @@ public class AudioDispatcher
 
     public void setVolume(float volume) throws Exception {
         mediaPlayer.setVolume(volume, volume);
+        currentVolume = volume;
+    }
+
+    public float getVolume() {
+        return currentVolume;
     }
 
     public void setRate(float rate) throws Exception {
@@ -181,7 +192,17 @@ public class AudioDispatcher
         }
     }
 
-    public boolean isPlaying() throws Exception {
-        return mediaPlayer.isPlaying();
+    public boolean isPlaying() {
+        boolean playing = false;
+        try {
+            playing = mediaPlayer.isPlaying();
+        } catch (IllegalStateException ex) {
+            Log.v(TAG, "Caught exception while checking if audio is playing: " + ex.getLocalizedMessage());
+        }
+        return playing;
+    }
+
+    public boolean isPaused() {
+        return mediaState == PAUSE;
     }
 }