ReVanced-Mirror/revanced-patches
1
0
Fork 0
mirror of https://github.com/revanced/revanced-patches synced 2025-02-10 18:46:54 +01:00
Code Issues Projects Releases Wiki Activity

fix(YouTube - Remember video quality): Correctly set default quality when changing from a low quality video (#3879)

Browse Source
This commit is contained in:
LisoUseInAIKyrios 2024-11-09 22:53:01 +04:00 committed by GitHub
parent c225ef1987
commit ddb73e857d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 25 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/shared/src/main/java/app/revanced/extension/youtube/patches/components/ShortsFilter.java
View File

@ -416,7 +416,6 @@ public final class ShortsFilter extends Filter {
// endregion // endregion
public static void setNavigationBar(PivotBar view) { public static void setNavigationBar(PivotBar view) {
Logger.printDebug(() -> "Setting navigation bar");
pivotBarRef = new WeakReference<>(view); pivotBarRef = new WeakReference<>(view);
} }

48
extensions/shared/src/main/java/app/revanced/extension/youtube/patches/playback/quality/RememberVideoQualityPatch.java
View File

@ -62,19 +62,12 @@ public class RememberVideoQualityPatch {
*/ */
public static int setVideoQuality(Object[] qualities, final int originalQualityIndex, Object qInterface, String qIndexMethod) { public static int setVideoQuality(Object[] qualities, final int originalQualityIndex, Object qInterface, String qIndexMethod) {
try { try {
if (!(qualityNeedsUpdating || userChangedDefaultQuality) || qInterface == null) { final int preferredQuality = Utils.getNetworkType() == NetworkType.MOBILE
return originalQualityIndex; ? mobileQualitySetting.get()
} : wifiQualitySetting.get();
qualityNeedsUpdating = false;
final int preferredQuality;
if (Utils.getNetworkType() == NetworkType.MOBILE) {
preferredQuality = mobileQualitySetting.get();
} else {
preferredQuality = wifiQualitySetting.get();
}
if (!userChangedDefaultQuality && preferredQuality == AUTOMATIC_VIDEO_QUALITY_VALUE) { if (!userChangedDefaultQuality && preferredQuality == AUTOMATIC_VIDEO_QUALITY_VALUE) {
return originalQualityIndex; // nothing to do return originalQualityIndex; // Nothing to do.
} }
if (videoQualities == null || videoQualities.size() != qualities.length) { if (videoQualities == null || videoQualities.size() != qualities.length) {
@ -87,7 +80,11 @@ public class RememberVideoQualityPatch {
} }
} }
} }
Logger.printDebug(() -> "videoQualities: " + videoQualities);
// After changing videos the qualities can initially be for the prior video.
// So if the qualities have changed an update is needed.
qualityNeedsUpdating = true;
Logger.printDebug(() -> "VideoQualities: " + videoQualities);
} }
if (userChangedDefaultQuality) { if (userChangedDefaultQuality) {
@ -98,7 +95,12 @@ public class RememberVideoQualityPatch {
return userSelectedQualityIndex; return userSelectedQualityIndex;
} }
// find the highest quality that is equal to or less than the preferred if (!qualityNeedsUpdating) {
return originalQualityIndex;
}
qualityNeedsUpdating = false;
// Find the highest quality that is equal to or less than the preferred.
int qualityToUse = videoQualities.get(0); // first element is automatic mode int qualityToUse = videoQualities.get(0); // first element is automatic mode
int qualityIndexToUse = 0; int qualityIndexToUse = 0;
int i = 0; int i = 0;
@ -112,20 +114,18 @@ public class RememberVideoQualityPatch {
// If the desired quality index is equal to the original index, // If the desired quality index is equal to the original index,
// then the video is already set to the desired default quality. // then the video is already set to the desired default quality.
// final int qualityToUseFinal = qualityToUse;
// The method could return here, but the UI video quality flyout will still if (qualityIndexToUse == originalQualityIndex) {
// show 'Auto' (ie: Auto (480p)) // On first load of a new video, if the UI video quality flyout menu
// It appears that "Auto" picks the resolution on video load, // is not updated then it will still show 'Auto' (ie: Auto (480p)),
// and it does not appear to change the resolution during playback. // even though it's already set to the desired resolution.
// //
// To prevent confusion, set the video index anyways (even if it matches the existing index) // To prevent confusion, set the video index anyways (even if it matches the existing index)
// As that will force the UI picker to not display "Auto" which may confuse the user. // as that will force the UI picker to not display "Auto".
if (qualityIndexToUse == originalQualityIndex) { Logger.printDebug(() -> "Video is already preferred quality: " + qualityToUseFinal);
Logger.printDebug(() -> "Video is already preferred quality: " + preferredQuality);
} else { } else {
final int qualityToUseLog = qualityToUse; Logger.printDebug(() -> "Changing video quality from: "
Logger.printDebug(() -> "Quality changed from: " + videoQualities.get(originalQualityIndex) + " to: " + qualityToUseFinal);
+ videoQualities.get(originalQualityIndex) + " to: " + qualityToUseLog);
} }
Method m = qInterface.getClass().getMethod(qIndexMethod, Integer.TYPE); Method m = qInterface.getClass().getMethod(qIndexMethod, Integer.TYPE);