Update extractor and refactored NewPipe
This commit is contained in:
Mauricio Colli
parent
bddd9b3409
commit
146d4a8365
254 changed files with 7836 additions and 7302 deletions
199
app/src/test/java/org/schabi/newpipe/util/ListHelperTest.java
Normal file
199
app/src/test/java/org/schabi/newpipe/util/ListHelperTest.java
Normal file
|
|
@ -0,0 +1,199 @@
|
|||
package org.schabi.newpipe.util;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.schabi.newpipe.extractor.MediaFormat;
|
||||
import org.schabi.newpipe.extractor.stream.AudioStream;
|
||||
import org.schabi.newpipe.extractor.stream.VideoStream;
|
||||
|
||||
import java.util.ArrayList;
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
public class ListHelperTest {
|
||||
private static final String BEST_RESOLUTION_KEY = "best_resolution";
|
||||
private static final List<AudioStream> audioStreamsTestList = Arrays.asList(
|
||||
new AudioStream("", MediaFormat.M4A.id, /**/ 128),
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 192),
|
||||
new AudioStream("", MediaFormat.MP3.id, /**/ 64),
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 192),
|
||||
new AudioStream("", MediaFormat.M4A.id, /**/ 128),
|
||||
new AudioStream("", MediaFormat.MP3.id, /**/ 128),
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 64),
|
||||
new AudioStream("", MediaFormat.M4A.id, /**/ 320),
|
||||
new AudioStream("", MediaFormat.MP3.id, /**/ 192),
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 320));
|
||||
|
||||
private static final List<VideoStream> videoStreamsTestList = Arrays.asList(
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "720p"),
|
||||
new VideoStream("", MediaFormat.v3GPP.id, /**/ "240p"),
|
||||
new VideoStream("", MediaFormat.WEBM.id, /**/ "480p"),
|
||||
new VideoStream("", MediaFormat.v3GPP.id, /**/ "144p"),
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "360p"),
|
||||
new VideoStream("", MediaFormat.WEBM.id, /**/ "360p"));
|
||||
|
||||
private static final List<VideoStream> videoOnlyStreamsTestList = Arrays.asList(
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "720p", true),
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "720p", true),
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "2160p", true),
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "1440p60", true),
|
||||
new VideoStream("", MediaFormat.WEBM.id, /**/ "720p60", true),
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "2160p60", true),
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "720p60", true),
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "1080p", true),
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "1080p60", true));
|
||||
|
||||
@Test
|
||||
public void getSortedStreamVideosListTest() throws Exception {
|
||||
List<VideoStream> result = ListHelper.getSortedStreamVideosList(MediaFormat.MPEG_4, true, videoStreamsTestList, videoOnlyStreamsTestList, true);
|
||||
|
||||
List<String> expected = Arrays.asList("144p", "240p", "360p", "480p", "720p", "720p60", "1080p", "1080p60", "1440p60", "2160p", "2160p60");
|
||||
//for (VideoStream videoStream : result) System.out.println(videoStream.resolution + " > " + MediaFormat.getSuffixById(videoStream.format) + " > " + videoStream.isVideoOnly);
|
||||
|
||||
assertEquals(result.size(), expected.size());
|
||||
for (int i = 0; i < result.size(); i++) {
|
||||
assertEquals(result.get(i).resolution, expected.get(i));
|
||||
}
|
||||
|
||||
////////////////////
|
||||
// Reverse Order //
|
||||
//////////////////
|
||||
|
||||
result = ListHelper.getSortedStreamVideosList(MediaFormat.MPEG_4, true, videoStreamsTestList, videoOnlyStreamsTestList, false);
|
||||
expected = Arrays.asList("2160p60", "2160p", "1440p60", "1080p60", "1080p", "720p60", "720p", "480p", "360p", "240p", "144p");
|
||||
assertEquals(result.size(), expected.size());
|
||||
for (int i = 0; i < result.size(); i++) assertEquals(result.get(i).resolution, expected.get(i));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSortedStreamVideosExceptHighResolutionsTest() throws Exception {
|
||||
////////////////////////////////////
|
||||
// Don't show Higher resolutions //
|
||||
//////////////////////////////////
|
||||
|
||||
List<VideoStream> result = ListHelper.getSortedStreamVideosList(MediaFormat.MPEG_4, false, videoStreamsTestList, videoOnlyStreamsTestList, false);
|
||||
List<String> expected = Arrays.asList("1080p60", "1080p", "720p60", "720p", "480p", "360p", "240p", "144p");
|
||||
assertEquals(result.size(), expected.size());
|
||||
for (int i = 0; i < result.size(); i++) assertEquals(result.get(i).resolution, expected.get(i));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getDefaultResolutionTest() throws Exception {
|
||||
List<VideoStream> testList = Arrays.asList(
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "720p"),
|
||||
new VideoStream("", MediaFormat.v3GPP.id, /**/ "240p"),
|
||||
new VideoStream("", MediaFormat.WEBM.id, /**/ "480p"),
|
||||
new VideoStream("", MediaFormat.WEBM.id, /**/ "240p"),
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "240p"),
|
||||
new VideoStream("", MediaFormat.WEBM.id, /**/ "144p"),
|
||||
new VideoStream("", MediaFormat.MPEG_4.id, /**/ "360p"),
|
||||
new VideoStream("", MediaFormat.WEBM.id, /**/ "360p"));
|
||||
VideoStream result = testList.get(ListHelper.getDefaultResolutionIndex("720p", BEST_RESOLUTION_KEY, MediaFormat.MPEG_4, testList));
|
||||
assertEquals("720p", result.resolution);
|
||||
assertEquals(MediaFormat.MPEG_4.id, result.format);
|
||||
|
||||
// Have resolution and the format
|
||||
result = testList.get(ListHelper.getDefaultResolutionIndex("480p", BEST_RESOLUTION_KEY, MediaFormat.WEBM, testList));
|
||||
assertEquals("480p", result.resolution);
|
||||
assertEquals(MediaFormat.WEBM.id, result.format);
|
||||
|
||||
// Have resolution but not the format
|
||||
result = testList.get(ListHelper.getDefaultResolutionIndex("480p", BEST_RESOLUTION_KEY, MediaFormat.MPEG_4, testList));
|
||||
assertEquals("480p", result.resolution);
|
||||
assertEquals(MediaFormat.WEBM.id, result.format);
|
||||
|
||||
// Have resolution and the format
|
||||
result = testList.get(ListHelper.getDefaultResolutionIndex("240p", BEST_RESOLUTION_KEY, MediaFormat.WEBM, testList));
|
||||
assertEquals("240p", result.resolution);
|
||||
assertEquals(MediaFormat.WEBM.id, result.format);
|
||||
|
||||
// The best resolution
|
||||
result = testList.get(ListHelper.getDefaultResolutionIndex(BEST_RESOLUTION_KEY, BEST_RESOLUTION_KEY, MediaFormat.WEBM, testList));
|
||||
assertEquals("720p", result.resolution);
|
||||
assertEquals(MediaFormat.MPEG_4.id, result.format);
|
||||
|
||||
// Doesn't have the 60fps variant and format
|
||||
result = testList.get(ListHelper.getDefaultResolutionIndex("720p60", BEST_RESOLUTION_KEY, MediaFormat.WEBM, testList));
|
||||
assertEquals("720p", result.resolution);
|
||||
assertEquals(MediaFormat.MPEG_4.id, result.format);
|
||||
|
||||
// Doesn't have the 60fps variant
|
||||
result = testList.get(ListHelper.getDefaultResolutionIndex("480p60", BEST_RESOLUTION_KEY, MediaFormat.WEBM, testList));
|
||||
assertEquals("480p", result.resolution);
|
||||
assertEquals(MediaFormat.WEBM.id, result.format);
|
||||
|
||||
// Doesn't have the resolution, will return the best one
|
||||
result = testList.get(ListHelper.getDefaultResolutionIndex("2160p60", BEST_RESOLUTION_KEY, MediaFormat.WEBM, testList));
|
||||
assertEquals("720p", result.resolution);
|
||||
assertEquals(MediaFormat.MPEG_4.id, result.format);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getHighestQualityAudioTest() throws Exception {
|
||||
assertEquals(320, ListHelper.getHighestQualityAudio(audioStreamsTestList).average_bitrate);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getHighestQualityAudioFormatTest() throws Exception {
|
||||
AudioStream stream = audioStreamsTestList.get(ListHelper.getHighestQualityAudioIndex(MediaFormat.M4A, audioStreamsTestList));
|
||||
assertEquals(320, stream.average_bitrate);
|
||||
assertEquals(MediaFormat.M4A.id, stream.format);
|
||||
|
||||
stream = audioStreamsTestList.get(ListHelper.getHighestQualityAudioIndex(MediaFormat.WEBMA, audioStreamsTestList));
|
||||
assertEquals(320, stream.average_bitrate);
|
||||
assertEquals(MediaFormat.WEBMA.id, stream.format);
|
||||
|
||||
stream = audioStreamsTestList.get(ListHelper.getHighestQualityAudioIndex(MediaFormat.MP3, audioStreamsTestList));
|
||||
assertEquals(192, stream.average_bitrate);
|
||||
assertEquals(MediaFormat.MP3.id, stream.format);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getHighestQualityAudioFormatPreferredAbsent() throws Exception {
|
||||
|
||||
//////////////////////////////////////////
|
||||
// Doesn't contain the preferred format //
|
||||
////////////////////////////////////////
|
||||
|
||||
List<AudioStream> testList = Arrays.asList(
|
||||
new AudioStream("", MediaFormat.M4A.id, /**/ 128),
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 192));
|
||||
// List doesn't contains this format, it should fallback to the highest bitrate audio no matter what format it is
|
||||
AudioStream stream = testList.get(ListHelper.getHighestQualityAudioIndex(MediaFormat.MP3, testList));
|
||||
assertEquals(192, stream.average_bitrate);
|
||||
assertEquals(MediaFormat.WEBMA.id, stream.format);
|
||||
|
||||
////////////////////////////////////////////////////////
|
||||
// Multiple not-preferred-formats and equal bitrates //
|
||||
//////////////////////////////////////////////////////
|
||||
|
||||
testList = new ArrayList<>(Arrays.asList(
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 192),
|
||||
new AudioStream("", MediaFormat.M4A.id, /**/ 192),
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 192),
|
||||
new AudioStream("", MediaFormat.M4A.id, /**/ 192),
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 192),
|
||||
new AudioStream("", MediaFormat.M4A.id, /**/ 192)));
|
||||
// List doesn't contains this format, it should fallback to the highest bitrate audio no matter what format it is
|
||||
// and as it have multiple with the same high value, the last one wins
|
||||
stream = testList.get(ListHelper.getHighestQualityAudioIndex(MediaFormat.MP3, testList));
|
||||
assertEquals(192, stream.average_bitrate);
|
||||
assertEquals(MediaFormat.M4A.id, stream.format);
|
||||
|
||||
|
||||
// Again with a new element
|
||||
testList.add(new AudioStream("", MediaFormat.WEBMA.id, /**/ 192));
|
||||
stream = testList.get(ListHelper.getHighestQualityAudioIndex(MediaFormat.MP3, testList));
|
||||
assertEquals(192, stream.average_bitrate);
|
||||
assertEquals(MediaFormat.WEBMA.id, stream.format);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getHighestQualityAudioNull() throws Exception {
|
||||
assertEquals(-1, ListHelper.getHighestQualityAudioIndex(null, null));
|
||||
assertEquals(-1, ListHelper.getHighestQualityAudioIndex(null, new ArrayList<AudioStream>()));
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
|
@ -1,78 +0,0 @@
|
|||
package org.schabi.newpipe.util;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.schabi.newpipe.extractor.MediaFormat;
|
||||
import org.schabi.newpipe.extractor.stream_info.AudioStream;
|
||||
import org.schabi.newpipe.extractor.stream_info.VideoStream;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.List;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
public class UtilsTest {
|
||||
private List<AudioStream> audioStreamsTestList = Arrays.asList(
|
||||
new AudioStream("", MediaFormat.M4A.id, /**/ 120, 0, 0),
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 190, 0, 0),
|
||||
new AudioStream("", MediaFormat.M4A.id, /**/ 130, 0, 0),
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 60, 0, 0),
|
||||
new AudioStream("", MediaFormat.M4A.id, /**/ 320, 0, 0),
|
||||
new AudioStream("", MediaFormat.WEBMA.id, /**/ 320, 0, 0));
|
||||
|
||||
private List<VideoStream> videoStreamsTestList = Arrays.asList(
|
||||
new VideoStream("", /**/ MediaFormat.MPEG_4.id, /**/ "720p"),
|
||||
new VideoStream("", /**/ MediaFormat.v3GPP.id, /**/ "240p"),
|
||||
new VideoStream("", /**/ MediaFormat.WEBM.id, /**/ "480p"),
|
||||
new VideoStream("", /**/ MediaFormat.v3GPP.id, /**/ "144p"),
|
||||
new VideoStream("", /**/ MediaFormat.MPEG_4.id, /**/ "360p"),
|
||||
new VideoStream("", /**/ MediaFormat.WEBM.id, /**/ "360p"));
|
||||
|
||||
private List<VideoStream> videoOnlyStreamsTestList = Arrays.asList(
|
||||
new VideoStream(true, "", /**/ MediaFormat.MPEG_4.id, /**/ "720p"),
|
||||
new VideoStream(true, "", /**/ MediaFormat.MPEG_4.id, /**/ "720p"),
|
||||
new VideoStream(true, "", /**/ MediaFormat.MPEG_4.id, /**/ "2160p"),
|
||||
new VideoStream(true, "", /**/ MediaFormat.MPEG_4.id, /**/ "1440p60"),
|
||||
new VideoStream(true, "", /**/ MediaFormat.WEBM.id, /**/ "720p60"),
|
||||
new VideoStream(true, "", /**/ MediaFormat.MPEG_4.id, /**/ "2160p60"),
|
||||
new VideoStream(true, "", /**/ MediaFormat.MPEG_4.id, /**/ "720p60"),
|
||||
new VideoStream(true, "", /**/ MediaFormat.MPEG_4.id, /**/ "1080p"),
|
||||
new VideoStream(true, "", /**/ MediaFormat.MPEG_4.id, /**/ "1080p60"));
|
||||
|
||||
@Test
|
||||
public void getHighestQualityAudioTest() throws Exception {
|
||||
assertEquals(320, Utils.getHighestQualityAudio(audioStreamsTestList).avgBitrate);
|
||||
}
|
||||
|
||||
@Test
|
||||
public void getSortedStreamVideosListTest() throws Exception {
|
||||
List<VideoStream> result = Utils.getSortedStreamVideosList(MediaFormat.MPEG_4, true, videoStreamsTestList, videoOnlyStreamsTestList, true);
|
||||
|
||||
List<String> expected = Arrays.asList("144p", "240p", "360p", "480p", "720p", "720p60", "1080p", "1080p60", "1440p60", "2160p", "2160p60");
|
||||
//for (VideoStream videoStream : result) System.out.println(videoStream.resolution + " > " + MediaFormat.getSuffixById(videoStream.format) + " > " + videoStream.isVideoOnly);
|
||||
|
||||
assertEquals(result.size(), expected.size());
|
||||
for (int i = 0; i < result.size(); i++) {
|
||||
assertEquals(result.get(i).resolution, expected.get(i));
|
||||
}
|
||||
|
||||
////////////////////
|
||||
// Reverse Order //
|
||||
//////////////////
|
||||
|
||||
result = Utils.getSortedStreamVideosList(MediaFormat.MPEG_4, true, videoStreamsTestList, videoOnlyStreamsTestList, false);
|
||||
|
||||
expected = Arrays.asList("2160p60", "2160p", "1440p60", "1080p60", "1080p", "720p60", "720p", "480p", "360p", "240p", "144p");
|
||||
assertEquals(result.size(), expected.size());
|
||||
for (int i = 0; i < result.size(); i++) assertEquals(result.get(i).resolution, expected.get(i));
|
||||
|
||||
////////////////////////////////////
|
||||
// Don't show Higher resolutions //
|
||||
//////////////////////////////////
|
||||
|
||||
result = Utils.getSortedStreamVideosList(MediaFormat.MPEG_4, false, videoStreamsTestList, videoOnlyStreamsTestList, false);
|
||||
expected = Arrays.asList("1080p60", "1080p", "720p60", "720p", "480p", "360p", "240p", "144p");
|
||||
assertEquals(result.size(), expected.size());
|
||||
for (int i = 0; i < result.size(); i++) assertEquals(result.get(i).resolution, expected.get(i));
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue