loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Take Executor instead of ExecutorService

Browse Source 
This also avoids shutting down the externally-provided ExecutorService,
which we shouldn't do (since we don't really own it, and didn't create
it).
This commit is contained in:
Ian Baker 2024-07-31 10:33:57 +01:00
parent ff22838c0d
commit c637774cc2
1 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libraries/exoplayer/src/main/java/androidx/media3/exoplayer/upstream/Loader.java
View File

@ -36,6 +36,7 @@ import java.lang.annotation.Documented;
import java.lang.annotation.Retention; import java.lang.annotation.Retention;
import java.lang.annotation.RetentionPolicy; import java.lang.annotation.RetentionPolicy;
import java.lang.annotation.Target; import java.lang.annotation.Target;
import java.util.concurrent.Executor;
import java.util.concurrent.ExecutorService; import java.util.concurrent.ExecutorService;
import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicBoolean;
@ -204,7 +205,8 @@ public final class Loader implements LoaderErrorThrower {
} }
} }
private final ExecutorService downloadExecutorService; private final Executor downloadExecutor;
private final Runnable downloadExecutorReleaser;
@Nullable private LoadTask<? extends Loadable> currentTask; @Nullable private LoadTask<? extends Loadable> currentTask;
@Nullable private IOException fatalError; @Nullable private IOException fatalError;
@ -216,16 +218,20 @@ public final class Loader implements LoaderErrorThrower {
* component using the loader. * component using the loader.
*/ */
public Loader(String threadNameSuffix) { public Loader(String threadNameSuffix) {
this(Util.newSingleThreadExecutor(THREAD_NAME_PREFIX + threadNameSuffix)); ExecutorService executorService =
Util.newSingleThreadExecutor(THREAD_NAME_PREFIX + threadNameSuffix);
this.downloadExecutor = executorService;
this.downloadExecutorReleaser = executorService::shutdown;
} }
/** /**
* Constructs an instance. * Constructs an instance.
* *
* @param downloadExecutorService An {@link ExecutorService} for supplying the loader's thread. * @param downloadExecutor An {@link Executor} for supplying the loader's thread.
*/ */
public Loader(ExecutorService downloadExecutorService) { public Loader(Executor downloadExecutor) {
this.downloadExecutorService = downloadExecutorService; this.downloadExecutor = downloadExecutor;
this.downloadExecutorReleaser = () -> {};
} }
/** /**
@ -307,9 +313,9 @@ public final class Loader implements LoaderErrorThrower {
currentTask.cancel(true); currentTask.cancel(true);
} }
if (callback != null) { if (callback != null) {
downloadExecutorService.execute(new ReleaseTask(callback)); downloadExecutor.execute(new ReleaseTask(callback));
} }
downloadExecutorService.shutdown(); downloadExecutorReleaser.run();
} }
// LoaderErrorThrower implementation. // LoaderErrorThrower implementation.
@ -526,7 +532,7 @@ public final class Loader implements LoaderErrorThrower {
private void execute() { private void execute() {
currentError = null; currentError = null;
downloadExecutorService.execute(Assertions.checkNotNull(currentTask)); downloadExecutor.execute(Assertions.checkNotNull(currentTask));
} }
private void finish() { private void finish() {