-
-
Notifications
You must be signed in to change notification settings - Fork 584
Add support for different types of stream delivery by a service #358
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Closed
mauriciocolli
wants to merge
4
commits into
TeamNewPipe:dev
from
mauriciocolli:improve-stream-handling
Closed
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
e83368e
Add a field describing how a stream is delivered by a service
mauriciocolli 7262690
[YouTube] Improve DASH manifest parsing
mauriciocolli f291309
[YouTube] Ignore streams using the "OTF" format
mauriciocolli c234a6d
[SoundCloud] Add support for the available HLS streams
mauriciocolli File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
134 changes: 134 additions & 0 deletions
134
extractor/src/main/java/org/schabi/newpipe/extractor/stream/DeliveryFormat.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,134 @@ | ||
| package org.schabi.newpipe.extractor.stream; | ||
|
|
||
| import java.io.Serializable; | ||
|
|
||
| import edu.umd.cs.findbugs.annotations.NonNull; | ||
|
|
||
| /** | ||
| * A class that is used to represent the way that a streaming service deliver their streams. | ||
| */ | ||
| public abstract class DeliveryFormat implements Serializable { | ||
|
|
||
| public static Direct direct(@NonNull String url) { | ||
| return new Direct(url); | ||
| } | ||
|
|
||
| public static HLS hls(@NonNull String url) { | ||
| return new HLS(url); | ||
| } | ||
|
|
||
| public static ManualDASH manualDASH(@NonNull String baseUrl, | ||
| @NonNull String manualDashManifest) { | ||
| return new ManualDASH(baseUrl, manualDashManifest); | ||
| } | ||
|
|
||
| /** | ||
| * Used when a service offer a direct link to their streams. | ||
| */ | ||
| public static class Direct extends DeliveryFormat { | ||
| private final String url; | ||
|
|
||
| private Direct(String url) { | ||
| this.url = url; | ||
| } | ||
|
|
||
| public String getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
|
|
||
| Direct direct = (Direct) o; | ||
|
|
||
| //noinspection EqualsReplaceableByObjectsCall | ||
| return url != null ? url.equals(direct.url) : direct.url == null; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return url != null ? url.hashCode() : 0; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Used when a service uses HLS playlists for delivering their content. | ||
| */ | ||
| public static class HLS extends DeliveryFormat { | ||
| private final String url; | ||
|
|
||
| private HLS(String url) { | ||
| this.url = url; | ||
| } | ||
|
|
||
| public String getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
|
|
||
| HLS hls = (HLS) o; | ||
|
|
||
| //noinspection EqualsReplaceableByObjectsCall | ||
| return url != null ? url.equals(hls.url) : hls.url == null; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| return url != null ? url.hashCode() : 0; | ||
| } | ||
| } | ||
|
|
||
| /** | ||
| * Used when a service uses DASH Manifests to deliver their streams. | ||
| * <p> | ||
| * This is useful for extracting a specific stream from the entire manifest. | ||
| */ | ||
| public static class ManualDASH extends DeliveryFormat { | ||
| private final String baseUrl; | ||
| private final String manualDashManifest; | ||
|
|
||
| private ManualDASH(String baseUrl, String manualDashManifest) { | ||
| this.baseUrl = baseUrl; | ||
| this.manualDashManifest = manualDashManifest; | ||
| } | ||
|
|
||
| public String getBaseUrl() { | ||
| return baseUrl; | ||
| } | ||
|
|
||
| public String getManualDashManifest() { | ||
| return manualDashManifest; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean equals(Object o) { | ||
| if (this == o) return true; | ||
| if (o == null || getClass() != o.getClass()) return false; | ||
|
|
||
| ManualDASH that = (ManualDASH) o; | ||
|
|
||
| //noinspection EqualsReplaceableByObjectsCall | ||
| if (baseUrl != null ? !baseUrl.equals(that.baseUrl) : that.baseUrl != null) { | ||
| return false; | ||
| } | ||
|
|
||
| //noinspection EqualsReplaceableByObjectsCall | ||
| return manualDashManifest != null | ||
| ? manualDashManifest.equals(that.manualDashManifest) | ||
| : that.manualDashManifest == null; | ||
| } | ||
|
|
||
| @Override | ||
| public int hashCode() { | ||
| int result = baseUrl != null ? baseUrl.hashCode() : 0; | ||
| result = 31 * result + (manualDashManifest != null ? manualDashManifest.hashCode() : 0); | ||
| return result; | ||
| } | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can you make this class an
interfaceand add agetUrlmethod? This will save us some casts.