Skip to content

Dispose the ExoPlayer before SurfaceProducer. #7824

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

Merged
matanlurey merged 5 commits into from
Oct 8, 2024
Merged

Dispose the ExoPlayer before SurfaceProducer. #7824

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8b84d30
Fix order of calling release.
matanlurey Oct 8, 2024
f71f502
Update test.
matanlurey Oct 8, 2024
9da2cfe
Remove logs.
matanlurey Oct 8, 2024
61b3ef4
Format.
matanlurey Oct 8, 2024
4fa424a
++
matanlurey Oct 8, 2024
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
6 changes: 6 additions & 0 deletions packages/video_player/video_player_android/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
## 2.7.10

* Fixes a [bug](https://github.com/flutter/flutter/issues/156158) where
disposing a video player (including implicitly by switching tabs or views
in a running app) would cause native stack traces.

## 2.7.9

* Updates Java compatibility version to 11.
Expand Down
2 changes: 1 addition & 1 deletion ...ideo_player_android/android/src/main/java/io/flutter/plugins/videoplayer/VideoPlayer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ long getPosition() {
}

void dispose() {
surfaceProducer.release();
exoPlayer.release();
surfaceProducer.release();
}
}
11 changes: 8 additions & 3 deletions ..._player_android/android/src/test/java/io/flutter/plugins/videoplayer/VideoPlayerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
import org.junit.runner.RunWith;
import org.mockito.ArgumentCaptor;
import org.mockito.Captor;
import org.mockito.InOrder;
import org.mockito.Mock;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
Expand Down Expand Up @@ -264,12 +265,16 @@ public void onSurfaceCreatedWithoutDestroyDoesNotRecreate() {
}

@Test
public void disposeReleasesTextureAndPlayer() {
public void disposeReleasesExoPlayerBeforeTexture() {
VideoPlayer videoPlayer = createVideoPlayer();

videoPlayer.dispose();

verify(mockProducer).release();
verify(mockExoPlayer).release();
// Regression test for https://github.com/flutter/flutter/issues/156158.
// The player must be destroyed before the surface it is writing to.
InOrder inOrder = inOrder(mockExoPlayer, mockProducer);
inOrder.verify(mockExoPlayer).release();
inOrder.verify(mockProducer).release();
}

// TODO(matanlurey): Replace with inline calls to onSurfaceAvailable once
Expand Down
2 changes: 1 addition & 1 deletion packages/video_player/video_player_android/pubspec.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ name: video_player_android
description: Android implementation of the video_player plugin.
repository: https://github.com/flutter/packages/tree/main/packages/video_player/video_player_android
issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+video_player%22
version: 2.7.9
version: 2.7.10

environment:
sdk: ^3.5.0
Expand Down