sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-03-29 10:05:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #7210 from nebyan:CacheKeyFactoryNotUsed

Browse source 
PiperOrigin-RevId: 307045655
This commit is contained in:
Oliver Woodman 2020-04-20 13:28:27 +01:00 committed by Oliver Woodman
parent aea9f8e550
commit ad36f64965
3 changed files with 12 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java vendored
View file

@ -109,7 +109,6 @@ public final class CacheUtil {
*
* @param dataSpec Defines the data to be cached.
* @param cache A {@link Cache} to store the data.
* @param cacheKeyFactory An optional factory for cache keys.
* @param upstream A {@link DataSource} for reading data not in the cache.
* @param progressListener A listener to receive progress updates, or {@code null}.
* @param isCanceled An optional flag that will interrupt caching if set to true.
@ -120,7 +119,6 @@ public final class CacheUtil {
public static void cache(
DataSpec dataSpec,
Cache cache,
@Nullable CacheKeyFactory cacheKeyFactory,
DataSource upstream,
@Nullable ProgressListener progressListener,
@Nullable AtomicBoolean isCanceled)
@ -128,7 +126,7 @@ public final class CacheUtil {
cache(
dataSpec,
cache,
cacheKeyFactory,
/* cacheKeyFactory= */ null,
new CacheDataSource(cache, upstream),
new byte[DEFAULT_BUFFER_SIZE_BYTES],
/* priorityTaskManager= */ null,
@ -139,14 +137,14 @@ public final class CacheUtil {
}
/**
* Caches the data defined by {@code dataSpec} while skipping already cached data. Caching stops
* early if end of input is reached and {@code enableEOFException} is false.
* Caches the data defined by {@code dataSpec}, skipping already cached data. Caching stops early
* if end of input is reached and {@code enableEOFException} is false.
*
* <p>If a {@link PriorityTaskManager} is given, it's used to pause and resume caching depending
* on {@code priority} and the priority of other tasks registered to the PriorityTaskManager.
* Please note that it's the responsibility of the calling code to call {@link
* PriorityTaskManager#add} to register with the manager before calling this method, and to call
* {@link PriorityTaskManager#remove} afterwards to unregister.
* <p>If a {@link PriorityTaskManager} is provided, it's used to pause and resume caching
* depending on {@code priority} and the priority of other tasks registered to the
* PriorityTaskManager. Please note that it's the responsibility of the calling code to call
* {@link PriorityTaskManager#add} to register with the manager before calling this method, and to
* call {@link PriorityTaskManager#remove} afterwards to unregister.
*
* <p>This method may be slow and shouldn't normally be called on the main thread.
*

4
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java vendored
View file

@ -365,7 +365,6 @@ public final class CacheDataSourceTest {
CacheUtil.cache(
unboundedDataSpec,
cache,
/* cacheKeyFactory= */ null,
upstream2,
/* progressListener= */ null,
/* isCanceled= */ null);
@ -414,7 +413,6 @@ public final class CacheDataSourceTest {
CacheUtil.cache(
unboundedDataSpec,
cache,
/* cacheKeyFactory= */ null,
upstream2,
/* progressListener= */ null,
/* isCanceled= */ null);
@ -438,7 +436,6 @@ public final class CacheDataSourceTest {
CacheUtil.cache(
dataSpec,
cache,
/* cacheKeyFactory= */ null,
upstream,
/* progressListener= */ null,
/* isCanceled= */ null);
@ -474,7 +471,6 @@ public final class CacheDataSourceTest {
CacheUtil.cache(
dataSpec,
cache,
/* cacheKeyFactory= */ null,
upstream,
/* progressListener= */ null,
/* isCanceled= */ null);

16
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java vendored
View file

@ -207,7 +207,6 @@ public final class CacheUtilTest {
CacheUtil.cache(
new DataSpec(Uri.parse("test_data")),
cache,
/* cacheKeyFactory= */ null,
dataSource,
counters,
/* isCanceled= */ null);
@ -224,8 +223,7 @@ public final class CacheUtilTest {
Uri testUri = Uri.parse("test_data");
DataSpec dataSpec = new DataSpec(testUri, 10, 20, null);
CachingCounters counters = new CachingCounters();
CacheUtil.cache(
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
counters.assertValues(0, 20, 20);
counters.reset();
@ -233,7 +231,6 @@ public final class CacheUtilTest {
CacheUtil.cache(
new DataSpec(testUri),
cache,
/* cacheKeyFactory= */ null,
dataSource,
counters,
/* isCanceled= */ null);
@ -251,8 +248,7 @@ public final class CacheUtilTest {
DataSpec dataSpec = new DataSpec(Uri.parse("test_data"));
CachingCounters counters = new CachingCounters();
CacheUtil.cache(
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
counters.assertValues(0, 100, 100);
assertCachedData(cache, fakeDataSet);
@ -268,8 +264,7 @@ public final class CacheUtilTest {
Uri testUri = Uri.parse("test_data");
DataSpec dataSpec = new DataSpec(testUri, 10, 20, null);
CachingCounters counters = new CachingCounters();
CacheUtil.cache(
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
counters.assertValues(0, 20, 20);
counters.reset();
@ -277,7 +272,6 @@ public final class CacheUtilTest {
CacheUtil.cache(
new DataSpec(testUri),
cache,
/* cacheKeyFactory= */ null,
dataSource,
counters,
/* isCanceled= */ null);
@ -294,8 +288,7 @@ public final class CacheUtilTest {
Uri testUri = Uri.parse("test_data");
DataSpec dataSpec = new DataSpec(testUri, 0, 1000, null);
CachingCounters counters = new CachingCounters();
CacheUtil.cache(
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
counters.assertValues(0, 100, 1000);
assertCachedData(cache, fakeDataSet);
@ -344,7 +337,6 @@ public final class CacheUtilTest {
CacheUtil.cache(
new DataSpec(Uri.parse("test_data")),
cache,
/* cacheKeyFactory= */ null,
dataSource,
counters,
/* isCanceled= */ null);