Skip to content

A cross platform Audiobookshelf client for Android and iOS

Dart

Make the loudness slider actually boost the volume on Android instead of just compressing it

Barnabas540bb1655910
diff --git a/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt b/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt
index 8eaf9593..c79a3a7d 100644
--- a/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/barnabas/absorb/MainActivity.kt
@@ -11,7 +11,6 @@ import java.io.File
import java.io.FileInputStream
import android.media.audiofx.BassBoost
import android.media.audiofx.Equalizer
-import android.media.audiofx.LoudnessEnhancer
import android.media.audiofx.Virtualizer
import android.os.Build
import android.os.Bundle
@@ -26,6 +25,7 @@ import android.view.WindowManager
import com.ryanheise.audioservice.AudioService
import com.ryanheise.audioservice.AudioServiceActivity
import com.ryanheise.audioservice.AudioServicePlugin
+import com.ryanheise.just_audio.GainController
import com.ryanheise.just_audio.MonoController
import es.antonborri.home_widget.HomeWidgetLaunchIntent
import io.flutter.embedding.engine.FlutterEngine
@@ -45,10 +45,11 @@ class MainActivity : AudioServiceActivity() {
private var equalizer: Equalizer? = null
private var bassBoost: BassBoost? = null
private var virtualizer: Virtualizer? = null
- private var loudnessEnhancer: LoudnessEnhancer? = null
private var currentSessionId: Int = 0
private var eqEnabled: Boolean = false
- private var eqLoudnessGainMb: Int = 0 // gain from EQ loudness slider
+ // Loudness is sample gain in the player's audio sink (GainAudioProcessor),
+ // not a session effect, so it survives the activity and effect teardown.
+ private var eqLoudnessGainMb: Int = 0
// Some devices (e.g. older Samsung on Android 9) have a broken audio-effect
// HAL that fails to initialize. Constructing AudioEffects against it during
// playback can crash the process natively, which Kotlin can't catch. Once
@@ -455,17 +456,7 @@ class MainActivity : AudioServiceActivity() {
} catch (e: Exception) {
Log.w(TAG, "Virtualizer not supported: ${e.message}"); null
}
- loudnessEnhancer = try {
- LoudnessEnhancer(sessionId).apply {
- setTargetGain(eqLoudnessGainMb)
- enabled = false
- }
- } catch (e: Exception) {
- Log.w(TAG, "LoudnessEnhancer not supported: ${e.message}"); null
- }
-
- // Alpha: capture LoudnessEnhancer/eq state on attach for GH #179 (volume falls off).
- Log.d(TAG, "Effects attached to session $sessionId: eqEnabled=$eqEnabled loudnessGainMb=$eqLoudnessGainMb loudnessEffectOk=${loudnessEnhancer != null}")
+ Log.d(TAG, "Effects attached to session $sessionId: eqEnabled=$eqEnabled loudnessGainMb=$eqLoudnessGainMb")
result.success(true)
} catch (e: Exception) {
Log.e(TAG, "attachSession failed: ${e.message}")
@@ -521,8 +512,7 @@ class MainActivity : AudioServiceActivity() {
private fun handleSetLoudness(gain: Int, result: MethodChannel.Result) {
try {
eqLoudnessGainMb = gain
- loudnessEnhancer?.setTargetGain(gain)
- loudnessEnhancer?.enabled = gain > 0
+ GainController.setGainMb(gain)
result.success(true)
} catch (e: Exception) {
result.error("EQ_ERROR", e.message, null)
@@ -533,12 +523,9 @@ class MainActivity : AudioServiceActivity() {
try { equalizer?.release() } catch (_: Exception) {}
try { bassBoost?.release() } catch (_: Exception) {}
try { virtualizer?.release() } catch (_: Exception) {}
- try { loudnessEnhancer?.release() } catch (_: Exception) {}
equalizer = null
bassBoost = null
virtualizer = null
- loudnessEnhancer = null
- eqLoudnessGainMb = 0
eqEnabled = false
}
diff --git a/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java b/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
index d438e31e..b49ac6fc 100644
--- a/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
+++ b/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/AudioPlayer.java
@@ -956,11 +956,11 @@ public class AudioPlayer implements MethodCallHandler, Player.Listener, Metadata
Context context,
boolean enableFloatOutput,
boolean enableAudioTrackPlaybackParams) {
- Log.i(TAG, "PATCH ACTIVE: buildAudioSink with SonicAudioProcessor + MonoProcessor, AudioTrack speed DISABLED");
+ Log.i(TAG, "PATCH ACTIVE: buildAudioSink with SonicAudioProcessor + MonoProcessor + GainAudioProcessor, AudioTrack speed DISABLED");
return new DefaultAudioSink.Builder(context)
.setEnableFloatOutput(enableFloatOutput)
.setEnableAudioTrackPlaybackParams(false)
- .setAudioProcessors(new androidx.media3.common.audio.AudioProcessor[]{sonicAudioProcessor, monoProcessor})
+ .setAudioProcessors(new androidx.media3.common.audio.AudioProcessor[]{sonicAudioProcessor, monoProcessor, new GainAudioProcessor()})
.build();
}
};
diff --git a/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/GainAudioProcessor.java b/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/GainAudioProcessor.java
new file mode 100644
index 00000000..a3ba3986
--- /dev/null
+++ b/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/GainAudioProcessor.java
@@ -0,0 +1,63 @@
+package com.ryanheise.just_audio;
+
+import androidx.media3.common.C;
+import androidx.media3.common.audio.BaseAudioProcessor;
+import java.nio.ByteBuffer;
+
+/**
+ * Absorb patch: the EQ loudness slider as plain sample gain inside the
+ * ExoPlayer audio sink, the way the iOS tap applies it. Android's
+ * LoudnessEnhancer is a compressor that leaves narration already peaking near
+ * full scale almost untouched, and it lives on the audio session, so it dies
+ * with the activity and on phones whose effect stack is broken. This runs on
+ * every sample regardless. Peaks are soft-clipped so a big boost distorts
+ * gently instead of wrapping.
+ */
+public final class GainAudioProcessor extends BaseAudioProcessor {
+ private static volatile float sGain = 1f;
+
+ /** Gain in millibels (100 mB = 1 dB); zero or less is unity. */
+ public static void setGainMb(int gainMb) {
+ sGain = gainMb <= 0 ? 1f : (float) Math.pow(10.0, gainMb / 2000.0);
+ }
+
+ @Override
+ public AudioFormat onConfigure(AudioFormat inputAudioFormat)
+ throws UnhandledAudioFormatException {
+ int encoding = inputAudioFormat.encoding;
+ if (encoding != C.ENCODING_PCM_16BIT && encoding != C.ENCODING_PCM_FLOAT) {
+ throw new UnhandledAudioFormatException(inputAudioFormat);
+ }
+ return inputAudioFormat;
+ }
+
+ @Override
+ public void queueInput(ByteBuffer inputBuffer) {
+ int remaining = inputBuffer.remaining();
+ if (remaining == 0) return;
+ float gain = sGain;
+ ByteBuffer output = replaceOutputBuffer(remaining);
+ if (gain == 1f) {
+ output.put(inputBuffer);
+ } else if (inputAudioFormat.encoding == C.ENCODING_PCM_16BIT) {
+ while (inputBuffer.remaining() >= 2) {
+ float sample = softClip(inputBuffer.getShort() * gain / 32768f);
+ output.putShort((short) Math.round(sample * 32767f));
+ }
+ } else {
+ while (inputBuffer.remaining() >= 4) {
+ output.putFloat(softClip(inputBuffer.getFloat() * gain));
+ }
+ }
+ output.flip();
+ }
+
+ // Linear up to 0.8, then eases into the ceiling. Continuous with unit
+ // slope at the knee, never reaches 1.0.
+ private static float softClip(float x) {
+ float magnitude = Math.abs(x);
+ if (magnitude <= 0.8f) return x;
+ float y = 0.8f + 0.2f * (float) Math.tanh((magnitude - 0.8f) / 0.2f);
+ return x < 0 ? -y : y;
+ }
+}
diff --git a/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/GainController.java b/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/GainController.java
new file mode 100644
index 00000000..bb078468
--- /dev/null
+++ b/packages/just_audio/android/src/main/java/com/ryanheise/just_audio/GainController.java
@@ -0,0 +1,11 @@
+package com.ryanheise.just_audio;
+
+/**
+ * Static bridge so MainActivity can set the loudness gain without seeing
+ * media3 types on its classpath (same reason MonoController exists).
+ */
+public class GainController {
+ public static void setGainMb(int gainMb) {
+ GainAudioProcessor.setGainMb(gainMb);
+ }
+}