mirrors/NewPipe
1
0
Fork 0
mirror of https://github.com/TeamNewPipe/NewPipe synced 2025-10-25 04:17:39 +00:00
Code Issues Releases Wiki Activity

Inline getDefaultResolutionWithDefaultFormat

Browse Source
This commit is contained in:
Profpatsch
2024-01-06 13:47:30 +01:00
parent 76eb751438
commit 0148d65cab
2 changed files with 22 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
app/src/main/java/org/schabi/newpipe/player/resolver/VideoPlaybackResolver.java
View File

@@ -106,17 +106,17 @@ public class VideoPlaybackResolver implements PlaybackResolver {
} else { } else {
switch (selectedPlayer) { switch (selectedPlayer) {
case MAIN -> { case MAIN -> {
videoIndex = ListHelper.getResolutionIndex( videoIndex = ListHelper.getDefaultResolutionWithDefaultFormat(
context, context,
videoStreamsList, getPlaybackQuality(),
getPlaybackQuality() videoStreamsList
); );
} }
case POPUP -> { case POPUP -> {
videoIndex = ListHelper.getPopupResolutionIndex( videoIndex = ListHelper.getDefaultResolutionWithDefaultFormat(
context, context,
videoStreamsList, getPlaybackQuality(),
getPlaybackQuality() videoStreamsList
); );
} }
} }

44
app/src/main/java/org/schabi/newpipe/util/ListHelper.java
View File

@@ -83,18 +83,6 @@ public final class ListHelper {
return getDefaultResolutionWithDefaultFormat(context, defaultResolution, videoStreams); return getDefaultResolutionWithDefaultFormat(context, defaultResolution, videoStreams);
} }
/**
* @param context Android app context
* @param videoStreams list of the video streams to check
* @param defaultResolution the default resolution to look for
* @return index of the video stream with the default index
* @see #getDefaultResolutionIndex(String, String, MediaFormat, List)
*/
public static int getResolutionIndex(final Context context,
final List<VideoStream> videoStreams,
final String defaultResolution) {
return getDefaultResolutionWithDefaultFormat(context, defaultResolution, videoStreams);
}
/** /**
* @param context Android app context * @param context Android app context
@@ -109,19 +97,6 @@ public final class ListHelper {
return getDefaultResolutionWithDefaultFormat(context, defaultResolution, videoStreams); return getDefaultResolutionWithDefaultFormat(context, defaultResolution, videoStreams);
} }
/**
* @param context Android app context
* @param videoStreams list of the video streams to check
* @param defaultResolution the default resolution to look for
* @return index of the video stream with the default index
* @see #getDefaultResolutionIndex(String, String, MediaFormat, List)
*/
public static int getPopupResolutionIndex(final Context context,
final List<VideoStream> videoStreams,
final String defaultResolution) {
return getDefaultResolutionWithDefaultFormat(context, defaultResolution, videoStreams);
}
public static int getDefaultAudioFormat(final Context context, public static int getDefaultAudioFormat(final Context context,
final List<AudioStream> audioStreams) { final List<AudioStream> audioStreams) {
return getAudioIndexByHighestRank(audioStreams, return getAudioIndexByHighestRank(audioStreams,
@@ -634,7 +609,7 @@ public final class ListHelper {
* @param videoStreams the list of video streams to check * @param videoStreams the list of video streams to check
* @return the index of the preferred video stream * @return the index of the preferred video stream
*/ */
private static int getDefaultResolutionWithDefaultFormat(@NonNull final Context context, public static int getDefaultResolutionWithDefaultFormat(@NonNull final Context context,
final String defaultResolution, final String defaultResolution,
final List<VideoStream> videoStreams) { final List<VideoStream> videoStreams) {
final MediaFormat defaultFormat = getDefaultFormat(context, final MediaFormat defaultFormat = getDefaultFormat(context,
@@ -680,6 +655,14 @@ public final class ListHelper {
return format; return format;
} }
/** #Comparator for two resolution strings.
*
* See {@link #sortStreamList} for ordering.
*
* @param r1 first
* @param r2 second
* @return comparison int
*/
private static int compareVideoStreamResolution(@NonNull final String r1, private static int compareVideoStreamResolution(@NonNull final String r1,
@NonNull final String r2) { @NonNull final String r2) {
try { try {
@@ -696,12 +679,17 @@ public final class ListHelper {
} }
} }
/** Does the application have a maximum resolution set?
*
* @param context App context
* @return whether a max resolution is set
*/
static boolean isLimitingDataUsage(@NonNull final Context context) { static boolean isLimitingDataUsage(@NonNull final Context context) {
return getResolutionLimit(context) != null; return getResolutionLimit(context) != null;
} }
/** /**
* The maximum resolution allowed. * The maximum resolution allowed by application settings.
* *
* @param context App context * @param context App context
* @return maximum resolution allowed or null if there is no maximum * @return maximum resolution allowed or null if there is no maximum
@@ -720,7 +708,7 @@ public final class ListHelper {
} }
/** /**
* The current network is metered (like mobile data)? * Is the current network metered (like mobile data)?
* *
* @param context App context * @param context App context
* @return {@code true} if connected to a metered network * @return {@code true} if connected to a metered network