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

Make sure that onTransformationError is called once

Browse Source 
The second error is probably a consequence of the first one.

#minor-release

PiperOrigin-RevId: 424619944
This commit is contained in:
kimvde 2022-01-27 16:31:47 +00:00 committed by Andrew Lewis
parent cf792cc576
commit d6e5352285
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -935,26 +935,24 @@ public final class Transformer {
} catch (RuntimeException e) { } catch (RuntimeException e) {
resourceReleaseException = TransformationException.createForUnexpected(e); resourceReleaseException = TransformationException.createForUnexpected(e);
} }
if (exception == null) {
if (exception == null && resourceReleaseException == null) { // We only report the exception caused by releasing the resources if there is no other
// TODO(b/213341814): Add event flags for Transformer events. // exception. It is more intuitive to call the error callback only once and reporting the
listeners.queueEvent( // exception caused by releasing the resources can be confusing if it is a consequence of
/* eventFlag= */ C.INDEX_UNSET, // the first exception.
listener -> listener.onTransformationCompleted(mediaItem)); exception = resourceReleaseException;
listeners.flushEvents();
return;
} }
if (exception != null) { if (exception != null) {
TransformationException finalException = exception;
// TODO(b/213341814): Add event flags for Transformer events.
listeners.queueEvent( listeners.queueEvent(
/* eventFlag= */ C.INDEX_UNSET, /* eventFlag= */ C.INDEX_UNSET,
listener -> listener.onTransformationError(mediaItem, exception)); listener -> listener.onTransformationError(mediaItem, finalException));
} } else {
if (resourceReleaseException != null) {
TransformationException finalResourceReleaseException = resourceReleaseException;
listeners.queueEvent( listeners.queueEvent(
/* eventFlag= */ C.INDEX_UNSET, /* eventFlag= */ C.INDEX_UNSET,
listener -> listener.onTransformationError(mediaItem, finalResourceReleaseException)); listener -> listener.onTransformationCompleted(mediaItem));
} }
listeners.flushEvents(); listeners.flushEvents();
} }