baalajimaestro/NewPipe
1
0
Fork 0
Code Issues Pull requests Projects Releases 7 Packages Wiki Activity

Use ListHelper to get secondary audio streams for video-only streams

Browse source 
Instead of searching for the first audio stream matching a compatible media
format, this change makes SecondaryStreamHelper.getAudioStreamFor use methods
isLimitingDataUsage, getAudioFormatComparator and getAudioIndexByHighestRank of
ListHelper to get an audio stream which can be muxed into a video-only stream,
if available.

This allows users to download videos with the highest audio quality available
if no resolution limit on mobile data usage has been set.

The order of formats used to search a compatible audio stream has been kept.
This commit is contained in:
AudricV 2023-09-24 18:23:00 +02:00
parent cdb79ef78a
commit 77bbbc88f8
No known key found for this signature in database
GPG key ID: DA92EC7905614198
2 changed files with 29 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/src/main/java/org/schabi/newpipe/download/DownloadDialog.java
View file

@ -267,8 +267,8 @@ public class DownloadDialog extends DialogFragment
if (!videoStreams.get(i).isVideoOnly()) { if (!videoStreams.get(i).isVideoOnly()) {
continue; continue;
} }
final AudioStream audioStream = SecondaryStreamHelper final AudioStream audioStream = SecondaryStreamHelper.getAudioStreamFor(
.getAudioStreamFor(audioStreams.getStreamsList(), videoStreams.get(i)); context, audioStreams.getStreamsList(), videoStreams.get(i));
if (audioStream != null) { if (audioStream != null) {
secondaryStreams.append(i, new SecondaryStreamHelper<>(audioStreams, audioStream)); secondaryStreams.append(i, new SecondaryStreamHelper<>(audioStreams, audioStream));

46
app/src/main/java/org/schabi/newpipe/util/SecondaryStreamHelper.java
View file

@ -1,5 +1,7 @@
package org.schabi.newpipe.util; package org.schabi.newpipe.util;
import android.content.Context;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -9,6 +11,7 @@ import org.schabi.newpipe.extractor.stream.Stream;
import org.schabi.newpipe.extractor.stream.VideoStream; import org.schabi.newpipe.extractor.stream.VideoStream;
import org.schabi.newpipe.util.StreamItemAdapter.StreamInfoWrapper; import org.schabi.newpipe.util.StreamItemAdapter.StreamInfoWrapper;
import java.util.Comparator;
import java.util.List; import java.util.List;
public class SecondaryStreamHelper<T extends Stream> { public class SecondaryStreamHelper<T extends Stream> {
@ -27,12 +30,14 @@ public class SecondaryStreamHelper<T extends Stream> {
/** /**
* Find the correct audio stream for the desired video stream. * Find the correct audio stream for the desired video stream.
* *
* @param context Android context
* @param audioStreams list of audio streams * @param audioStreams list of audio streams
* @param videoStream desired video ONLY stream * @param videoStream desired video ONLY stream
* @return selected audio stream or null if a candidate was not found * @return selected audio stream or null if a candidate was not found
*/ */
@Nullable @Nullable
public static AudioStream getAudioStreamFor(@NonNull final List<AudioStream> audioStreams, public static AudioStream getAudioStreamFor(@NonNull final Context context,
@NonNull final List<AudioStream> audioStreams,
@NonNull final VideoStream videoStream) { @NonNull final VideoStream videoStream) {
final MediaFormat mediaFormat = videoStream.getFormat(); final MediaFormat mediaFormat = videoStream.getFormat();
if (mediaFormat == null) { if (mediaFormat == null) {
@ -41,33 +46,36 @@ public class SecondaryStreamHelper<T extends Stream> {
switch (mediaFormat) { switch (mediaFormat) {
case WEBM: case WEBM:
case MPEG_4:// ¿is mpeg-4 DASH? case MPEG_4: // Is MPEG-4 DASH?
break; break;
default: default:
return null; return null;
} }
final boolean m4v = (mediaFormat == MediaFormat.MPEG_4); final boolean m4v = mediaFormat == MediaFormat.MPEG_4;
final boolean isLimitingDataUsage = ListHelper.isLimitingDataUsage(context);
for (final AudioStream audio : audioStreams) { Comparator<AudioStream> comparator = ListHelper.getAudioFormatComparator(
if (audio.getFormat() == (m4v ? MediaFormat.M4A : MediaFormat.WEBMA)) { m4v ? MediaFormat.M4A : MediaFormat.WEBMA, isLimitingDataUsage);
return audio; int preferredAudioStreamIndex = ListHelper.getAudioIndexByHighestRank(
audioStreams, comparator);
if (preferredAudioStreamIndex == -1) {
if (m4v) {
return null;
}
comparator = ListHelper.getAudioFormatComparator(
MediaFormat.WEBMA_OPUS, isLimitingDataUsage);
preferredAudioStreamIndex = ListHelper.getAudioIndexByHighestRank(
audioStreams, comparator);
if (preferredAudioStreamIndex == -1) {
return null;
} }
} }
if (m4v) { return audioStreams.get(preferredAudioStreamIndex);
return null;
}
// retry, but this time in reverse order
for (int i = audioStreams.size() - 1; i >= 0; i--) {
final AudioStream audio = audioStreams.get(i);
if (audio.getFormat() == MediaFormat.WEBMA_OPUS) {
return audio;
}
}
return null;
} }
public T getStream() { public T getStream() {