mirrors
/
NewPipe
mirror of https://github.com/TeamNewPipe/NewPipe
1
0
Fork 0
Code Issues Releases Wiki Activity

VideoPlaybackResolver: implicit -1 videoIndex 

All functions that set videoIndex return `-1` if the list is empty, so
we don’t have to check manually for that case.

I’m somewhat more questioning why `StreamInfoTag.of` allows the index
to be out-of-bounds in the constructor, that should be an error.
This commit is contained in:
Profpatsch 2024-01-06 17:37:17 +01:00
parent 71d88d0bc0
commit 64c68cf2f1
2 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,9 +85,7 @@ public class VideoPlaybackResolver implements PlaybackResolver {
getFilteredAudioStreams(context, info.getAudioStreams());
int videoIndex = -999;
if (videoStreamsList.isEmpty()) {
videoIndex = -1;
} else if (playbackQuality == null) {
if (playbackQuality == null) {
switch (selectedPlayer) {
case MAIN -> {
videoIndex = ListHelper.getDefaultResolutionIndex(

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

@ -73,7 +73,7 @@ public final class ListHelper {
/**
* @param context Android app context
* @param videoStreams list of the video streams to check
* @return index of the video stream with the default index
* @return index of the video stream with the default index, -1 if `videoStreams` is empty
* @see #getDefaultResolutionIndex(String, String, MediaFormat, List)
*/
public static int getDefaultResolutionIndex(final Context context,
@ -87,7 +87,7 @@ public final class ListHelper {
/**
* @param context Android app context
* @param videoStreams list of the video streams to check
* @return index of the video stream with the default index
* @return index of the video stream with the default index, -1 if `videoStreams` is empty
* @see #getDefaultResolutionIndex(String, String, MediaFormat, List)
*/
public static int getPopupDefaultResolutionIndex(final Context context,
@ -408,17 +408,19 @@ public final class ListHelper {
* on the parameters defaultResolution and defaultFormat.
*
* @param defaultResolution the default resolution to look for
* (a resolution string or `bestResolutionKey`).
* @param bestResolutionKey key of the best resolution
* @param defaultFormat the default format to look for
* @param videoStreams a mutable list of the video streams to check (it will be sorted in
* place)
* @return index of the default resolution&format in the sorted videoStreams
* @return index of the default resolution&format in the sorted videoStreams,
* -1 if `videoStreams` is empty
*/
static int getDefaultResolutionIndex(final String defaultResolution,
final String bestResolutionKey,
final MediaFormat defaultFormat,
@Nullable final List<VideoStream> videoStreams) {
if (videoStreams == null || videoStreams.isEmpty()) {
@NonNull final List<VideoStream> videoStreams) {
if (videoStreams.isEmpty()) {
return -1;
}
@ -626,11 +628,13 @@ public final class ListHelper {
* @param context Android app context
* @param defaultResolution the default resolution
* @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, -1 if `videoStreams` is empty
*/
public static int getDefaultResolutionWithDefaultFormat(@NonNull final Context context,
final String defaultResolution,
final List<VideoStream> videoStreams) {
public static int getDefaultResolutionWithDefaultFormat(
@NonNull final Context context,
final String defaultResolution,
@NonNull final List<VideoStream> videoStreams
) {
final MediaFormat defaultFormat = getDefaultFormat(context,
R.string.default_video_format_key, R.string.default_video_format_value);
return getDefaultResolutionIndex(defaultResolution,