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

Create local fallbackDetails to remove checkNotNull.

Browse Source 
PiperOrigin-RevId: 496664711
This commit is contained in:
tofunmi 2022-12-20 16:12:48 +00:00 committed by Tianyi Feng
parent 31e875b7a0
commit 81ffe47b23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerAndroidTestRunner.java
View File

@ -306,6 +306,7 @@ public class TransformerAndroidTestRunner {
boolean timeoutReached = !countDownLatch.await(timeoutSeconds, SECONDS); boolean timeoutReached = !countDownLatch.await(timeoutSeconds, SECONDS);
long elapsedTimeMs = SystemClock.DEFAULT.elapsedRealtime() - startTimeMs; long elapsedTimeMs = SystemClock.DEFAULT.elapsedRealtime() - startTimeMs;
@Nullable FallbackDetails fallbackDetails = fallbackDetailsReference.get();
@Nullable Exception unexpectedException = unexpectedExceptionReference.get(); @Nullable Exception unexpectedException = unexpectedExceptionReference.get();
@Nullable @Nullable
TransformationException transformationException = transformationExceptionReference.get(); TransformationException transformationException = transformationExceptionReference.get();
@ -325,7 +326,7 @@ public class TransformerAndroidTestRunner {
if (testException != null) { if (testException != null) {
return new TransformationTestResult.Builder(checkNotNull(transformationResultReference.get())) return new TransformationTestResult.Builder(checkNotNull(transformationResultReference.get()))
.setElapsedTimeMs(elapsedTimeMs) .setElapsedTimeMs(elapsedTimeMs)
.setFallbackDetails(fallbackDetailsReference.get()) .setFallbackDetails(fallbackDetails)
.setTestException(testException) .setTestException(testException)
.build(); .build();
} }
@ -338,14 +339,13 @@ public class TransformerAndroidTestRunner {
.setFileSizeBytes(outputVideoFile.length()) .setFileSizeBytes(outputVideoFile.length())
.build()) .build())
.setElapsedTimeMs(elapsedTimeMs) .setElapsedTimeMs(elapsedTimeMs)
.setFallbackDetails(fallbackDetailsReference.get()) .setFallbackDetails(fallbackDetails)
.setFilePath(outputVideoFile.getPath()); .setFilePath(outputVideoFile.getPath());
if (!requestCalculateSsim) { if (!requestCalculateSsim) {
return testResultBuilder.build(); return testResultBuilder.build();
} }
if (fallbackDetailsReference.get() != null if (fallbackDetails != null && fallbackDetails.fallbackOutputHeight != C.LENGTH_UNSET) {
&& checkNotNull(fallbackDetailsReference.get()).fallbackOutputHeight != C.LENGTH_UNSET) {
Log.i( Log.i(
TAG, TAG,
testId testId