Peertube
/
NewPipe-app-android
mirror of https://github.com/TeamNewPipe/NewPipe/
1
0
Fork 0
Code Issues Releases Wiki Activity

Ensure that progressive contents are URL contents for playback 

A ResolverException will be now thrown otherwise.
This commit is contained in:
AudricV 2022-06-19 15:27:30 +02:00
parent 0ad6b3b88e
commit cbd3308da6
No known key found for this signature in database
GPG Key ID: DA92EC7905614198
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/src/main/java/org/schabi/newpipe/player/resolver/PlaybackResolver.java
View File

@ -249,6 +249,9 @@ public interface PlaybackResolver extends Resolver<StreamInfo, MediaSource> {
final Stream stream, final Stream stream,
final String cacheKey, final String cacheKey,
final MediaItemTag metadata) throws ResolverException { final MediaItemTag metadata) throws ResolverException {
if (!stream.isUrl()) {
throw new ResolverException("Non URI progressive contents are not supported");
}
throwResolverExceptionIfUrlNullOrEmpty(stream.getContent()); throwResolverExceptionIfUrlNullOrEmpty(stream.getContent());
return dataSource.getProgressiveMediaSourceFactory().createMediaSource( return dataSource.getProgressiveMediaSourceFactory().createMediaSource(
new MediaItem.Builder() new MediaItem.Builder()
@ -503,9 +506,9 @@ public interface PlaybackResolver extends Resolver<StreamInfo, MediaSource> {
private static void throwResolverExceptionIfUrlNullOrEmpty(@Nullable final String url) private static void throwResolverExceptionIfUrlNullOrEmpty(@Nullable final String url)
throws ResolverException { throws ResolverException {
if (url == null) { if (url == null) {
throw new ResolverException("Null stream url"); throw new ResolverException("Null stream URL");
} else if (url.isEmpty()) { } else if (url.isEmpty()) {
throw new ResolverException("Empty stream url"); throw new ResolverException("Empty stream URL");
} }
} }
//endregion //endregion