Skip to content

fix(android): cancel stale source initialization #5057

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
OskarEichler wants to merge 1 commit into
base: support/6.x.x
Choose a base branch
from
Open

fix(android): cancel stale source initialization #5057

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 28 additions & 24 deletions android/src/main/java/com/brentvatne/exoplayer/ReactExoplayerView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -628,7 +628,7 @@ private void initializePlayer() {
// This ensures all props have been settled, to avoid async racing conditions.
Source runningSource = source;
mainRunnable = () -> {
if (viewHasDropped && runningSource == source) {
if (viewHasDropped || runningSource != source) {
return;
}
try {
Expand Down Expand Up @@ -657,32 +657,36 @@ private void initializePlayer() {
// DRM session manager creation must be done on a different thread to prevent crashes so we start a new thread
ExecutorService es = Executors.newSingleThreadExecutor();
es.execute(() -> {
// DRM initialization must run on a different thread
if (viewHasDropped && runningSource == source) {
return;
}
if (activity == null) {
DebugLog.e(TAG, "Failed to initialize Player!, null activity");
eventEmitter.onVideoError.invoke("Failed to initialize Player!", new Exception("Current Activity is null!"), "1001");
return;
}

// Initialize handler to run on the main thread
activity.runOnUiThread(() -> {
if (viewHasDropped && runningSource == source) {
try {
// DRM initialization must run on a different thread
if (viewHasDropped || runningSource != source) {
return;
}
try {
// Source initialization must run on the main thread
initializePlayerSource(runningSource);
} catch (Exception ex) {
self.playerNeedsSource = true;
DebugLog.e(TAG, "Failed to initialize Player! 1");
DebugLog.e(TAG, ex.toString());
ex.printStackTrace();
eventEmitter.onVideoError.invoke(ex.toString(), ex, "1001");
if (activity == null) {
DebugLog.e(TAG, "Failed to initialize Player!, null activity");
eventEmitter.onVideoError.invoke("Failed to initialize Player!", new Exception("Current Activity is null!"), "1001");
return;
}
});

// Initialize handler to run on the main thread
activity.runOnUiThread(() -> {
if (viewHasDropped || runningSource != source) {
return;
}
try {
// Source initialization must run on the main thread
initializePlayerSource(runningSource);
} catch (Exception ex) {
self.playerNeedsSource = true;
DebugLog.e(TAG, "Failed to initialize Player! 1");
DebugLog.e(TAG, ex.toString());
ex.printStackTrace();
eventEmitter.onVideoError.invoke(ex.toString(), ex, "1001");
}
});
} finally {
es.shutdown();
}
});
} else if (runningSource == source) {
initializePlayerSource(runningSource);
Expand Down
Loading