Skip to content

SDK / exoplayer

Go to a project
Commit 704993ce by Oliver Woodman
Options

Merge pull request #7210 from nebyan:CacheKeyFactoryNotUsed 

PiperOrigin-RevId: 307045655
parents 7350981e a944b5cc
Inline Side-by-side
Showing with 12 additions and 26 deletions
library/core/src/main/java/com/google/android/exoplayer2/upstream/cache/CacheUtil.java
...@@ -109,7 +109,6 @@ public final class CacheUtil { ...@@ -109,7 +109,6 @@ public final class CacheUtil {
* *
* @param dataSpec Defines the data to be cached. * @param dataSpec Defines the data to be cached.
* @param cache A {@link Cache} to store the data. * @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 upstream A {@link DataSource} for reading data not in the cache.
* @param progressListener A listener to receive progress updates, or {@code null}. * @param progressListener A listener to receive progress updates, or {@code null}.
* @param isCanceled An optional flag that will interrupt caching if set to true. * @param isCanceled An optional flag that will interrupt caching if set to true.
...@@ -120,7 +119,6 @@ public final class CacheUtil { ...@@ -120,7 +119,6 @@ public final class CacheUtil {
public static void cache( public static void cache(
DataSpec dataSpec, DataSpec dataSpec,
Cache cache, Cache cache,
@Nullable CacheKeyFactory cacheKeyFactory,
DataSource upstream, DataSource upstream,
@Nullable ProgressListener progressListener, @Nullable ProgressListener progressListener,
@Nullable AtomicBoolean isCanceled) @Nullable AtomicBoolean isCanceled)
...@@ -128,7 +126,7 @@ public final class CacheUtil { ...@@ -128,7 +126,7 @@ public final class CacheUtil {
cache( cache(
dataSpec, dataSpec,
cache, cache,
cacheKeyFactory, /* cacheKeyFactory= */ null,
new CacheDataSource(cache, upstream), new CacheDataSource(cache, upstream),
new byte[DEFAULT_BUFFER_SIZE_BYTES], new byte[DEFAULT_BUFFER_SIZE_BYTES],
/* priorityTaskManager= */ null, /* priorityTaskManager= */ null,
...@@ -139,14 +137,14 @@ public final class CacheUtil { ...@@ -139,14 +137,14 @@ public final class CacheUtil {
} }
/** /**
* Caches the data defined by {@code dataSpec} while skipping already cached data. Caching stops * Caches the data defined by {@code dataSpec}, skipping already cached data. Caching stops early
* early if end of input is reached and {@code enableEOFException} is false. * 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 * <p>If a {@link PriorityTaskManager} is provided, it's used to pause and resume caching
* on {@code priority} and the priority of other tasks registered to the PriorityTaskManager. * depending on {@code priority} and the priority of other tasks registered to the
* Please note that it's the responsibility of the calling code to call {@link * PriorityTaskManager. Please note that it's the responsibility of the calling code to call
* PriorityTaskManager#add} to register with the manager before calling this method, and to call * {@link PriorityTaskManager#add} to register with the manager before calling this method, and to
* {@link PriorityTaskManager#remove} afterwards to unregister. * call {@link PriorityTaskManager#remove} afterwards to unregister.
* *
* <p>This method may be slow and shouldn't normally be called on the main thread. * <p>This method may be slow and shouldn't normally be called on the main thread.
* *
......
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheDataSourceTest.java
...@@ -360,7 +360,6 @@ public final class CacheDataSourceTest { ...@@ -360,7 +360,6 @@ public final class CacheDataSourceTest {
CacheUtil.cache( CacheUtil.cache(
unboundedDataSpec, unboundedDataSpec,
cache, cache,
/* cacheKeyFactory= */ null,
upstream2, upstream2,
/* progressListener= */ null, /* progressListener= */ null,
/* isCanceled= */ null); /* isCanceled= */ null);
...@@ -409,7 +408,6 @@ public final class CacheDataSourceTest { ...@@ -409,7 +408,6 @@ public final class CacheDataSourceTest {
CacheUtil.cache( CacheUtil.cache(
unboundedDataSpec, unboundedDataSpec,
cache, cache,
/* cacheKeyFactory= */ null,
upstream2, upstream2,
/* progressListener= */ null, /* progressListener= */ null,
/* isCanceled= */ null); /* isCanceled= */ null);
...@@ -433,7 +431,6 @@ public final class CacheDataSourceTest { ...@@ -433,7 +431,6 @@ public final class CacheDataSourceTest {
CacheUtil.cache( CacheUtil.cache(
dataSpec, dataSpec,
cache, cache,
/* cacheKeyFactory= */ null,
upstream, upstream,
/* progressListener= */ null, /* progressListener= */ null,
/* isCanceled= */ null); /* isCanceled= */ null);
...@@ -469,7 +466,6 @@ public final class CacheDataSourceTest { ...@@ -469,7 +466,6 @@ public final class CacheDataSourceTest {
CacheUtil.cache( CacheUtil.cache(
dataSpec, dataSpec,
cache, cache,
/* cacheKeyFactory= */ null,
upstream, upstream,
/* progressListener= */ null, /* progressListener= */ null,
/* isCanceled= */ null); /* isCanceled= */ null);
......
library/core/src/test/java/com/google/android/exoplayer2/upstream/cache/CacheUtilTest.java
...@@ -203,7 +203,6 @@ public final class CacheUtilTest { ...@@ -203,7 +203,6 @@ public final class CacheUtilTest {
CacheUtil.cache( CacheUtil.cache(
new DataSpec(Uri.parse("test_data")), new DataSpec(Uri.parse("test_data")),
cache, cache,
/* cacheKeyFactory= */ null,
dataSource, dataSource,
counters, counters,
/* isCanceled= */ null); /* isCanceled= */ null);
...@@ -220,8 +219,7 @@ public final class CacheUtilTest { ...@@ -220,8 +219,7 @@ public final class CacheUtilTest {
Uri testUri = Uri.parse("test_data"); Uri testUri = Uri.parse("test_data");
DataSpec dataSpec = new DataSpec(testUri, /* position= */ 10, /* length= */ 20); DataSpec dataSpec = new DataSpec(testUri, /* position= */ 10, /* length= */ 20);
CachingCounters counters = new CachingCounters(); CachingCounters counters = new CachingCounters();
CacheUtil.cache( CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
counters.assertValues(0, 20, 20); counters.assertValues(0, 20, 20);
counters.reset(); counters.reset();
...@@ -229,7 +227,6 @@ public final class CacheUtilTest { ...@@ -229,7 +227,6 @@ public final class CacheUtilTest {
CacheUtil.cache( CacheUtil.cache(
new DataSpec(testUri), new DataSpec(testUri),
cache, cache,
/* cacheKeyFactory= */ null,
dataSource, dataSource,
counters, counters,
/* isCanceled= */ null); /* isCanceled= */ null);
...@@ -247,8 +244,7 @@ public final class CacheUtilTest { ...@@ -247,8 +244,7 @@ public final class CacheUtilTest {
DataSpec dataSpec = new DataSpec(Uri.parse("test_data")); DataSpec dataSpec = new DataSpec(Uri.parse("test_data"));
CachingCounters counters = new CachingCounters(); CachingCounters counters = new CachingCounters();
CacheUtil.cache( CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
counters.assertValues(0, 100, 100); counters.assertValues(0, 100, 100);
assertCachedData(cache, fakeDataSet); assertCachedData(cache, fakeDataSet);
...@@ -264,8 +260,7 @@ public final class CacheUtilTest { ...@@ -264,8 +260,7 @@ public final class CacheUtilTest {
Uri testUri = Uri.parse("test_data"); Uri testUri = Uri.parse("test_data");
DataSpec dataSpec = new DataSpec(testUri, /* position= */ 10, /* length= */ 20); DataSpec dataSpec = new DataSpec(testUri, /* position= */ 10, /* length= */ 20);
CachingCounters counters = new CachingCounters(); CachingCounters counters = new CachingCounters();
CacheUtil.cache( CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
counters.assertValues(0, 20, 20); counters.assertValues(0, 20, 20);
counters.reset(); counters.reset();
...@@ -273,7 +268,6 @@ public final class CacheUtilTest { ...@@ -273,7 +268,6 @@ public final class CacheUtilTest {
CacheUtil.cache( CacheUtil.cache(
new DataSpec(testUri), new DataSpec(testUri),
cache, cache,
/* cacheKeyFactory= */ null,
dataSource, dataSource,
counters, counters,
/* isCanceled= */ null); /* isCanceled= */ null);
...@@ -290,8 +284,7 @@ public final class CacheUtilTest { ...@@ -290,8 +284,7 @@ public final class CacheUtilTest {
Uri testUri = Uri.parse("test_data"); Uri testUri = Uri.parse("test_data");
DataSpec dataSpec = new DataSpec(testUri, /* position= */ 0, /* length= */ 1000); DataSpec dataSpec = new DataSpec(testUri, /* position= */ 0, /* length= */ 1000);
CachingCounters counters = new CachingCounters(); CachingCounters counters = new CachingCounters();
CacheUtil.cache( CacheUtil.cache(dataSpec, cache, dataSource, counters, /* isCanceled= */ null);
dataSpec, cache, /* cacheKeyFactory= */ null, dataSource, counters, /* isCanceled= */ null);
counters.assertValues(0, 100, 1000); counters.assertValues(0, 100, 1000);
assertCachedData(cache, fakeDataSet); assertCachedData(cache, fakeDataSet);
...@@ -340,7 +333,6 @@ public final class CacheUtilTest { ...@@ -340,7 +333,6 @@ public final class CacheUtilTest {
CacheUtil.cache( CacheUtil.cache(
new DataSpec(Uri.parse("test_data")), new DataSpec(Uri.parse("test_data")),
cache, cache,
/* cacheKeyFactory= */ null,
dataSource, dataSource,
counters, counters,
/* isCanceled= */ null); /* isCanceled= */ null);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment