Fixed Soundcloud test: Return EVERYTHING that is found

deduplication should be done by the extractor

Author: litetex

extractor/src/main/java/org/schabi/newpipe/extractor/services/soundcloud/extractors/SoundcloudStreamExtractor.java

@@ -35,7 +35,6 @@
 import org.schabi.newpipe.extractor.streamdata.format.registry.AudioFormatRegistry;
 import org.schabi.newpipe.extractor.streamdata.stream.AudioStream;
 import org.schabi.newpipe.extractor.streamdata.stream.simpleimpl.SimpleAudioStreamImpl;
-import org.schabi.newpipe.extractor.streamdata.stream.util.NewPipeStreamCollectors;
 
 import java.io.IOException;
 import java.io.UnsupportedEncodingException;
@@ -45,6 +44,7 @@
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
+import java.util.stream.Collectors;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -186,15 +186,6 @@ public List<AudioStream> getAudioStreams() throws ExtractionException {
         }
     }
 
-    private static boolean checkMp3ProgressivePresence(@Nonnull final JsonArray transcodings) {
-        return transcodings.stream()
-                .filter(JsonObject.class::isInstance)
-                .map(JsonObject.class::cast)
-                .anyMatch(transcoding -> transcoding.getString("preset").contains("mp3")
-                        && transcoding.getObject("format").getString("protocol")
-                        .equals("progressive"));
-    }
-
     @Nonnull
     private String getTranscodingUrl(final String endpointUrl,
                                      final String protocol)
@@ -247,8 +238,6 @@ private List<AudioStream> extractAudioStreams() {
             return Collections.emptyList();
         }
 
-        final boolean mp3ProgressiveInStreams = checkMp3ProgressivePresence(transcodings);
-
         return transcodings.stream()
                 .filter(JsonObject.class::isInstance)
                 .map(JsonObject.class::cast)
@@ -272,11 +261,6 @@ private List<AudioStream> extractAudioStreams() {
                     final AudioMediaFormat mediaFormat;
                     final int averageBitrate;
                     if (preset.contains("mp3")) {
-                        // Don't add the MP3 HLS stream if there is a progressive stream present
-                        // because the two have the same bitrate
-                        if (mp3ProgressiveInStreams && protocol.equals("hls")) {
-                            return null;
-                        }
                         mediaFormat = AudioFormatRegistry.MP3;
                         averageBitrate = 128;
                     } else if (preset.contains("opus")) {
@@ -295,7 +279,7 @@ private List<AudioStream> extractAudioStreams() {
                     );
                 })
                 .filter(Objects::nonNull)
-                .collect(NewPipeStreamCollectors.toDistinctList());
+                .collect(Collectors.toList());
     }
 
     /**

extractor/src/main/java/org/schabi/newpipe/extractor/streamdata/stream/util/NewPipeStreamCollectors.java

@@ -16,6 +16,7 @@
 import org.schabi.newpipe.extractor.services.DefaultStreamExtractorTest;
 import org.schabi.newpipe.extractor.stream.StreamExtractor;
 import org.schabi.newpipe.extractor.streamdata.delivery.ProgressiveHTTPDeliveryData;
+import org.schabi.newpipe.extractor.streamdata.delivery.UrlBasedDeliveryData;
 import org.schabi.newpipe.extractor.streamdata.format.registry.AudioFormatRegistry;
 import org.schabi.newpipe.extractor.streamdata.stream.AudioStream;
 
@@ -191,30 +192,20 @@ public void testAudioStreams() throws Exception {
             super.testAudioStreams();
 
             final List<AudioStream> audioStreams = extractor.getAudioStreams();
-            assertEquals(2, audioStreams.size());
+            assertEquals(3, audioStreams.size());
 
             for (final AudioStream audioStream : audioStreams) {
-                assertTrue(audioStream.deliveryData() instanceof ProgressiveHTTPDeliveryData,
+                assertTrue(audioStream.deliveryData() instanceof UrlBasedDeliveryData,
                         "Wrong delivery method for mediaFormat=" + audioStream.mediaFormat()
                                 + " , avgBR=" + audioStream.averageBitrate()
                                 + " , deliverDataType=" + audioStream.deliveryData().getClass()
                 );
 
-                final ProgressiveHTTPDeliveryData deliveryData =
-                        (ProgressiveHTTPDeliveryData) audioStream.deliveryData();
+                final UrlBasedDeliveryData deliveryData =
+                        (UrlBasedDeliveryData) audioStream.deliveryData();
 
                 final String mediaUrl = deliveryData.url();
-                if (audioStream.mediaFormat() == AudioFormatRegistry.OPUS) {
-                    // Assert that it's an OPUS 64 kbps media URL with a single range which comes
-                    // from an HLS SoundCloud CDN
-                    ExtractorAsserts.assertContains("-hls-opus-media.sndcdn.com", mediaUrl);
-                    ExtractorAsserts.assertContains(".64.opus", mediaUrl);
-                } else if (audioStream.mediaFormat() == AudioFormatRegistry.MP3) {
-                    // Assert that it's a MP3 128 kbps media URL which comes from a progressive
-                    // SoundCloud CDN
-                    ExtractorAsserts.assertContains("-media.sndcdn.com/bKOA7Pwbut93.128.mp3",
-                            mediaUrl);
-                }
+                ExtractorAsserts.assertContains("-media.sndcdn.com", mediaUrl);
             }
         }
     }