AltPresets dev. options mode now limits max bitrate to 90Mbit

Author: yuliskov

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

@@ -782,9 +782,10 @@ private void stopPlayback() {
             return;
         }
 
-        getPlayer().setPositionMs(getPlayer().getDurationMs());
+        //getPlayer().setPositionMs(getPlayer().getDurationMs());
         getPlayer().setPlayWhenReady(false);
-        getPlayer().showSuggestions(true);
+        //getPlayer().showSuggestions(true);
+        getPlayer().showControls(true);
     }
 
     private void restartPlaylistIfNeeded() {

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

@@ -581,8 +581,8 @@ private void appendDeveloperCategory(AppDialogPresenter settingsPresenter) {
 
         options.add(UiOptionItem.from(getContext().getString(R.string.alt_presets_behavior),
                 getContext().getString(R.string.alt_presets_behavior_desc),
-                option -> mPlayerTweaksData.setNoFpsPresetsEnabled(option.isSelected()),
-                mPlayerTweaksData.isNoFpsPresetsEnabled()));
+                option -> mPlayerTweaksData.setAltPresetsEnabled(option.isSelected()),
+                mPlayerTweaksData.isAltPresetsEnabled()));
 
         options.add(UiOptionItem.from(getContext().getString(R.string.prefer_avc_over_vp9),
                 getContext().getString(R.string.prefer_avc_over_vp9_desc),

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/controller/ExoPlayerController.java

@@ -17,7 +17,6 @@
 import com.google.android.exoplayer2.trackselection.TrackSelection;
 import com.google.android.exoplayer2.trackselection.TrackSelectionArray;
 import com.liskovsoft.mediaserviceinterfaces.data.MediaItemFormatInfo;
-import com.liskovsoft.sharedutils.helpers.Helpers;
 import com.liskovsoft.sharedutils.mylogger.Log;
 import com.liskovsoft.smartyoutubetv2.common.BuildConfig;
 import com.liskovsoft.smartyoutubetv2.common.app.models.data.Video;
@@ -69,8 +68,8 @@ public ExoPlayerController(Context context, PlayerEventListener eventListener) {
         mEventListener = eventListener;
 
         applyShield720pFix();
-        VideoTrack.sIsNoFpsPresetsEnabled = playerTweaksData.isNoFpsPresetsEnabled();
-        MediaTrack.preferAvcOverVp9(playerTweaksData.isAvcOverVp9Preferred());
+        VideoTrack.sIsAltPresetsEnabled = playerTweaksData.isAltPresetsEnabled();
+        MediaTrack.setAvcOverVp9Preferred(playerTweaksData.isAvcOverVp9Preferred());
     }
 
     private void applyShield720pFix() {

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/selector/track/MediaTrack.java

@@ -144,15 +144,15 @@ public static int getCodecWeight(String codec) {
         return isVP9Codec(codec) ? sVP9Weight : isAVCCodec(codec) ? sAVCWeight : isAV1Codec(codec) ? sAV1Weight : 0;
     }
 
-    public static boolean preferByCodec(MediaTrack prevTrack, MediaTrack nextTrack) {
-        return getCodecWeight(prevTrack) - getCodecWeight(nextTrack) > 0;
-    }
-
-    public static void preferAvcOverVp9(boolean prefer) {
+    public static void setAvcOverVp9Preferred(boolean prefer) {
         sAVCWeight = prefer ? VP9_WEIGHT : AVC_WEIGHT;
         sVP9Weight = prefer ? AVC_WEIGHT : VP9_WEIGHT;
     }
 
+    public static boolean preferByCodec(MediaTrack prevTrack, MediaTrack nextTrack) {
+        return getCodecWeight(prevTrack) - getCodecWeight(nextTrack) > 0;
+    }
+
     public static boolean preferByDrc(MediaTrack origin, MediaTrack prevTrack, MediaTrack nextTrack) {
         if (!(origin instanceof AudioTrack)) {
             return true;

common/src/main/java/com/liskovsoft/smartyoutubetv2/common/exoplayer/selector/track/VideoTrack.java

@@ -12,7 +12,8 @@ public class VideoTrack extends MediaTrack {
     private static final int COMPARE_TYPE_IN_BOUNDS_PRESET = 1;
     private static final int COMPARE_TYPE_IN_BOUNDS_PRESET_NO_FPS = 3;
     private static final int COMPARE_TYPE_NORMAL = 2;
-    public static boolean sIsNoFpsPresetsEnabled;
+    private static final int MAX_ALT_PRESET_BITRATE = 90_000_000; // 90 Mbit
+    public static boolean sIsAltPresetsEnabled;
 
     public VideoTrack(int rendererIndex) {
         super(rendererIndex);
@@ -98,10 +99,13 @@ public int inBounds(MediaTrack track2) {
         boolean isPreset = format.id == null;
 
         if (isPreset) {
+            if (sIsAltPresetsEnabled && track2.format != null && track2.format.bitrate > MAX_ALT_PRESET_BITRATE) {
+                return -1;
+            }
             // Overcome non-standard aspect ratio by getting resolution label
             //boolean respectPresetsFps = !sIsNoFpsPresetsEnabled ||
             //        sizeEquals(format.height, TrackSelectorUtil.getOriginHeight(track2.format.height));
-            boolean respectPresetsFps = !sIsNoFpsPresetsEnabled ||
+            boolean respectPresetsFps = !sIsAltPresetsEnabled ||
                     sizeEquals(TrackSelectorUtil.getRealHeight(format), TrackSelectorUtil.getRealHeight(track2.format));
             return compare(track2, isMultiFpsFormat || respectPresetsFps ? COMPARE_TYPE_IN_BOUNDS_PRESET : COMPARE_TYPE_IN_BOUNDS_PRESET_NO_FPS);
         } else {

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

@@ -68,7 +68,7 @@ public class PlayerTweaksData implements ProfileChangeListener {
     private boolean mIsPlaybackNotificationsDisabled;
     private boolean mIsTunneledPlaybackEnabled;
     private int mPlayerButtons;
-    private boolean mIsNoFpsPresetsEnabled;
+    private boolean mIsAltPresetsEnabled;
     private boolean mIsRememberPositionOfShortVideosEnabled;
     private boolean mIsRememberPositionOfLiveVideosEnabled;
     private boolean mIsSuggestionsDisabled;
@@ -295,12 +295,12 @@ public void setPlayerDataSource(int dataSource) {
         persistData();
     }
 
-    public boolean isNoFpsPresetsEnabled() {
-        return mIsNoFpsPresetsEnabled;
+    public boolean isAltPresetsEnabled() {
+        return mIsAltPresetsEnabled;
     }
 
-    public void setNoFpsPresetsEnabled(boolean enable) {
-        mIsNoFpsPresetsEnabled = enable;
+    public void setAltPresetsEnabled(boolean enable) {
+        mIsAltPresetsEnabled = enable;
         persistData();
     }
 
@@ -712,7 +712,7 @@ private void restoreData() {
         mIsTunneledPlaybackEnabled = Helpers.parseBoolean(split, 12, false);
         mPlayerButtons = Helpers.parseInt(split, 13, PLAYER_BUTTON_DEFAULT);
         // Buffering fix was there.
-        mIsNoFpsPresetsEnabled = Helpers.parseBoolean(split, 15, false);
+        mIsAltPresetsEnabled = Helpers.parseBoolean(split, 15, false);
         mIsRememberPositionOfShortVideosEnabled = Helpers.parseBoolean(split, 16, false);
         mIsSuggestionsDisabled = Helpers.parseBoolean(split, 17, false);
         mIsAvcOverVp9Preferred = Helpers.parseBoolean(split, 18, false);
@@ -780,7 +780,7 @@ private void persistDataInt() {
                 mIsProfileLevelCheckSkipped, mIsSWDecoderForced, mIsTextureViewEnabled,
                 null, mIsSetOutputSurfaceWorkaroundEnabled, mIsAudioSyncFixEnabled, mIsKeepFinishedActivityEnabled, mIsHlsStreamsForced,
                 mIsPlaybackNotificationsDisabled, mIsTunneledPlaybackEnabled, mPlayerButtons,
-                null, mIsNoFpsPresetsEnabled, mIsRememberPositionOfShortVideosEnabled, mIsSuggestionsDisabled,
+                null, mIsAltPresetsEnabled, mIsRememberPositionOfShortVideosEnabled, mIsSuggestionsDisabled,
                 mIsAvcOverVp9Preferred, mIsChatPlacedLeft, mIsRealChannelIconEnabled, mPixelRatio, mIsQualityInfoBitrateEnabled,
                 mIsSpeedButtonOldBehaviorEnabled, mIsButtonLongClickEnabled, mIsLongSpeedListEnabled, mPlayerDataSource, mUnlockAllFormats,
                 mIsDashUrlStreamsForced, mIsSonyFrameDropFixEnabled, mIsBufferOnStreamsDisabled, mIsSectionPlaylistEnabled,