loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-09 16:40:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enable nullness checking for CacheDataSource

Browse Source 
PiperOrigin-RevId: 322763032
This commit is contained in:
bachinger 2020-07-23 12:43:59 +01:00 committed by Oliver Woodman
parent ab73c04059
commit d25178844c
2 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheDataSource.java vendored
View File

@ -15,6 +15,9 @@
*/ */
package com.google.android.exoplayer2.upstream.cache; package com.google.android.exoplayer2.upstream.cache;
import static com.google.android.exoplayer2.util.Assertions.checkNotNull;
import static com.google.android.exoplayer2.util.Util.castNonNull;
import android.net.Uri; import android.net.Uri;
import androidx.annotation.IntDef; import androidx.annotation.IntDef;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -275,7 +278,7 @@ public final class CacheDataSource implements DataSource {
private CacheDataSource createDataSourceInternal( private CacheDataSource createDataSourceInternal(
@Nullable DataSource upstreamDataSource, @Flags int flags, int upstreamPriority) { @Nullable DataSource upstreamDataSource, @Flags int flags, int upstreamPriority) {
Cache cache = Assertions.checkNotNull(this.cache); Cache cache = checkNotNull(this.cache);
@Nullable DataSink cacheWriteDataSink; @Nullable DataSink cacheWriteDataSink;
if (cacheIsReadOnly || upstreamDataSource == null) { if (cacheIsReadOnly || upstreamDataSource == null) {
cacheWriteDataSink = null; cacheWriteDataSink = null;
@ -541,7 +544,7 @@ public final class CacheDataSource implements DataSource {
@Override @Override
public void addTransferListener(TransferListener transferListener) { public void addTransferListener(TransferListener transferListener) {
Assertions.checkNotNull(transferListener); checkNotNull(transferListener);
cacheReadDataSource.addTransferListener(transferListener); cacheReadDataSource.addTransferListener(transferListener);
upstreamDataSource.addTransferListener(transferListener); upstreamDataSource.addTransferListener(transferListener);
} }
@ -550,7 +553,8 @@ public final class CacheDataSource implements DataSource {
public long open(DataSpec dataSpec) throws IOException { public long open(DataSpec dataSpec) throws IOException {
try { try {
String key = cacheKeyFactory.buildCacheKey(dataSpec); String key = cacheKeyFactory.buildCacheKey(dataSpec);
requestDataSpec = dataSpec.buildUpon().setKey(key).build(); DataSpec requestDataSpec = dataSpec.buildUpon().setKey(key).build();
this.requestDataSpec = requestDataSpec;
actualUri = getRedirectedUriOrDefault(cache, key, /* defaultUri= */ requestDataSpec.uri); actualUri = getRedirectedUriOrDefault(cache, key, /* defaultUri= */ requestDataSpec.uri);
readPosition = dataSpec.position; readPosition = dataSpec.position;
@ -571,7 +575,7 @@ public final class CacheDataSource implements DataSource {
} }
} }
} }
openNextSource(false); openNextSource(requestDataSpec, false);
return bytesRemaining; return bytesRemaining;
} catch (Throwable e) { } catch (Throwable e) {
handleBeforeThrow(e); handleBeforeThrow(e);
@ -581,6 +585,7 @@ public final class CacheDataSource implements DataSource {
@Override @Override
public int read(byte[] buffer, int offset, int readLength) throws IOException { public int read(byte[] buffer, int offset, int readLength) throws IOException {
DataSpec requestDataSpec = checkNotNull(this.requestDataSpec);
if (readLength == 0) { if (readLength == 0) {
return 0; return 0;
} }
@ -589,9 +594,9 @@ public final class CacheDataSource implements DataSource {
} }
try { try {
if (readPosition >= checkCachePosition) { if (readPosition >= checkCachePosition) {
openNextSource(true); openNextSource(requestDataSpec, true);
} }
int bytesRead = currentDataSource.read(buffer, offset, readLength); int bytesRead = checkNotNull(currentDataSource).read(buffer, offset, readLength);
if (bytesRead != C.RESULT_END_OF_INPUT) { if (bytesRead != C.RESULT_END_OF_INPUT) {
if (isReadingFromCache()) { if (isReadingFromCache()) {
totalCachedBytesRead += bytesRead; totalCachedBytesRead += bytesRead;
@ -601,16 +606,16 @@ public final class CacheDataSource implements DataSource {
bytesRemaining -= bytesRead; bytesRemaining -= bytesRead;
} }
} else if (currentDataSpecLengthUnset) { } else if (currentDataSpecLengthUnset) {
setNoBytesRemainingAndMaybeStoreLength(); setNoBytesRemainingAndMaybeStoreLength(castNonNull(requestDataSpec.key));
} else if (bytesRemaining > 0 || bytesRemaining == C.LENGTH_UNSET) { } else if (bytesRemaining > 0 || bytesRemaining == C.LENGTH_UNSET) {
closeCurrentSource(); closeCurrentSource();
openNextSource(false); openNextSource(requestDataSpec, false);
return read(buffer, offset, readLength); return read(buffer, offset, readLength);
} }
return bytesRead; return bytesRead;
} catch (IOException e) { } catch (IOException e) {
if (currentDataSpecLengthUnset && DataSourceException.isCausedByPositionOutOfRange(e)) { if (currentDataSpecLengthUnset && DataSourceException.isCausedByPositionOutOfRange(e)) {
setNoBytesRemainingAndMaybeStoreLength(); setNoBytesRemainingAndMaybeStoreLength(castNonNull(requestDataSpec.key));
return C.RESULT_END_OF_INPUT; return C.RESULT_END_OF_INPUT;
} }
handleBeforeThrow(e); handleBeforeThrow(e);
@ -660,12 +665,13 @@ public final class CacheDataSource implements DataSource {
* opened if it's possible to switch to reading from or writing to the cache. If a switch isn't * opened if it's possible to switch to reading from or writing to the cache. If a switch isn't
* possible then the current source is left unchanged. * possible then the current source is left unchanged.
* *
* @param requestDataSpec The original {@link DataSpec} to build upon for the next source.
* @param checkCache If true tries to switch to reading from or writing to cache instead of * @param checkCache If true tries to switch to reading from or writing to cache instead of
* reading from {@link #upstreamDataSource}, which is the currently open source. * reading from {@link #upstreamDataSource}, which is the currently open source.
*/ */
private void openNextSource(boolean checkCache) throws IOException { private void openNextSource(DataSpec requestDataSpec, boolean checkCache) throws IOException {
@Nullable CacheSpan nextSpan; @Nullable CacheSpan nextSpan;
String key = requestDataSpec.key; String key = castNonNull(requestDataSpec.key);
if (currentRequestIgnoresCache) { if (currentRequestIgnoresCache) {
nextSpan = null; nextSpan = null;
} else if (blockOnCache) { } else if (blockOnCache) {
@ -689,7 +695,7 @@ public final class CacheDataSource implements DataSource {
requestDataSpec.buildUpon().setPosition(readPosition).setLength(bytesRemaining).build(); requestDataSpec.buildUpon().setPosition(readPosition).setLength(bytesRemaining).build();
} else if (nextSpan.isCached) { } else if (nextSpan.isCached) {
// Data is cached in a span file starting at nextSpan.position. // Data is cached in a span file starting at nextSpan.position.
Uri fileUri = Uri.fromFile(nextSpan.file); Uri fileUri = Uri.fromFile(castNonNull(nextSpan.file));
long filePositionOffset = nextSpan.position; long filePositionOffset = nextSpan.position;
long positionInFile = readPosition - filePositionOffset; long positionInFile = readPosition - filePositionOffset;
long length = nextSpan.length - positionInFile; long length = nextSpan.length - positionInFile;
@ -741,7 +747,7 @@ public final class CacheDataSource implements DataSource {
try { try {
closeCurrentSource(); closeCurrentSource();
} catch (Throwable e) { } catch (Throwable e) {
if (nextSpan.isHoleSpan()) { if (castNonNull(nextSpan).isHoleSpan()) {
// Release the hole span before throwing, else we'll hold it forever. // Release the hole span before throwing, else we'll hold it forever.
cache.releaseHoleSpan(nextSpan); cache.releaseHoleSpan(nextSpan);
} }
@ -763,7 +769,7 @@ public final class CacheDataSource implements DataSource {
ContentMetadataMutations.setContentLength(mutations, readPosition + bytesRemaining); ContentMetadataMutations.setContentLength(mutations, readPosition + bytesRemaining);
} }
if (isReadingFromUpstream()) { if (isReadingFromUpstream()) {
actualUri = currentDataSource.getUri(); actualUri = nextDataSource.getUri();
boolean isRedirected = !requestDataSpec.uri.equals(actualUri); boolean isRedirected = !requestDataSpec.uri.equals(actualUri);
ContentMetadataMutations.setRedirectedUri(mutations, isRedirected ? actualUri : null); ContentMetadataMutations.setRedirectedUri(mutations, isRedirected ? actualUri : null);
} }
@ -772,12 +778,12 @@ public final class CacheDataSource implements DataSource {
} }
} }
private void setNoBytesRemainingAndMaybeStoreLength() throws IOException { private void setNoBytesRemainingAndMaybeStoreLength(String key) throws IOException {
bytesRemaining = 0; bytesRemaining = 0;
if (isWritingToCache()) { if (isWritingToCache()) {
ContentMetadataMutations mutations = new ContentMetadataMutations(); ContentMetadataMutations mutations = new ContentMetadataMutations();
ContentMetadataMutations.setContentLength(mutations, readPosition); ContentMetadataMutations.setContentLength(mutations, readPosition);
cache.applyContentMetadataMutations(requestDataSpec.key, mutations); cache.applyContentMetadataMutations(key, mutations);
} }
} }

4
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheSpan.java vendored
View File

@ -32,9 +32,7 @@ public class CacheSpan implements Comparable<CacheSpan> {
* The length of the {@link CacheSpan}, or {@link C#LENGTH_UNSET} if this is an open-ended hole. * The length of the {@link CacheSpan}, or {@link C#LENGTH_UNSET} if this is an open-ended hole.
*/ */
public final long length; public final long length;
/** /** Whether the {@link CacheSpan} is cached. */
* Whether the {@link CacheSpan} is cached.
*/
public final boolean isCached; public final boolean isCached;
/** The file corresponding to this {@link CacheSpan}, or null if {@link #isCached} is false. */ /** The file corresponding to this {@link CacheSpan}, or null if {@link #isCached} is false. */
@Nullable public final File file; @Nullable public final File file;