loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-15 03:29:53 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make DataSchemeDataSource consistent with other DataSource impls

Browse Source 
PiperOrigin-RevId: 362388683
This commit is contained in:
olly 2021-03-11 23:18:56 +00:00 committed by Ian Baker
parent 1a68f3d3a4
commit 93cc91641b
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
library/core/src/main/java/com/google/android/exoplayer2/upstream/DataSchemeDataSource.java
View File

@ -35,8 +35,8 @@ public final class DataSchemeDataSource extends BaseDataSource {
@Nullable private DataSpec dataSpec; @Nullable private DataSpec dataSpec;
@Nullable private byte[] data; @Nullable private byte[] data;
private int endPosition;
private int readPosition; private int readPosition;
private int bytesRemaining;
public DataSchemeDataSource() { public DataSchemeDataSource() {
super(/* isNetwork= */ false); super(/* isNetwork= */ false);
@ -46,7 +46,6 @@ public final class DataSchemeDataSource extends BaseDataSource {
public long open(DataSpec dataSpec) throws IOException { public long open(DataSpec dataSpec) throws IOException {
transferInitializing(dataSpec); transferInitializing(dataSpec);
this.dataSpec = dataSpec; this.dataSpec = dataSpec;
readPosition = (int) dataSpec.position;
Uri uri = dataSpec.uri; Uri uri = dataSpec.uri;
String scheme = uri.getScheme(); String scheme = uri.getScheme();
if (!SCHEME_DATA.equals(scheme)) { if (!SCHEME_DATA.equals(scheme)) {
@ -67,14 +66,17 @@ public final class DataSchemeDataSource extends BaseDataSource {
// TODO: Add support for other charsets. // TODO: Add support for other charsets.
data = Util.getUtf8Bytes(URLDecoder.decode(dataString, Charsets.US_ASCII.name())); data = Util.getUtf8Bytes(URLDecoder.decode(dataString, Charsets.US_ASCII.name()));
} }
endPosition = if (dataSpec.position > data.length) {
dataSpec.length != C.LENGTH_UNSET ? (int) dataSpec.length + readPosition : data.length;
if (readPosition >= endPosition) {
data = null; data = null;
throw new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE); throw new DataSourceException(DataSourceException.POSITION_OUT_OF_RANGE);
} }
readPosition = (int) dataSpec.position;
bytesRemaining = data.length - readPosition;
if (dataSpec.length != C.LENGTH_UNSET) {
bytesRemaining = (int) min(bytesRemaining, dataSpec.length);
}
transferStarted(dataSpec); transferStarted(dataSpec);
return (long) endPosition - readPosition; return dataSpec.length != C.LENGTH_UNSET ? dataSpec.length : bytesRemaining;
} }
@Override @Override
@ -82,13 +84,13 @@ public final class DataSchemeDataSource extends BaseDataSource {
if (readLength == 0) { if (readLength == 0) {
return 0; return 0;
} }
int remainingBytes = endPosition - readPosition; if (bytesRemaining == 0) {
if (remainingBytes == 0) {
return C.RESULT_END_OF_INPUT; return C.RESULT_END_OF_INPUT;
} }
readLength = min(readLength, remainingBytes); readLength = min(readLength, bytesRemaining);
System.arraycopy(castNonNull(data), readPosition, buffer, offset, readLength); System.arraycopy(castNonNull(data), readPosition, buffer, offset, readLength);
readPosition += readLength; readPosition += readLength;
bytesRemaining -= readLength;
bytesTransferred(readLength); bytesTransferred(readLength);
return readLength; return readLength;
} }