loliball/media
1
0
Fork 0
mirror of https://github.com/androidx/media.git synced 2025-05-15 19:49:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor trim optimization getProgress for improved readability.

Browse Source 
This change is a no-op refactor to improve the readability of the
states returned in this method.

PiperOrigin-RevId: 640538374
This commit is contained in:
samrobinson 2024-06-05 08:42:28 -07:00 committed by Copybara-Service
parent 01b860fdc4
commit 8a02b44c96
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1196,13 +1196,18 @@ public final class Transformer {
} }
@ProgressState @ProgressState
int processMediaStartProgressState = transformerInternal.getProgress(progressHolder); int processMediaStartProgressState = transformerInternal.getProgress(progressHolder);
if (processMediaStartProgressState == PROGRESS_STATE_NOT_STARTED) { switch (processMediaStartProgressState) {
return PROGRESS_STATE_WAITING_FOR_AVAILABILITY; case PROGRESS_STATE_NOT_STARTED:
case PROGRESS_STATE_WAITING_FOR_AVAILABILITY:
return PROGRESS_STATE_WAITING_FOR_AVAILABILITY;
case PROGRESS_STATE_AVAILABLE:
progressHolder.progress = round(progressHolder.progress * transcodeWeighting);
return PROGRESS_STATE_AVAILABLE;
case PROGRESS_STATE_UNAVAILABLE:
return PROGRESS_STATE_UNAVAILABLE;
default:
throw new IllegalStateException();
} }
if (processMediaStartProgressState == PROGRESS_STATE_AVAILABLE) {
progressHolder.progress = round(progressHolder.progress * transcodeWeighting);
}
return processMediaStartProgressState;
} }
float fullTranscodeProgress = 100 * transcodeWeighting; float fullTranscodeProgress = 100 * transcodeWeighting;
@ -1213,15 +1218,20 @@ public final class Transformer {
} }
@ProgressState @ProgressState
int remuxRemainingMediaProgressState = transformerInternal.getProgress(progressHolder); int remuxRemainingMediaProgressState = transformerInternal.getProgress(progressHolder);
if (remuxRemainingMediaProgressState == PROGRESS_STATE_NOT_STARTED switch (remuxRemainingMediaProgressState) {
|| remuxRemainingMediaProgressState == PROGRESS_STATE_WAITING_FOR_AVAILABILITY) { case PROGRESS_STATE_NOT_STARTED:
progressHolder.progress = round(fullTranscodeProgress); case PROGRESS_STATE_WAITING_FOR_AVAILABILITY:
return PROGRESS_STATE_AVAILABLE; progressHolder.progress = round(fullTranscodeProgress);
} else if (remuxRemainingMediaProgressState == PROGRESS_STATE_AVAILABLE) { return PROGRESS_STATE_AVAILABLE;
progressHolder.progress = case PROGRESS_STATE_AVAILABLE:
round(fullTranscodeProgress + (1 - transcodeWeighting) * progressHolder.progress); progressHolder.progress =
round(fullTranscodeProgress + (1 - transcodeWeighting) * progressHolder.progress);
return PROGRESS_STATE_AVAILABLE;
case PROGRESS_STATE_UNAVAILABLE:
return PROGRESS_STATE_UNAVAILABLE;
default:
throw new IllegalStateException();
} }
return remuxRemainingMediaProgressState;
} }
/** /**