loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-17 12:39:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't allow bad MediaSource release implementation to crash player.

Browse Source 
This also allows subsequent MediaSource instance in the list to still
be released successfully.

Issue: #7168
This commit is contained in:
Oliver Woodman 2020-05-27 20:58:42 +01:00 committed by Andrew Lewis
parent 1772b0d917
commit dfc3c507a0
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
library/core/src/main/java/com/google/android/exoplayer2/ExoPlayerImplInternal.java
View File

@ -954,7 +954,12 @@ import java.util.concurrent.atomic.AtomicBoolean;
startPositionUs); startPositionUs);
if (releaseMediaSource) { if (releaseMediaSource) {
if (mediaSource != null) { if (mediaSource != null) {
try {
mediaSource.releaseSource(/* caller= */ this); mediaSource.releaseSource(/* caller= */ this);
} catch (RuntimeException e) {
// There's nothing we can do.
Log.e(TAG, "Failed to release child source.", e);
}
mediaSource = null; mediaSource = null;
} }
} }