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

Fix NPE in Transformer.getProgress()

Browse Source 
If muxerWrapper.release() was throwing an exception, the progress state
was not updated and getProgress could throw an exception.

#minor-release

PiperOrigin-RevId: 424696783
This commit is contained in:
kimvde 2022-01-27 21:40:34 +00:00 committed by Andrew Lewis
parent cfbdc7ba5b
commit 3a23383bc3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libraries/transformer/src/main/java/androidx/media3/transformer/Transformer.java
View File

@ -776,6 +776,7 @@ public final class Transformer {
*/ */
private void releaseResources(boolean forCancellation) throws TransformationException { private void releaseResources(boolean forCancellation) throws TransformationException {
verifyApplicationThread(); verifyApplicationThread();
progressState = PROGRESS_STATE_NO_TRANSFORMATION;
if (player != null) { if (player != null) {
player.release(); player.release();
player = null; player = null;
@ -789,7 +790,6 @@ public final class Transformer {
} }
muxerWrapper = null; muxerWrapper = null;
} }
progressState = PROGRESS_STATE_NO_TRANSFORMATION;
} }
private void verifyApplicationThread() { private void verifyApplicationThread() {