Player: add audio delay switch

Author: yuliskov

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/models/playback/controllers/HQDialogController.java

@@ -134,7 +134,7 @@ private void addAudioDelayCategory() {
         if (getPlayer() == null) {
             return;
         }
-        addCategoryInt(AppDialogUtil.createAudioShiftCategory(getContext(),
+        addCategoryInt(AppDialogUtil.createAudioDelayCategory(getContext(),
                 () -> getPlayer().restartEngine()));
     }
 

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/app/presenters/settings/PlayerSettingsPresenter.java

@@ -64,7 +64,7 @@ public void show() {
         appendVideoZoomCategory(settingsPresenter);
         appendVideoSpeedCategory(settingsPresenter);
         appendAudioLanguageCategory(settingsPresenter);
-        appendAudioShiftCategory(settingsPresenter);
+        appendAudioDelayCategory(settingsPresenter);
         appendMasterVolumeCategory(settingsPresenter);
         appendOKButtonCategory(settingsPresenter);
         appendUIAutoHideCategory(settingsPresenter);
@@ -149,8 +149,8 @@ private void appendAudioLanguageCategory(AppDialogPresenter settingsPresenter) {
         settingsPresenter.appendCategory(category);
     }
 
-    private void appendAudioShiftCategory(AppDialogPresenter settingsPresenter) {
-        OptionCategory category = AppDialogUtil.createAudioShiftCategory(getContext());
+    private void appendAudioDelayCategory(AppDialogPresenter settingsPresenter) {
+        OptionCategory category = AppDialogUtil.createAudioDelayCategory(getContext());
         settingsPresenter.appendCategory(category);
     }
 

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/versions/renderer/CustomOverridesRenderersFactory.java

@@ -126,7 +126,7 @@ protected void buildAudioRenderers(Context context, @ExtensionRendererMode int e
         super.buildAudioRenderers(context, extensionRendererMode, mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys,
                 enableDecoderFallback, audioProcessors, eventHandler, eventListener, out);
 
-        if (mPlayerData.getAudioDelayMs() == 0 && !mPlayerTweaksData.isAudioSyncFixEnabled()) {
+        if ((mPlayerData.getAudioDelayMs() == 0 || !mPlayerData.isAudioDelayEnabled()) && !mPlayerTweaksData.isAudioSyncFixEnabled()) {
             // Improve performance a bit by eliminating calculations presented in custom renderer.
 
             return;
@@ -136,7 +136,7 @@ protected void buildAudioRenderers(Context context, @ExtensionRendererMode int e
                 new DelayMediaCodecAudioRenderer(context, mediaCodecSelector, drmSessionManager, playClearSamplesWithoutKeys, enableDecoderFallback,
                         eventHandler, eventListener, new DefaultAudioSink(AudioCapabilities.getCapabilities(context), audioProcessors));
 
-        audioRenderer.setAudioDelayMs(mPlayerData.getAudioDelayMs());
+        audioRenderer.setAudioDelayMs(mPlayerData.isAudioDelayEnabled() ? mPlayerData.getAudioDelayMs() : 0);
         audioRenderer.enableAudioSyncFix(mPlayerTweaksData.isAudioSyncFixEnabled());
 
         replaceAudioRenderer(out, audioRenderer);

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/prefs/PlayerData.java

@@ -100,6 +100,7 @@ public class PlayerData extends DataChangeBase implements PlayerConstants, Profi
     private List<String> mLastAudioLanguages;
     private final Runnable mPersistStateInt = this::persistStateInt;
     private boolean mIsLegacyCodecsForced;
+    private boolean mIsAudioDelayEnabled;
 
     private static class SpeedItem {
         public String channelId;
@@ -609,6 +610,15 @@ public void setSpeedPerChannelEnabled(boolean enable) {
         persistState();
     }
 
+    public boolean isAudioDelayEnabled() {
+        return mIsAudioDelayEnabled;
+    }
+
+    public void setAudioDelayEnabled(boolean enabled) {
+        mIsAudioDelayEnabled = enabled;
+        persistState();
+    }
+
     public int getAudioDelayMs() {
         return mAudioDelayMs;
     }
@@ -836,6 +846,7 @@ private void restoreState() {
         mIsSkipShortsEnabled = Helpers.parseBoolean(split, 59, false);
         mLastAudioLanguages = Helpers.parseStrList(split, 60);
         mIsVideoFlipEnabled = Helpers.parseBoolean(split, 61, false);
+        mIsAudioDelayEnabled = Helpers.parseBoolean(split, 62, false);
 
         if (speeds != null) {
             for (String speedSpec : speeds) {
@@ -872,7 +883,8 @@ private void persistStateInt() {
                 mIsSeekConfirmPlayEnabled, mSeekIncrementMs, null, mSubtitleScale, mPlayerVolume, mIsTooltipsEnabled, mSubtitlePosition,
                 mIsNumberKeySeekEnabled, mIsSkip24RateEnabled, mAfrPauseMs, mIsLiveChatEnabled, mLastSubtitleFormats, mLastSpeed, mRotationAngle,
                 mZoomPercents, mPlaybackMode, mAudioLanguage, mSubtitleLanguage, mEnabledSubtitlesPerChannel, mIsSubtitlesPerChannelEnabled,
-                mIsSpeedPerChannelEnabled, Helpers.mergeArray(mSpeeds.values().toArray()), mPitch, mIsSkipShortsEnabled, mLastAudioLanguages, mIsVideoFlipEnabled
+                mIsSpeedPerChannelEnabled, Helpers.mergeArray(mSpeeds.values().toArray()), mPitch, mIsSkipShortsEnabled, mLastAudioLanguages,
+                mIsVideoFlipEnabled, mIsAudioDelayEnabled
         ));
     }
 

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/utils/AppDialogUtil.java

@@ -401,17 +401,27 @@ public static OptionCategory createAudioLanguageCategory(Context context, Runnab
         return OptionCategory.from(AUDIO_LANGUAGE_ID, OptionCategory.TYPE_RADIO_LIST, title, options);
     }
 
-    public static OptionCategory createAudioShiftCategory(Context context) {
-        return createAudioShiftCategory(context, () -> {});
+    public static OptionCategory createAudioDelayCategory(Context context) {
+        return createAudioDelayCategory(context, () -> {});
     }
 
-    public static OptionCategory createAudioShiftCategory(Context context, Runnable onSetCallback) {
+    public static OptionCategory createAudioDelayCategory(Context context, Runnable onSetCallback) {
         PlayerData playerData = PlayerData.instance(context);
         String title = context.getResources().getQuantityString(R.plurals.seconds, 10, context.getString(R.string.audio_shift));
 
-        OptionItem optionItem = UiOptionItem.from(title, item -> {
+        List<OptionItem> items = new ArrayList<>();
+
+        OptionItem enableSwitch = UiOptionItem.from(context.getString(R.string.enable), item -> {
+            if (playerData.getAudioDelayMs() != 0) {
+                playerData.setAudioDelayEnabled(item.isSelected());
+                onSetCallback.run();
+            }
+        }, playerData.isAudioDelayEnabled());
+
+        OptionItem audioDelay = UiOptionItem.from(title, item -> {
             AppDialogPresenter.instance(context).closeDialog();
-            float delaySec = playerData.getAudioDelayMs() / 1_000f;
+            int delayMs = playerData.getAudioDelayMs();
+            float delaySec = delayMs / 1_000f;
             SimpleEditDialog.show(
                     context,
                     title,
@@ -424,18 +434,26 @@ public static OptionCategory createAudioShiftCategory(Context context, Runnable
                         float newDelaySec = Helpers.parseFloat(newValue);
                         int newDelayMs = (int) (newDelaySec * 1_000);
 
+                        if (newDelayMs == delayMs) {
+                            return false;
+                        }
+
                         if (newDelayMs == 0 && newDelaySec != 0) { // lower than 1ms
                             return false;
                         }
 
                         playerData.setAudioDelayMs(newDelayMs);
+                        playerData.setAudioDelayEnabled(newDelayMs != 0);
                         onSetCallback.run();
                         return true;
                     }
             );
-        });
+        }, playerData.isAudioDelayEnabled());
+
+        items.add(enableSwitch);
+        items.add(audioDelay);
 
-        return OptionCategory.from(AUDIO_DELAY_ID, OptionCategory.TYPE_SINGLE_BUTTON, title, optionItem);
+        return OptionCategory.from(AUDIO_DELAY_ID, OptionCategory.TYPE_CHECKBOX_LIST, title, items);
     }
 
     public static OptionCategory createAudioVolumeCategory(Context context) {

common/src/main/res/values/strings.xml

@@ -169,7 +169,7 @@
     <string name="wait_data_loading">Please wait while data is loading…</string>
     <string name="auto_frame_rate_pause">Auto Frame Rate (pause when switching)</string>
     <string name="auto_frame_rate_applying">Applying auto frame rate %sx%s\@%s</string>
-    <string name="audio_shift">Audio shift</string>
+    <string name="audio_shift">Audio delay</string>
     <string name="player_remember_speed">Remember speed</string>
     <string name="mark_channel_as_watched">Mark as watched</string>
     <string name="channel_marked_as_watched">Channel has been marked as watched</string>