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

Pass required value into TransformationTestResult.Builder constructor

Browse Source 
PiperOrigin-RevId: 495842393
This commit is contained in:
samrobinson 2022-12-16 12:37:47 +00:00 committed by Tianyi Feng
parent c566b77449
commit aecc810937
2 changed files with 15 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/TransformationTestResult.java
View File

@ -17,7 +17,6 @@ package com.google.android.exoplayer2.transformer;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import com.google.android.exoplayer2.C; import com.google.android.exoplayer2.C;
import com.google.android.exoplayer2.util.Assertions;
import com.google.errorprone.annotations.CanIgnoreReturnValue; import com.google.errorprone.annotations.CanIgnoreReturnValue;
import org.json.JSONException; import org.json.JSONException;
import org.json.JSONObject; import org.json.JSONObject;
@ -29,7 +28,7 @@ public class TransformationTestResult {
/** A builder for {@link TransformationTestResult}. */ /** A builder for {@link TransformationTestResult}. */
public static class Builder { public static class Builder {
@Nullable private TransformationResult transformationResult; private final TransformationResult transformationResult;
@Nullable private String filePath; @Nullable private String filePath;
private long elapsedTimeMs; private long elapsedTimeMs;
private double ssim; private double ssim;
@ -37,25 +36,12 @@ public class TransformationTestResult {
@Nullable private Exception analysisException; @Nullable private Exception analysisException;
/** Creates a new {@link Builder}. */ /** Creates a new {@link Builder}. */
public Builder() { public Builder(TransformationResult transformationResult) {
this.transformationResult = transformationResult;
this.elapsedTimeMs = C.TIME_UNSET; this.elapsedTimeMs = C.TIME_UNSET;
this.ssim = SSIM_UNSET; this.ssim = SSIM_UNSET;
} }
/**
* Sets the {@link TransformationResult} of the transformation.
*
* <p>This field must be set.
*
* @param transformationResult The {@link TransformationResult}.
* @return This {@link Builder}
*/
@CanIgnoreReturnValue
public Builder setTransformationResult(TransformationResult transformationResult) {
this.transformationResult = transformationResult;
return this;
}
/** /**
* Sets the file path of the output file. * Sets the file path of the output file.
* *
@ -130,12 +116,7 @@ public class TransformationTestResult {
/** Builds the {@link TransformationTestResult} instance. */ /** Builds the {@link TransformationTestResult} instance. */
public TransformationTestResult build() { public TransformationTestResult build() {
return new TransformationTestResult( return new TransformationTestResult(
Assertions.checkNotNull(transformationResult), transformationResult, filePath, elapsedTimeMs, ssim, testException, analysisException);
filePath,
elapsedTimeMs,
ssim,
testException,
analysisException);
} }
} }

14
library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/TransformerAndroidTestRunner.java
View File

@ -297,10 +297,7 @@ public class TransformerAndroidTestRunner {
// Block here until timeout reached or latch is counted down. // Block here until timeout reached or latch is counted down.
boolean timeoutReached = !countDownLatch.await(timeoutSeconds, SECONDS); boolean timeoutReached = !countDownLatch.await(timeoutSeconds, SECONDS);
long elapsedTimeMs = SystemClock.DEFAULT.elapsedRealtime() - startTimeMs;
TransformationTestResult.Builder testResultBuilder =
new TransformationTestResult.Builder()
.setElapsedTimeMs(SystemClock.DEFAULT.elapsedRealtime() - startTimeMs);
@Nullable Exception unexpectedException = unexpectedExceptionReference.get(); @Nullable Exception unexpectedException = unexpectedExceptionReference.get();
@Nullable @Nullable
@ -319,19 +316,20 @@ public class TransformerAndroidTestRunner {
} }
if (testException != null) { if (testException != null) {
return testResultBuilder return new TransformationTestResult.Builder(checkNotNull(transformationResultReference.get()))
.setTransformationResult(checkNotNull(transformationResultReference.get())) .setElapsedTimeMs(elapsedTimeMs)
.setTestException(testException) .setTestException(testException)
.build(); .build();
} }
// No exceptions raised, transformation has succeeded. // No exceptions raised, transformation has succeeded.
testResultBuilder TransformationTestResult.Builder testResultBuilder =
.setTransformationResult( new TransformationTestResult.Builder(
checkNotNull(transformationResultReference.get()) checkNotNull(transformationResultReference.get())
.buildUpon() .buildUpon()
.setFileSizeBytes(outputVideoFile.length()) .setFileSizeBytes(outputVideoFile.length())
.build()) .build())
.setElapsedTimeMs(elapsedTimeMs)
.setFilePath(outputVideoFile.getPath()); .setFilePath(outputVideoFile.getPath());
if (!requestCalculateSsim) { if (!requestCalculateSsim) {