From 34670f6efe69720ef0c9a4f29fa8e3fa80dbe5ac Mon Sep 17 00:00:00 2001
From: Martin Nowak <code@dawg.eu>
Date: Mon, 29 Jan 2024 22:42:46 +0100
Subject: [PATCH] fix #4229 - configurable skip silence

- followup feed-specific skip silence config (#6910)
- toggle buttons to configure
- medium 300ms gap
- aggressive 50ms gap
---
 .../preferences/FeedSettingsFragment.java     | 25 +++++--
 .../screen/playback/VariableSpeedDialog.java  | 39 ++++++++---
 .../playback_speed_feed_setting_dialog.xml    | 34 ++++++++-
 .../main/res/layout/speed_select_dialog.xml   | 39 ++++++++++-
 .../model/feed/FeedPreferences.java           |  2 +-
 .../base/PlaybackServiceMediaPlayer.java      |  5 +-
 .../antennapod/playback/cast/CastPsmp.java    |  7 +-
 .../playback/service/PlaybackController.java  |  7 +-
 .../playback/service/PlaybackService.java     | 10 +--
 .../service/internal/ExoPlayerWrapper.java    | 70 +++++++++++++++++--
 .../playback/service/internal/LocalPSMP.java  | 15 ++--
 .../preferences/PlaybackPreferences.java      |  5 +-
 .../storage/preferences/UserPreferences.java  | 16 +++--
 .../ui/episodes/PlaybackSpeedUtils.java       |  3 +-
 14 files changed, 217 insertions(+), 60 deletions(-)

diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsFragment.java
index 4438f80cc9..1286595c6a 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/FeedSettingsFragment.java
@@ -243,16 +243,25 @@ private void setupPlaybackSpeedPreference() {
                     viewBinding.seekBar.setAlpha(isChecked ? 0.4f : 1f);
                     viewBinding.currentSpeedLabel.setAlpha(isChecked ? 0.4f : 1f);
 
-                    viewBinding.skipSilenceFeed.setEnabled(!isChecked);
-                    viewBinding.skipSilenceFeed.setAlpha(isChecked ? 0.4f : 1f);
+                    viewBinding.skipSilence.setEnabled(!isChecked);
+                    viewBinding.skipSilence.setAlpha(isChecked ? 0.4f : 1f);
                 });
                 float speed = feedPreferences.getFeedPlaybackSpeed();
                 FeedPreferences.SkipSilence skipSilence = feedPreferences.getFeedSkipSilence();
                 boolean isGlobal = speed == FeedPreferences.SPEED_USE_GLOBAL;
                 viewBinding.useGlobalCheckbox.setChecked(isGlobal);
                 viewBinding.seekBar.updateSpeed(isGlobal ? 1 : speed);
-                viewBinding.skipSilenceFeed.setChecked(!isGlobal
-                        && skipSilence == FeedPreferences.SkipSilence.AGGRESSIVE);
+                    if (isGlobal) {
+                        viewBinding.skipSilence.clearChecked();
+                    } else {
+                        int id = View.NO_ID;
+                        switch (skipSilence) {
+                            case OFF: id = R.id.skipSilenceOff; break;
+                            case MEDIUM: id = R.id.skipSilenceMedium; break;
+                            case AGGRESSIVE: id = R.id.skipSilenceAggressive; break;
+                        }
+                        viewBinding.skipSilence.check(id);
+                    }
                 new MaterialAlertDialogBuilder(getContext())
                         .setTitle(R.string.playback_speed)
                         .setView(viewBinding.getRoot())
@@ -263,10 +272,12 @@ private void setupPlaybackSpeedPreference() {
                             FeedPreferences.SkipSilence newSkipSilence;
                             if (viewBinding.useGlobalCheckbox.isChecked()) {
                                 newSkipSilence = FeedPreferences.SkipSilence.GLOBAL;
-                            } else if (viewBinding.skipSilenceFeed.isChecked()) {
-                                newSkipSilence = FeedPreferences.SkipSilence.AGGRESSIVE;
                             } else {
-                                newSkipSilence = FeedPreferences.SkipSilence.OFF;
+                                final int id = viewBinding.skipSilence.getCheckedButtonId();
+                                if (id == R.id.skipSilenceOff) newSkipSilence = FeedPreferences.SkipSilence.OFF;
+                                else if (id == R.id.skipSilenceMedium) newSkipSilence = FeedPreferences.SkipSilence.MEDIUM;
+                                else if (id == R.id.skipSilenceAggressive) newSkipSilence = FeedPreferences.SkipSilence.AGGRESSIVE;
+                                else newSkipSilence = FeedPreferences.SkipSilence.GLOBAL;
                             }
                             feedPreferences.setFeedSkipSilence(newSkipSilence);
                             DBWriter.setFeedPreferences(feedPreferences);
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/VariableSpeedDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/VariableSpeedDialog.java
index 8343e933a4..efc8c73a1e 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/VariableSpeedDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/playback/VariableSpeedDialog.java
@@ -7,16 +7,19 @@
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.CheckBox;
+import android.util.Log;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.recyclerview.widget.GridLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
+import com.google.android.material.button.MaterialButtonToggleGroup;
 import com.google.android.material.chip.Chip;
 import com.google.android.material.snackbar.Snackbar;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.event.playback.SpeedChangedEvent;
+import de.danoeh.antennapod.model.feed.FeedPreferences;
 import de.danoeh.antennapod.playback.service.PlaybackController;
 import de.danoeh.antennapod.storage.preferences.UserPreferences;
 import de.danoeh.antennapod.ui.view.ItemOffsetDecoration;
@@ -36,7 +39,7 @@ public class VariableSpeedDialog extends BottomSheetDialogFragment {
     private final List<Float> selectedSpeeds;
     private PlaybackSpeedSeekBar speedSeekBar;
     private Chip addCurrentSpeedChip;
-    private CheckBox skipSilenceCheckbox;
+    private MaterialButtonToggleGroup skipSilenceToggleGroup;
 
     public VariableSpeedDialog() {
         DecimalFormatSymbols format = new DecimalFormatSymbols(Locale.US);
@@ -74,8 +77,28 @@ public void updateSpeed(SpeedChangedEvent event) {
         addCurrentSpeedChip.setText(String.format(Locale.getDefault(), "%1$.2f", event.getNewSpeed()));
     }
 
-    public void updateSkipSilence(boolean skipSilence) {
-        skipSilenceCheckbox.setChecked(skipSilence);
+    public void updateSkipSilence(FeedPreferences.SkipSilence skipSilence) {
+        int id = View.NO_ID;
+        switch (skipSilence) {
+            case OFF: id = R.id.skipSilenceOff; break;
+            case MEDIUM: id = R.id.skipSilenceMedium; break;
+            case AGGRESSIVE: id = R.id.skipSilenceAggressive; break;
+        }
+        skipSilenceToggleGroup.check(id);
+    }
+
+    private void onSkipSilenceChanged(MaterialButtonToggleGroup group, int checkedId, boolean isChecked) {
+        FeedPreferences.SkipSilence opt;
+        final int id = group.getCheckedButtonId();
+        if (id == R.id.skipSilenceOff) opt = FeedPreferences.SkipSilence.OFF;
+        else if (id == R.id.skipSilenceMedium) opt = FeedPreferences.SkipSilence.MEDIUM;
+        else if (id == R.id.skipSilenceAggressive) opt = FeedPreferences.SkipSilence.AGGRESSIVE;
+        else opt = FeedPreferences.SkipSilence.GLOBAL;
+        if (UserPreferences.getSkipSilence() != opt)
+            UserPreferences.setSkipSilence(opt);
+        if (controller != null) {
+            controller.setSkipSilence(opt);
+        }
     }
 
     @Nullable
@@ -104,12 +127,10 @@ public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup c
         addCurrentSpeedChip.setCloseIconContentDescription(getString(R.string.add_preset));
         addCurrentSpeedChip.setOnClickListener(v -> addCurrentSpeed());
 
-        skipSilenceCheckbox = root.findViewById(R.id.skipSilence);
-        skipSilenceCheckbox.setChecked(UserPreferences.isSkipSilence());
-        skipSilenceCheckbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
-            UserPreferences.setSkipSilence(isChecked);
-            controller.setSkipSilence(isChecked);
-        });
+        skipSilenceToggleGroup = root.findViewById(R.id.skipSilence);
+        skipSilenceToggleGroup.addOnButtonCheckedListener(
+            (group, checkedId, isChecked) -> onSkipSilenceChanged(group, checkedId, isChecked));
+        updateSkipSilence(UserPreferences.getSkipSilence());
         return root;
     }
 
diff --git a/app/src/main/res/layout/playback_speed_feed_setting_dialog.xml b/app/src/main/res/layout/playback_speed_feed_setting_dialog.xml
index 317f860931..1e09db8d3a 100644
--- a/app/src/main/res/layout/playback_speed_feed_setting_dialog.xml
+++ b/app/src/main/res/layout/playback_speed_feed_setting_dialog.xml
@@ -34,10 +34,38 @@
 
     </LinearLayout>
 
-    <CheckBox
-        android:id="@+id/skipSilenceFeed"
+    <com.google.android.material.button.MaterialButtonToggleGroup
+        xmlns:app="http://schemas.android.com/apk/res-auto"
+        android:id="@+id/skipSilence"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/pref_skip_silence_title" />
+        android:weightSum="3"
+        app:singleSelection="true">
+
+        <Button
+            android:id="@+id/skipSilenceOff"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="Off"
+            style="@style/OutlinedButtonBetterContrast" />
+
+        <Button
+            android:id="@+id/skipSilenceMedium"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="Medium"
+            style="@style/OutlinedButtonBetterContrast" />
+
+        <Button
+            android:id="@+id/skipSilenceAggressive"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="Aggressive"
+            style="@style/OutlinedButtonBetterContrast" />
+
+    </com.google.android.material.button.MaterialButtonToggleGroup>
 
 </LinearLayout>
diff --git a/app/src/main/res/layout/speed_select_dialog.xml b/app/src/main/res/layout/speed_select_dialog.xml
index ad8e1ddcd0..7d9eb12fd1 100644
--- a/app/src/main/res/layout/speed_select_dialog.xml
+++ b/app/src/main/res/layout/speed_select_dialog.xml
@@ -42,10 +42,45 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
 
-    <CheckBox
+    <TextView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="8dp"
+        android:text="@string/pref_skip_silence_title"
+        style="@style/AntennaPod.TextView.ListItemPrimaryTitle" />
+
+    <com.google.android.material.button.MaterialButtonToggleGroup
+        xmlns:app="http://schemas.android.com/apk/res-auto"
         android:id="@+id/skipSilence"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/pref_skip_silence_title" />
+        android:weightSum="3"
+        app:singleSelection="true">
+
+        <Button
+            android:id="@+id/skipSilenceOff"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="Off"
+            style="@style/OutlinedButtonBetterContrast" />
+
+        <Button
+            android:id="@+id/skipSilenceMedium"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="Medium"
+            style="@style/OutlinedButtonBetterContrast" />
+
+        <Button
+            android:id="@+id/skipSilenceAggressive"
+            android:layout_width="0dp"
+            android:layout_height="match_parent"
+            android:layout_weight="1"
+            android:text="Aggressive"
+            style="@style/OutlinedButtonBetterContrast" />
+
+    </com.google.android.material.button.MaterialButtonToggleGroup>
 
 </LinearLayout>
diff --git a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedPreferences.java b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedPreferences.java
index 04c3849a27..c6b8a7afee 100644
--- a/model/src/main/java/de/danoeh/antennapod/model/feed/FeedPreferences.java
+++ b/model/src/main/java/de/danoeh/antennapod/model/feed/FeedPreferences.java
@@ -60,7 +60,7 @@ public static NewEpisodesAction fromCode(int code) {
     }
 
     public enum SkipSilence {
-        OFF(0), GLOBAL(1), AGGRESSIVE(2);
+        GLOBAL(0), OFF(1), MEDIUM(2), AGGRESSIVE(3);
 
         public final int code;
 
diff --git a/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java b/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java
index 250ef05759..378e79f5af 100644
--- a/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java
+++ b/playback/base/src/main/java/de/danoeh/antennapod/playback/base/PlaybackServiceMediaPlayer.java
@@ -13,6 +13,7 @@
 import androidx.annotation.Nullable;
 import de.danoeh.antennapod.model.playback.MediaType;
 import de.danoeh.antennapod.model.playback.Playable;
+import de.danoeh.antennapod.model.feed.FeedPreferences;
 
 
 /*
@@ -144,14 +145,14 @@ protected PlaybackServiceMediaPlayer(@NonNull Context context,
      * - SkipSilence (ExoPlayer only)
      * This method is executed on an internal executor service.
      */
-    public abstract void  setPlaybackParams(final float speed, final boolean skipSilence);
+    public abstract void  setPlaybackParams(final float speed, final FeedPreferences.SkipSilence skipSilence);
 
     /**
      * Returns the current playback speed. If the playback speed could not be retrieved, 1 is returned.
      */
     public abstract float getPlaybackSpeed();
 
-    public abstract boolean getSkipSilence();
+    public abstract FeedPreferences.SkipSilence getSkipSilence();
 
     /**
      * Sets the playback volume.
diff --git a/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java b/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java
index fd70fa18cf..70c94909db 100644
--- a/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java
+++ b/playback/cast/src/play/java/de/danoeh/antennapod/playback/cast/CastPsmp.java
@@ -26,6 +26,7 @@
 import de.danoeh.antennapod.event.PlayerErrorEvent;
 import de.danoeh.antennapod.event.playback.BufferUpdateEvent;
 import de.danoeh.antennapod.model.feed.FeedMedia;
+import de.danoeh.antennapod.model.feed.FeedPreferences;
 import de.danoeh.antennapod.model.playback.MediaType;
 import de.danoeh.antennapod.model.playback.Playable;
 import de.danoeh.antennapod.model.playback.RemoteMedia;
@@ -415,7 +416,7 @@ public void setStartWhenPrepared(boolean startWhenPrepared) {
     }
 
     @Override
-    public void setPlaybackParams(float speed, boolean skipSilence) {
+    public void setPlaybackParams(float speed, FeedPreferences.SkipSilence skipSilenceDurationUs) {
         double playbackRate = (float) Math.max(MediaLoadOptions.PLAYBACK_RATE_MIN,
                 Math.min(MediaLoadOptions.PLAYBACK_RATE_MAX, speed));
         remoteMediaClient.setPlaybackRate(playbackRate);
@@ -428,9 +429,9 @@ public float getPlaybackSpeed() {
     }
 
     @Override
-    public boolean getSkipSilence() {
+    public FeedPreferences.SkipSilence getSkipSilence() {
         // Don't think this is supported
-        return false;
+        return FeedPreferences.SkipSilence.OFF;
     }
 
     @Override
diff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackController.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackController.java
index 4a6ebbad2b..557140f0aa 100644
--- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackController.java
+++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackController.java
@@ -407,7 +407,7 @@ public void setPlaybackSpeed(float speed) {
         }
     }
 
-    public void setSkipSilence(boolean skipSilence) {
+    public void setSkipSilence(FeedPreferences.SkipSilence skipSilence) {
         if (playbackService != null) {
             playbackService.setSkipSilence(skipSilence);
         }
@@ -421,12 +421,11 @@ public float getCurrentPlaybackSpeedMultiplier() {
         }
     }
 
-    public boolean getCurrentPlaybackSkipSilence() {
+    public FeedPreferences.SkipSilence getCurrentPlaybackSkipSilence() {
         if (playbackService != null) {
             return playbackService.getCurrentSkipSilence();
         } else {
-            return PlaybackSpeedUtils.getCurrentSkipSilencePreference(getMedia())
-                    == FeedPreferences.SkipSilence.AGGRESSIVE;
+            return PlaybackSpeedUtils.getCurrentSkipSilencePreference(getMedia());
         }
     }
 
diff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java
index 7d20124cf3..87d68f7309 100644
--- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java
+++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/PlaybackService.java
@@ -1641,9 +1641,9 @@ public void speedPresetChanged(SpeedPresetChangedEvent event) {
                     setSpeed(event.getSpeed());
                 }
                 if (event.getSkipSilence() == FeedPreferences.SkipSilence.GLOBAL) {
-                    setSkipSilence(UserPreferences.isSkipSilence());
+                    setSkipSilence(UserPreferences.getSkipSilence());
                 } else {
-                    setSkipSilence(event.getSkipSilence() == FeedPreferences.SkipSilence.AGGRESSIVE);
+                    setSkipSilence(event.getSkipSilence());
                 }
             }
         }
@@ -1703,7 +1703,7 @@ public void setSpeed(float speed) {
         mediaPlayer.setPlaybackParams(speed, getCurrentSkipSilence());
     }
 
-    public void setSkipSilence(boolean skipSilence) {
+    public void setSkipSilence(FeedPreferences.SkipSilence skipSilence) {
         PlaybackPreferences.setCurrentlyPlayingTemporarySkipSilence(skipSilence);
         mediaPlayer.setPlaybackParams(getCurrentPlaybackSpeed(), skipSilence);
     }
@@ -1715,9 +1715,9 @@ public float getCurrentPlaybackSpeed() {
         return mediaPlayer.getPlaybackSpeed();
     }
 
-    public boolean getCurrentSkipSilence() {
+    public FeedPreferences.SkipSilence getCurrentSkipSilence() {
         if (mediaPlayer == null) {
-            return false;
+            return FeedPreferences.SkipSilence.OFF;
         }
         return mediaPlayer.getSkipSilence();
     }
diff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/ExoPlayerWrapper.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/ExoPlayerWrapper.java
index 22392a5630..a60f135f27 100644
--- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/ExoPlayerWrapper.java
+++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/ExoPlayerWrapper.java
@@ -32,6 +32,12 @@
 import androidx.media3.exoplayer.SeekParameters;
 import androidx.media3.exoplayer.ExoPlayer;
 import androidx.media3.common.AudioAttributes;
+import androidx.media3.exoplayer.audio.AudioCapabilities;
+import androidx.media3.exoplayer.audio.AudioSink;
+import androidx.media3.exoplayer.audio.DefaultAudioSink;
+import androidx.media3.exoplayer.audio.DefaultAudioSink.DefaultAudioProcessorChain;
+import androidx.media3.exoplayer.audio.SilenceSkippingAudioProcessor;
+import androidx.media3.exoplayer.audio.SonicAudioProcessor;
 import androidx.media3.exoplayer.source.MediaSource;
 import androidx.media3.exoplayer.source.ProgressiveMediaSource;
 import androidx.media3.exoplayer.source.TrackGroupArray;
@@ -51,6 +57,7 @@
 import de.danoeh.antennapod.net.common.AntennapodHttpClient;
 import de.danoeh.antennapod.net.common.HttpCredentialEncoder;
 import de.danoeh.antennapod.net.common.NetworkUtils;
+import de.danoeh.antennapod.model.feed.FeedPreferences;
 import de.danoeh.antennapod.model.playback.Playable;
 import io.reactivex.Observable;
 import io.reactivex.android.schedulers.AndroidSchedulers;
@@ -84,6 +91,8 @@ public class ExoPlayerWrapper {
     @Nullable
     private LoudnessEnhancer loudnessEnhancer = null;
 
+    private FeedPreferences.SkipSilence skipSilence = FeedPreferences.SkipSilence.OFF;
+
     ExoPlayerWrapper(Context context) {
         this.context = context;
         createPlayer();
@@ -104,7 +113,41 @@ private void createPlayer() {
                 DefaultLoadControl.DEFAULT_BUFFER_FOR_PLAYBACK_AFTER_REBUFFER_MS);
         loadControl.setBackBuffer(UserPreferences.getRewindSecs() * 1000 + 500, true);
         trackSelector = new DefaultTrackSelector(context);
-        exoPlayer = new ExoPlayer.Builder(context, new DefaultRenderersFactory(context))
+        final int skipSilenceDurationUs;
+        switch (skipSilence) {
+        case MEDIUM: skipSilenceDurationUs = 300_000; break;
+        case AGGRESSIVE: skipSilenceDurationUs = 50_000; break;
+        default: skipSilenceDurationUs = 0;
+        }
+        exoPlayer = new ExoPlayer.Builder(context, new DefaultRenderersFactory(context) {
+            @Override
+            protected AudioSink buildAudioSink(
+                    Context context,
+                    boolean enableFloatOutput,
+                    boolean enableAudioTrackPlaybackParams,
+                    boolean enableOffload) {
+                // https://github.com/google/ExoPlayer/blob/r2.14.2/library/core/src/main/java/com/google/android/exoplayer2/DefaultRenderersFactory.java#L637
+                return new DefaultAudioSink.Builder()
+                        .setAudioCapabilities(AudioCapabilities.getCapabilities(context))
+                        .setAudioProcessorChain(
+                                new DefaultAudioProcessorChain(
+                                        new SilenceSkippingAudioProcessor(
+                                                skipSilenceDurationUs,
+                                                skipSilenceDurationUs,
+                                                SilenceSkippingAudioProcessor.DEFAULT_SILENCE_THRESHOLD_LEVEL
+                                        ),
+                                        new SonicAudioProcessor()
+                                )
+                        )
+                        .setEnableFloatOutput(enableFloatOutput)
+                        .setEnableAudioTrackPlaybackParams(enableAudioTrackPlaybackParams)
+                        .setOffloadMode(
+                                enableOffload
+                                        ? DefaultAudioSink.OFFLOAD_MODE_ENABLED_GAPLESS_REQUIRED
+                                        : DefaultAudioSink.OFFLOAD_MODE_DISABLED)
+                        .build();
+            }
+        })
                 .setTrackSelector(trackSelector)
                 .setLoadControl(loadControl.build())
                 .build();
@@ -155,7 +198,8 @@ public void onAudioSessionIdChanged(int audioSessionId) {
                 initLoudnessEnhancer(audioSessionId);
             }
         });
-        simpleCache = new SimpleCache(new File(context.getCacheDir(), "streaming"),
+        if (simpleCache != null)
+            simpleCache = new SimpleCache(new File(context.getCacheDir(), "streaming"),
                 new LeastRecentlyUsedCacheEvictor(50 * 1024 * 1024), new StandaloneDatabaseProvider(context));
         initLoudnessEnhancer(exoPlayer.getAudioSessionId());
     }
@@ -168,8 +212,11 @@ public float getCurrentSpeedMultiplier() {
         return playbackParameters.speed;
     }
 
-    public boolean getCurrentSkipSilence() {
-        return exoPlayer.getSkipSilenceEnabled();
+    public FeedPreferences.SkipSilence getCurrentSkipSilence() {
+        if (!exoPlayer.getSkipSilenceEnabled()) {
+            return FeedPreferences.SkipSilence.OFF;
+        }
+        return this.skipSilence;
     }
 
     public int getDuration() {
@@ -269,9 +316,20 @@ public void setDisplay(SurfaceHolder sh) {
         exoPlayer.setVideoSurfaceHolder(sh);
     }
 
-    public void setPlaybackParams(float speed, boolean skipSilence) {
+    public void setPlaybackParams(float speed, FeedPreferences.SkipSilence skipSilence) {
         playbackParameters = new PlaybackParameters(speed, playbackParameters.pitch);
-        exoPlayer.setSkipSilenceEnabled(skipSilence);
+        // update skip silence duration in audio pipeline
+        if (skipSilence != FeedPreferences.SkipSilence.OFF && skipSilence != this.skipSilence) {
+            this.skipSilence = skipSilence;
+            final boolean wasPlaying = isPlaying();
+            final int position = getCurrentPosition();
+            exoPlayer.release();
+            createPlayer();
+            if (mediaSource != null) prepare();
+            exoPlayer.seekTo(position);
+            if (wasPlaying) exoPlayer.play();
+        }
+        exoPlayer.setSkipSilenceEnabled(skipSilence != FeedPreferences.SkipSilence.OFF);
         exoPlayer.setPlaybackParameters(playbackParameters);
     }
 
diff --git a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/LocalPSMP.java b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/LocalPSMP.java
index e6f2668e66..933e64dca3 100644
--- a/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/LocalPSMP.java
+++ b/playback/service/src/main/java/de/danoeh/antennapod/playback/service/internal/LocalPSMP.java
@@ -163,8 +163,7 @@ private void playMediaObject(@NonNull final Playable playable, final boolean for
             callback.ensureMediaInfoLoaded(media);
             callback.onMediaChanged(false);
             setPlaybackParams(PlaybackSpeedUtils.getCurrentPlaybackSpeed(media),
-                    PlaybackSpeedUtils.getCurrentSkipSilencePreference(media)
-                            == FeedPreferences.SkipSilence.AGGRESSIVE);
+                    PlaybackSpeedUtils.getCurrentSkipSilencePreference(media));
             if (stream) {
                 if (playable instanceof FeedMedia) {
                     FeedMedia feedMedia = (FeedMedia) playable;
@@ -216,8 +215,7 @@ public void resume() {
                 acquireWifiLockIfNecessary();
 
                 setPlaybackParams(PlaybackSpeedUtils.getCurrentPlaybackSpeed(media),
-                        PlaybackSpeedUtils.getCurrentSkipSilencePreference(media)
-                                == FeedPreferences.SkipSilence.AGGRESSIVE);
+                        PlaybackSpeedUtils.getCurrentSkipSilencePreference(media));
                 setVolume(1.0f, 1.0f);
 
                 if (playerStatus == PlayerStatus.PREPARED && media.getPosition() > 0) {
@@ -444,7 +442,7 @@ public void setStartWhenPrepared(boolean startWhenPrepared) {
      * This method is executed on an internal executor service.
      */
     @Override
-    public void setPlaybackParams(final float speed, final boolean skipSilence) {
+    public void setPlaybackParams(final float speed, final FeedPreferences.SkipSilence skipSilence) {
         Log.d(TAG, "Playback speed was set to " + speed);
         EventBus.getDefault().post(new SpeedChangedEvent(speed));
         mediaPlayer.setPlaybackParams(speed, skipSilence);
@@ -466,15 +464,14 @@ public float getPlaybackSpeed() {
     }
 
     @Override
-    public boolean getSkipSilence() {
-        boolean retVal = false;
+    public FeedPreferences.SkipSilence getSkipSilence() {
         if ((playerStatus == PlayerStatus.PLAYING
                 || playerStatus == PlayerStatus.PAUSED
                 || playerStatus == PlayerStatus.INITIALIZED
                 || playerStatus == PlayerStatus.PREPARED)) {
-            retVal = mediaPlayer.getCurrentSkipSilence();
+            return mediaPlayer.getCurrentSkipSilence();
         }
-        return retVal;
+        return FeedPreferences.SkipSilence.OFF;
     }
 
     /**
diff --git a/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/PlaybackPreferences.java b/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/PlaybackPreferences.java
index 9ec20bd2ce..5539d33f81 100644
--- a/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/PlaybackPreferences.java
+++ b/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/PlaybackPreferences.java
@@ -158,10 +158,9 @@ public static void setCurrentlyPlayingTemporaryPlaybackSpeed(float speed) {
         editor.apply();
     }
 
-    public static void setCurrentlyPlayingTemporarySkipSilence(boolean skipSilence) {
+    public static void setCurrentlyPlayingTemporarySkipSilence(FeedPreferences.SkipSilence skipSilence) {
         SharedPreferences.Editor editor = prefs.edit();
-        editor.putInt(PREF_CURRENTLY_PLAYING_TEMPORARY_SKIP_SILENCE, skipSilence
-                ? FeedPreferences.SkipSilence.AGGRESSIVE.code : FeedPreferences.SkipSilence.OFF.code);
+        editor.putInt(PREF_CURRENTLY_PLAYING_TEMPORARY_SKIP_SILENCE, skipSilence.code);
         editor.apply();
     }
 
diff --git a/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java b/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java
index 4b25531098..c0a5d30426 100644
--- a/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java
+++ b/storage/preferences/src/main/java/de/danoeh/antennapod/storage/preferences/UserPreferences.java
@@ -406,8 +406,16 @@ public static float getPlaybackSpeed() {
         }
     }
 
-    public static boolean isSkipSilence() {
-        return prefs.getBoolean(PREF_PLAYBACK_SKIP_SILENCE, false);
+    public static FeedPreferences.SkipSilence getSkipSilence() {
+        try {
+            return FeedPreferences.SkipSilence.fromCode(prefs.getInt(
+                PREF_PLAYBACK_SKIP_SILENCE, FeedPreferences.SkipSilence.OFF.code));
+        } catch (ClassCastException e) {
+            // migrate old binary preference
+            FeedPreferences.SkipSilence skipSilence = prefs.getBoolean(PREF_PLAYBACK_SKIP_SILENCE, false) ? FeedPreferences.SkipSilence.AGGRESSIVE : FeedPreferences.SkipSilence.OFF;
+            setSkipSilence(skipSilence);
+            return skipSilence;
+        }
     }
 
     public static List<Float> getPlaybackSpeedArray() {
@@ -584,8 +592,8 @@ public static void setPlaybackSpeed(float speed) {
         prefs.edit().putString(PREF_PLAYBACK_SPEED, String.valueOf(speed)).apply();
     }
 
-    public static void setSkipSilence(boolean skipSilence) {
-        prefs.edit().putBoolean(PREF_PLAYBACK_SKIP_SILENCE, skipSilence).apply();
+    public static void setSkipSilence(FeedPreferences.SkipSilence skipSilence) {
+        prefs.edit().putInt(PREF_PLAYBACK_SKIP_SILENCE, skipSilence.code).apply();
     }
 
     public static void setPlaybackSpeedArray(List<Float> speeds) {
diff --git a/ui/episodes/src/main/java/de/danoeh/antennapod/ui/episodes/PlaybackSpeedUtils.java b/ui/episodes/src/main/java/de/danoeh/antennapod/ui/episodes/PlaybackSpeedUtils.java
index e3c5ab6728..c85d888aff 100644
--- a/ui/episodes/src/main/java/de/danoeh/antennapod/ui/episodes/PlaybackSpeedUtils.java
+++ b/ui/episodes/src/main/java/de/danoeh/antennapod/ui/episodes/PlaybackSpeedUtils.java
@@ -52,8 +52,7 @@ public static FeedPreferences.SkipSilence getCurrentSkipSilencePreference(Playab
             }
         }
         if (skipSilence == FeedPreferences.SkipSilence.GLOBAL) {
-            skipSilence = UserPreferences.isSkipSilence()
-                    ? FeedPreferences.SkipSilence.AGGRESSIVE : FeedPreferences.SkipSilence.OFF;
+            skipSilence = UserPreferences.getSkipSilence();
         }
         return skipSilence;
     }