CypherpunkSamurai/NewPipeExtractor
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Add a check to don't show MP3 128kbps stream twice and catch IOException when fetching the HLS Manifest

Browse source 
If a progressive stream is present in the transcodings, it's unnecessary to show twice an MP3 128kbps stream so if this is the case, the MP3 HLS stream will be not added to the audioStreams, else it will.
This commit also catch fetching errors in HLS manifests parsing and don't add the corresponding stream if an error occurs.
This commit is contained in:
TiA4f8R 2021-01-25 20:42:08 +01:00
parent 26f1b4e7dc
commit cbacd3c0a5
No known key found for this signature in database
GPG key ID: E6D3E7F5949450DD
1 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -195,6 +195,19 @@ public class SoundcloudStreamExtractor extends StreamExtractor {
try {
final JsonArray transcodings = track.getObject("media").getArray("transcodings");
// Iterate a first time to see if there is a progressive MP3 stream available.
// If yes, the MP3 HLS stream will be not added to audioStreams.
boolean mp3ProgressiveStreamInTranscodings = false;
for (final Object transcoding : transcodings) {
final JsonObject t = (JsonObject) transcoding;
if (t.getString("preset").contains("mp3") &&
t.getObject("format").getString("protocol").equals("progressive")) {
mp3ProgressiveStreamInTranscodings = true;
}
}
// Get information about what stream formats are available
for (final Object transcoding : transcodings) {
final JsonObject t = (JsonObject) transcoding;
@ -205,6 +218,13 @@ public class SoundcloudStreamExtractor extends StreamExtractor {
if (!isNullOrEmpty(url)) {
if (t.getString("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 (t.getObject("format").getString("protocol").equals("hls") &&
mp3ProgressiveStreamInTranscodings) {
continue;
}
mediaFormat = MediaFormat.MP3;
bitrate = 128;
} else if (t.getString("preset").contains("opus")) {
@ -222,13 +242,14 @@ public class SoundcloudStreamExtractor extends StreamExtractor {
final String res = dl.get(url).responseBody();
try {
JsonObject mp3UrlObject = JsonParser.object().from(res);
final JsonObject mp3UrlObject = JsonParser.object().from(res);
// Links in this file are also only valid for a short period.
mediaUrl = mp3UrlObject.getString("url");
} catch (final JsonParserException e) {
throw new ParsingException("Could not parse streamable url", e);
}
} else if (t.getObject("format").getString("protocol").equals("hls")) {
// This url points to the endpoint which generates a unique and short living url to the stream.
url += "?client_id=" + SoundcloudParsingHelper.clientId();
final String res = dl.get(url).responseBody();
@ -236,9 +257,13 @@ public class SoundcloudStreamExtractor extends StreamExtractor {
try {
final JsonObject mp3HlsUrlObject = JsonParser.object().from(res);
// Links in this file are also only valid for a short period.
// Parsing the HLS manifest to get a single file by requesting a range equal to 0-track_length
final String hlsManifestResponse = dl.get(mp3HlsUrlObject.getString("url")).responseBody();
final String hlsManifestResponse;
try {
hlsManifestResponse = dl.get(mp3HlsUrlObject.getString("url")).responseBody();
} catch (final IOException e) {
continue;
}
final List<String> hlsRangesList = new ArrayList<>();
final Matcher regex = Pattern.compile("((https?):((//)|(\\\\))+[\\w\\d:#@%/;$()~_?+-=\\\\.&]*)")
.matcher(hlsManifestResponse);