From 0074a9733313570e18bb1d62b63e05f236712e5b Mon Sep 17 00:00:00 2001 From: shahddaghash Date: Tue, 7 Jan 2025 03:50:04 -0800 Subject: [PATCH] Remove unnecessary `released` condition in getProgress Removed the check for `released` flag to be able to pass the actual progress when the export completes. Also, removed resetting the `progressState` and `progressValue` to be able to get the actual progress. This block is also not necessary to have at this point. PiperOrigin-RevId: 712851526 --- .../androidx/media3/transformer/TransformerInternal.java | 9 --------- 1 file changed, 9 deletions(-) diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java index f1fc33e90b..127df7dfbc 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/TransformerInternal.java @@ -32,7 +32,6 @@ import static androidx.media3.transformer.MuxerWrapper.MUXER_RELEASE_REASON_CANC import static androidx.media3.transformer.MuxerWrapper.MUXER_RELEASE_REASON_COMPLETED; import static androidx.media3.transformer.MuxerWrapper.MUXER_RELEASE_REASON_ERROR; import static androidx.media3.transformer.Transformer.PROGRESS_STATE_AVAILABLE; -import static androidx.media3.transformer.Transformer.PROGRESS_STATE_NOT_STARTED; import static androidx.media3.transformer.TransformerUtil.getDecoderOutputColor; import static androidx.media3.transformer.TransformerUtil.getProcessedTrackType; import static androidx.media3.transformer.TransformerUtil.getValidColor; @@ -290,10 +289,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; } public @Transformer.ProgressState int getProgress(ProgressHolder progressHolder) { - if (released) { - return PROGRESS_STATE_NOT_STARTED; - } - synchronized (progressLock) { if (progressState == PROGRESS_STATE_AVAILABLE) { progressHolder.progress = progressValue; @@ -409,10 +404,6 @@ import org.checkerframework.checker.nullness.qual.MonotonicNonNull; boolean releasedPreviously = released; if (!released) { released = true; - synchronized (progressLock) { - progressState = PROGRESS_STATE_NOT_STARTED; - progressValue = 0; - } Log.i( TAG,