sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Try and use httpDataSource if scheme isn't recognised.

Browse source 
Issue: #473
This commit is contained in:
Oliver Woodman 2015-05-22 20:37:52 +01:00
parent 253a0105f7
commit 3e62b63eb2
1 changed files with 2 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
library/src/main/java/com/google/android/exoplayer/upstream/DefaultUriDataSource.java
View file

@ -36,28 +36,6 @@ import java.io.IOException;
*/ */
public final class DefaultUriDataSource implements UriDataSource { public final class DefaultUriDataSource implements UriDataSource {
/**
* Thrown when a {@link DefaultUriDataSource} is opened for a URI with an unsupported scheme.
*/
public static final class UnsupportedSchemeException extends IOException {
/**
* The unsupported scheme.
*/
public final String scheme;
/**
* @param scheme The unsupported scheme.
*/
public UnsupportedSchemeException(String scheme) {
super("Unsupported URI scheme: " + scheme);
this.scheme = scheme;
}
}
private static final String SCHEME_HTTP = "http";
private static final String SCHEME_HTTPS = "https";
private static final String SCHEME_FILE = "file"; private static final String SCHEME_FILE = "file";
private static final String SCHEME_ASSET = "asset"; private static final String SCHEME_ASSET = "asset";
private static final String SCHEME_CONTENT = "content"; private static final String SCHEME_CONTENT = "content";
@ -141,9 +119,7 @@ public final class DefaultUriDataSource implements UriDataSource {
Assertions.checkState(dataSource == null); Assertions.checkState(dataSource == null);
// Choose the correct source for the scheme. // Choose the correct source for the scheme.
String scheme = dataSpec.uri.getScheme(); String scheme = dataSpec.uri.getScheme();
if (SCHEME_HTTP.equals(scheme) || SCHEME_HTTPS.equals(scheme)) { if (SCHEME_FILE.equals(scheme) || TextUtils.isEmpty(scheme)) {
dataSource = httpDataSource;
} else if (SCHEME_FILE.equals(scheme) || TextUtils.isEmpty(scheme)) {
if (dataSpec.uri.getPath().startsWith("/android_asset/")) { if (dataSpec.uri.getPath().startsWith("/android_asset/")) {
dataSource = assetDataSource; dataSource = assetDataSource;
} else { } else {
@ -154,7 +130,7 @@ public final class DefaultUriDataSource implements UriDataSource {
} else if (SCHEME_CONTENT.equals(scheme)) { } else if (SCHEME_CONTENT.equals(scheme)) {
dataSource = contentDataSource; dataSource = contentDataSource;
} else { } else {
throw new UnsupportedSchemeException(scheme); dataSource = httpDataSource;
} }
// Open the source and return. // Open the source and return.
return dataSource.open(dataSpec); return dataSource.open(dataSpec);