Skip to content

SDK / exoplayer

Go to a project
Commit e28d434c by huangdarwin Committed by Rohit Singh
Options

Effect: Automatically save bitmaps in pixel test. 

Also, omit the "actual" label from output files, as this boilerplate isn't necessary
(it doesn't disambiguate between any other saved filename like "expected").

PiperOrigin-RevId: 502378188
parent 9789b39c
Inline Side-by-side
Showing with 66 additions and 58 deletions
library/effect/src/androidTest/java/com/google/android/exoplayer2/effect/GlEffectsFrameProcessorPixelTest.java
...@@ -114,12 +114,12 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -114,12 +114,12 @@ public final class GlEffectsFrameProcessorPixelTest {
@Test @Test
public void processData_noEdits_producesExpectedOutput() throws Exception { public void processData_noEdits_producesExpectedOutput() throws Exception {
String testId = "processData_noEdits"; String testId = "processData_noEdits";
glEffectsFrameProcessorTestRunner = new GlEffectsFrameProcessorTestRunner.Builder().build(); glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder(testId).build();
Bitmap expectedBitmap = readBitmap(ORIGINAL_PNG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(ORIGINAL_PNG_ASSET_PATH);
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -130,14 +130,13 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -130,14 +130,13 @@ public final class GlEffectsFrameProcessorPixelTest {
public void processData_noEditsWithCache_leavesFrameUnchanged() throws Exception { public void processData_noEditsWithCache_leavesFrameUnchanged() throws Exception {
String testId = "processData_noEditsWithCache"; String testId = "processData_noEditsWithCache";
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setEffects(new FrameCache(/* capacity= */ 5)) .setEffects(new FrameCache(/* capacity= */ 5))
.build(); .build();
Bitmap expectedBitmap = readBitmap(ORIGINAL_PNG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(ORIGINAL_PNG_ASSET_PATH);
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -148,12 +147,11 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -148,12 +147,11 @@ public final class GlEffectsFrameProcessorPixelTest {
public void processData_withPixelWidthHeightRatio_producesExpectedOutput() throws Exception { public void processData_withPixelWidthHeightRatio_producesExpectedOutput() throws Exception {
String testId = "processData_withPixelWidthHeightRatio"; String testId = "processData_withPixelWidthHeightRatio";
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder().setPixelWidthHeightRatio(2f).build(); new GlEffectsFrameProcessorTestRunner.Builder(testId).setPixelWidthHeightRatio(2f).build();
Bitmap expectedBitmap = readBitmap(SCALE_WIDE_PNG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(SCALE_WIDE_PNG_ASSET_PATH);
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -167,14 +165,13 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -167,14 +165,13 @@ public final class GlEffectsFrameProcessorPixelTest {
Matrix translateRightMatrix = new Matrix(); Matrix translateRightMatrix = new Matrix();
translateRightMatrix.postTranslate(/* dx= */ 1, /* dy= */ 0); translateRightMatrix.postTranslate(/* dx= */ 1, /* dy= */ 0);
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setEffects((MatrixTransformation) (long presentationTimeNs) -> translateRightMatrix) .setEffects((MatrixTransformation) (long presentationTimeNs) -> translateRightMatrix)
.build(); .build();
Bitmap expectedBitmap = readBitmap(TRANSLATE_RIGHT_PNG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(TRANSLATE_RIGHT_PNG_ASSET_PATH);
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -188,7 +185,7 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -188,7 +185,7 @@ public final class GlEffectsFrameProcessorPixelTest {
Matrix translateRightMatrix = new Matrix(); Matrix translateRightMatrix = new Matrix();
translateRightMatrix.postTranslate(/* dx= */ 1, /* dy= */ 0); translateRightMatrix.postTranslate(/* dx= */ 1, /* dy= */ 0);
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setEffects( .setEffects(
(MatrixTransformation) (long presentationTimeUs) -> translateRightMatrix, (MatrixTransformation) (long presentationTimeUs) -> translateRightMatrix,
new ScaleToFitTransformation.Builder().setRotationDegrees(45).build()) new ScaleToFitTransformation.Builder().setRotationDegrees(45).build())
...@@ -197,7 +194,6 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -197,7 +194,6 @@ public final class GlEffectsFrameProcessorPixelTest {
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -211,7 +207,7 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -211,7 +207,7 @@ public final class GlEffectsFrameProcessorPixelTest {
Matrix translateRightMatrix = new Matrix(); Matrix translateRightMatrix = new Matrix();
translateRightMatrix.postTranslate(/* dx= */ 1, /* dy= */ 0); translateRightMatrix.postTranslate(/* dx= */ 1, /* dy= */ 0);
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setEffects( .setEffects(
new ScaleToFitTransformation.Builder().setRotationDegrees(45).build(), new ScaleToFitTransformation.Builder().setRotationDegrees(45).build(),
(MatrixTransformation) (long presentationTimeUs) -> translateRightMatrix) (MatrixTransformation) (long presentationTimeUs) -> translateRightMatrix)
...@@ -220,7 +216,6 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -220,7 +216,6 @@ public final class GlEffectsFrameProcessorPixelTest {
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -232,14 +227,13 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -232,14 +227,13 @@ public final class GlEffectsFrameProcessorPixelTest {
throws Exception { throws Exception {
String testId = "processData_withPresentation_createForHeight"; String testId = "processData_withPresentation_createForHeight";
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setEffects(Presentation.createForHeight(480)) .setEffects(Presentation.createForHeight(480))
.build(); .build();
Bitmap expectedBitmap = readBitmap(REQUEST_OUTPUT_HEIGHT_PNG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(REQUEST_OUTPUT_HEIGHT_PNG_ASSET_PATH);
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -250,7 +244,7 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -250,7 +244,7 @@ public final class GlEffectsFrameProcessorPixelTest {
public void processData_withCropThenPresentation_producesExpectedOutput() throws Exception { public void processData_withCropThenPresentation_producesExpectedOutput() throws Exception {
String testId = "processData_withCropThenPresentation"; String testId = "processData_withCropThenPresentation";
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setEffects( .setEffects(
new Crop(/* left= */ -.5f, /* right= */ .5f, /* bottom= */ -.5f, /* top= */ .5f), new Crop(/* left= */ -.5f, /* right= */ .5f, /* bottom= */ -.5f, /* top= */ .5f),
Presentation.createForAspectRatio( Presentation.createForAspectRatio(
...@@ -260,7 +254,6 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -260,7 +254,6 @@ public final class GlEffectsFrameProcessorPixelTest {
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -272,14 +265,13 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -272,14 +265,13 @@ public final class GlEffectsFrameProcessorPixelTest {
throws Exception { throws Exception {
String testId = "processData_withScaleToFitTransformation_rotate45"; String testId = "processData_withScaleToFitTransformation_rotate45";
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setEffects(new ScaleToFitTransformation.Builder().setRotationDegrees(45).build()) .setEffects(new ScaleToFitTransformation.Builder().setRotationDegrees(45).build())
.build(); .build();
Bitmap expectedBitmap = readBitmap(ROTATE45_SCALE_TO_FIT_PNG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(ROTATE45_SCALE_TO_FIT_PNG_ASSET_PATH);
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -291,7 +283,7 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -291,7 +283,7 @@ public final class GlEffectsFrameProcessorPixelTest {
throws Exception { throws Exception {
String testId = "processData_withTwoWrappedScaleToFitTransformations"; String testId = "processData_withTwoWrappedScaleToFitTransformations";
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setEffects( .setEffects(
new GlEffectWrapper( new GlEffectWrapper(
new ScaleToFitTransformation.Builder().setRotationDegrees(45).build()), new ScaleToFitTransformation.Builder().setRotationDegrees(45).build()),
...@@ -304,7 +296,6 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -304,7 +296,6 @@ public final class GlEffectsFrameProcessorPixelTest {
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -326,22 +317,20 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -326,22 +317,20 @@ public final class GlEffectsFrameProcessorPixelTest {
full10StepRotationAndCenterCrop.add(centerCrop); full10StepRotationAndCenterCrop.add(centerCrop);
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder().setEffects(centerCrop).build(); new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setOutputFileLabel("centerCrop")
.setEffects(centerCrop)
.build();
Bitmap centerCropResultBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap centerCropResultBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
glEffectsFrameProcessorTestRunner.release(); glEffectsFrameProcessorTestRunner.release();
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setOutputFileLabel("full10StepRotationAndCenterCrop")
.setEffects(full10StepRotationAndCenterCrop.build()) .setEffects(full10StepRotationAndCenterCrop.build())
.build(); .build();
Bitmap fullRotationAndCenterCropResultBitmap = Bitmap fullRotationAndCenterCropResultBitmap =
glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(
testId, /* bitmapLabel= */ "centerCrop", centerCropResultBitmap);
maybeSaveTestBitmapToCacheDirectory(
testId,
/* bitmapLabel= */ "full10StepRotationAndCenterCrop",
fullRotationAndCenterCropResultBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888( getBitmapAveragePixelAbsoluteDifferenceArgb8888(
...@@ -358,12 +347,13 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -358,12 +347,13 @@ public final class GlEffectsFrameProcessorPixelTest {
new RgbAdjustment.Builder().setGreenScale(5).build(), new RgbAdjustment.Builder().setGreenScale(5).build(),
new RgbAdjustment.Builder().setBlueScale(5).build()); new RgbAdjustment.Builder().setBlueScale(5).build());
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder().setEffects(increaseBrightness).build(); new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setEffects(increaseBrightness)
.build();
Bitmap expectedBitmap = readBitmap(INCREASE_BRIGHTNESS_PNG_ASSET_PATH); Bitmap expectedBitmap = readBitmap(INCREASE_BRIGHTNESS_PNG_ASSET_PATH);
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -387,7 +377,8 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -387,7 +377,8 @@ public final class GlEffectsFrameProcessorPixelTest {
new Rotation(/* degrees= */ 90), new Rotation(/* degrees= */ 90),
centerCrop); centerCrop);
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setOutputFileLabel("centerCrop")
.setEffects( .setEffects(
new RgbAdjustment.Builder().setRedScale(5).setBlueScale(5).setGreenScale(5).build(), new RgbAdjustment.Builder().setRedScale(5).setBlueScale(5).setGreenScale(5).build(),
centerCrop) centerCrop)
...@@ -397,18 +388,13 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -397,18 +388,13 @@ public final class GlEffectsFrameProcessorPixelTest {
glEffectsFrameProcessorTestRunner.release(); glEffectsFrameProcessorTestRunner.release();
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setOutputFileLabel("full4StepRotationBrightnessIncreaseAndCenterCrop")
.setEffects(increaseBrightnessFullRotationCenterCrop) .setEffects(increaseBrightnessFullRotationCenterCrop)
.build(); .build();
Bitmap fullRotationBrightnessIncreaseAndCenterCropResultBitmap = Bitmap fullRotationBrightnessIncreaseAndCenterCropResultBitmap =
glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(
testId, /* bitmapLabel= */ "centerCrop", centerCropAndBrightnessIncreaseResultBitmap);
maybeSaveTestBitmapToCacheDirectory(
testId,
/* bitmapLabel= */ "full4StepRotationBrightnessIncreaseAndCenterCrop",
fullRotationBrightnessIncreaseAndCenterCropResultBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888( getBitmapAveragePixelAbsoluteDifferenceArgb8888(
...@@ -438,7 +424,8 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -438,7 +424,8 @@ public final class GlEffectsFrameProcessorPixelTest {
new FrameCache(/* capacity= */ 2), new FrameCache(/* capacity= */ 2),
centerCrop); centerCrop);
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setOutputFileLabel("centerCrop")
.setEffects( .setEffects(
new RgbAdjustment.Builder().setRedScale(5).setBlueScale(5).setGreenScale(5).build(), new RgbAdjustment.Builder().setRedScale(5).setBlueScale(5).setGreenScale(5).build(),
centerCrop) centerCrop)
...@@ -447,19 +434,14 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -447,19 +434,14 @@ public final class GlEffectsFrameProcessorPixelTest {
glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
glEffectsFrameProcessorTestRunner.release(); glEffectsFrameProcessorTestRunner.release();
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setOutputFileLabel("full4StepRotationBrightnessIncreaseAndCenterCrop")
.setEffects(increaseBrightnessFullRotationCenterCrop) .setEffects(increaseBrightnessFullRotationCenterCrop)
.build(); .build();
Bitmap fullRotationBrightnessIncreaseAndCenterCropResultBitmap = Bitmap fullRotationBrightnessIncreaseAndCenterCropResultBitmap =
glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(
testId, /* bitmapLabel= */ "centerCrop", centerCropAndBrightnessIncreaseResultBitmap);
maybeSaveTestBitmapToCacheDirectory(
testId,
/* bitmapLabel= */ "full4StepRotationBrightnessIncreaseAndCenterCrop",
fullRotationBrightnessIncreaseAndCenterCropResultBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888( getBitmapAveragePixelAbsoluteDifferenceArgb8888(
...@@ -474,7 +456,7 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -474,7 +456,7 @@ public final class GlEffectsFrameProcessorPixelTest {
throws Exception { throws Exception {
String testId = "drawFrame_grayscaleAndIncreaseRedChannel"; String testId = "drawFrame_grayscaleAndIncreaseRedChannel";
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setEffects( .setEffects(
RgbFilter.createGrayscaleFilter(), RgbFilter.createGrayscaleFilter(),
new RgbAdjustment.Builder().setRedScale(3).build()) new RgbAdjustment.Builder().setRedScale(3).build())
...@@ -483,7 +465,6 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -483,7 +465,6 @@ public final class GlEffectsFrameProcessorPixelTest {
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -508,7 +489,7 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -508,7 +489,7 @@ public final class GlEffectsFrameProcessorPixelTest {
.setColorTransfer(C.COLOR_TRANSFER_GAMMA_2_2) .setColorTransfer(C.COLOR_TRANSFER_GAMMA_2_2)
.build(); .build();
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setVideoAssetPath(INPUT_HLG_MP4_ASSET_STRING) .setVideoAssetPath(INPUT_HLG_MP4_ASSET_STRING)
.setInputColorInfo(hlgColor) .setInputColorInfo(hlgColor)
.setOutputColorInfo(toneMapSdrColor) .setOutputColorInfo(toneMapSdrColor)
...@@ -517,7 +498,6 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -517,7 +498,6 @@ public final class GlEffectsFrameProcessorPixelTest {
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -542,7 +522,7 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -542,7 +522,7 @@ public final class GlEffectsFrameProcessorPixelTest {
.setColorTransfer(C.COLOR_TRANSFER_GAMMA_2_2) .setColorTransfer(C.COLOR_TRANSFER_GAMMA_2_2)
.build(); .build();
glEffectsFrameProcessorTestRunner = glEffectsFrameProcessorTestRunner =
new GlEffectsFrameProcessorTestRunner.Builder() new GlEffectsFrameProcessorTestRunner.Builder(testId)
.setVideoAssetPath(INPUT_PQ_MP4_ASSET_STRING) .setVideoAssetPath(INPUT_PQ_MP4_ASSET_STRING)
.setInputColorInfo(pqColor) .setInputColorInfo(pqColor)
.setOutputColorInfo(toneMapSdrColor) .setOutputColorInfo(toneMapSdrColor)
...@@ -551,7 +531,6 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -551,7 +531,6 @@ public final class GlEffectsFrameProcessorPixelTest {
Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd(); Bitmap actualBitmap = glEffectsFrameProcessorTestRunner.processFirstFrameAndEnd();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ "actual", actualBitmap);
// TODO(b/207848601): switch to using proper tooling for testing against golden data. // TODO(b/207848601): switch to using proper tooling for testing against golden data.
float averagePixelAbsoluteDifference = float averagePixelAbsoluteDifference =
getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId); getBitmapAveragePixelAbsoluteDifferenceArgb8888(expectedBitmap, actualBitmap, testId);
...@@ -566,14 +545,22 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -566,14 +545,22 @@ public final class GlEffectsFrameProcessorPixelTest {
/** A builder for {@link GlEffectsFrameProcessorTestRunner} instances. */ /** A builder for {@link GlEffectsFrameProcessorTestRunner} instances. */
public static final class Builder { public static final class Builder {
private final String testId;
private String outputFileLabel;
private @Nullable ImmutableList<Effect> effects; private @Nullable ImmutableList<Effect> effects;
private String videoAssetPath; private String videoAssetPath;
private float pixelWidthHeightRatio; private float pixelWidthHeightRatio;
private ColorInfo inputColorInfo; private ColorInfo inputColorInfo;
private ColorInfo outputColorInfo; private ColorInfo outputColorInfo;
/** Creates a new instance with default values. */ /**
public Builder() { * Creates a new instance with default values.
*
* @param testId Test ID used to generate output files.
*/
public Builder(String testId) {
this.testId = testId;
outputFileLabel = "";
videoAssetPath = INPUT_SDR_MP4_ASSET_STRING; videoAssetPath = INPUT_SDR_MP4_ASSET_STRING;
pixelWidthHeightRatio = DEFAULT_PIXEL_WIDTH_HEIGHT_RATIO; pixelWidthHeightRatio = DEFAULT_PIXEL_WIDTH_HEIGHT_RATIO;
inputColorInfo = ColorInfo.SDR_BT709_LIMITED; inputColorInfo = ColorInfo.SDR_BT709_LIMITED;
...@@ -592,6 +579,19 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -592,6 +579,19 @@ public final class GlEffectsFrameProcessorPixelTest {
} }
/** /**
* Sets the output file label.
*
* <p>This value will be postfixed after the {@code testId} to generated output files.
*
* <p>The default value is an empty string.
*/
@CanIgnoreReturnValue
public Builder setOutputFileLabel(String outputFileLabel) {
this.outputFileLabel = outputFileLabel;
return this;
}
/**
* Sets the effects used. * Sets the effects used.
* *
* <p>The default value is an empty list. * <p>The default value is an empty list.
...@@ -648,6 +648,8 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -648,6 +648,8 @@ public final class GlEffectsFrameProcessorPixelTest {
public GlEffectsFrameProcessorTestRunner build() throws FrameProcessingException { public GlEffectsFrameProcessorTestRunner build() throws FrameProcessingException {
return new GlEffectsFrameProcessorTestRunner( return new GlEffectsFrameProcessorTestRunner(
testId,
outputFileLabel,
effects == null ? ImmutableList.of() : effects, effects == null ? ImmutableList.of() : effects,
videoAssetPath, videoAssetPath,
pixelWidthHeightRatio, pixelWidthHeightRatio,
...@@ -665,6 +667,8 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -665,6 +667,8 @@ public final class GlEffectsFrameProcessorPixelTest {
*/ */
private static final int FRAME_PROCESSING_WAIT_MS = 5000; private static final int FRAME_PROCESSING_WAIT_MS = 5000;
private final String testId;
private final String outputFileLabel;
private final String videoAssetPath; private final String videoAssetPath;
private final float pixelWidthHeightRatio; private final float pixelWidthHeightRatio;
private final AtomicReference<FrameProcessingException> frameProcessingException; private final AtomicReference<FrameProcessingException> frameProcessingException;
...@@ -675,12 +679,16 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -675,12 +679,16 @@ public final class GlEffectsFrameProcessorPixelTest {
private volatile boolean frameProcessingEnded; private volatile boolean frameProcessingEnded;
private GlEffectsFrameProcessorTestRunner( private GlEffectsFrameProcessorTestRunner(
String testId,
String outputFileLabel,
ImmutableList<Effect> effects, ImmutableList<Effect> effects,
String videoAssetPath, String videoAssetPath,
float pixelWidthHeightRatio, float pixelWidthHeightRatio,
ColorInfo inputColorInfo, ColorInfo inputColorInfo,
ColorInfo outputColorInfo) ColorInfo outputColorInfo)
throws FrameProcessingException { throws FrameProcessingException {
this.testId = testId;
this.outputFileLabel = outputFileLabel;
this.videoAssetPath = videoAssetPath; this.videoAssetPath = videoAssetPath;
this.pixelWidthHeightRatio = pixelWidthHeightRatio; this.pixelWidthHeightRatio = pixelWidthHeightRatio;
frameProcessingException = new AtomicReference<>(); frameProcessingException = new AtomicReference<>();
...@@ -754,6 +762,7 @@ public final class GlEffectsFrameProcessorPixelTest { ...@@ -754,6 +762,7 @@ public final class GlEffectsFrameProcessorPixelTest {
Image frameProcessorOutputImage = checkNotNull(outputImageReader).acquireLatestImage(); Image frameProcessorOutputImage = checkNotNull(outputImageReader).acquireLatestImage();
Bitmap actualBitmap = createArgb8888BitmapFromRgba8888Image(frameProcessorOutputImage); Bitmap actualBitmap = createArgb8888BitmapFromRgba8888Image(frameProcessorOutputImage);
frameProcessorOutputImage.close(); frameProcessorOutputImage.close();
maybeSaveTestBitmapToCacheDirectory(testId, /* bitmapLabel= */ outputFileLabel, actualBitmap);
return actualBitmap; return actualBitmap;
} }
......
testdata/src/test/assets/media/bitmap/README.md
...@@ -23,7 +23,7 @@ To generate new "expected" assets: ...@@ -23,7 +23,7 @@ To generate new "expected" assets:
```shell ```shell
adb pull \ adb pull \
/sdcard/Android/data/com.google.android.exoplayer2.effect.test/cache/drawFrame_rotate90_actual.png \ /sdcard/Android/data/com.google.android.exoplayer2.effect.test/cache/drawFrame_rotate90.png \
third_party/java_src/android_libs/media/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate90.png third_party/java_src/android_libs/media/libraries/test_data/src/test/assets/media/bitmap/sample_mp4_first_frame/electrical_colors/rotate90.png
``` ```
......
testutils/src/main/java/com/google/android/exoplayer2/testutil/BitmapPixelTestUtil.java
...@@ -177,9 +177,8 @@ public class BitmapPixelTestUtil { ...@@ -177,9 +177,8 @@ public class BitmapPixelTestUtil {
*/ */
public static void maybeSaveTestBitmapToCacheDirectory( public static void maybeSaveTestBitmapToCacheDirectory(
String testId, String bitmapLabel, Bitmap bitmap) { String testId, String bitmapLabel, Bitmap bitmap) {
File file = String fileName = testId + (bitmapLabel.isEmpty() ? "" : "_" + bitmapLabel) + ".png";
new File( File file = new File(getApplicationContext().getExternalCacheDir(), fileName);
getApplicationContext().getExternalCacheDir(), testId + "_" + bitmapLabel + ".png");
try (FileOutputStream outputStream = new FileOutputStream(file)) { try (FileOutputStream outputStream = new FileOutputStream(file)) {
bitmap.compress(Bitmap.CompressFormat.PNG, /* quality= */ 100, outputStream); bitmap.compress(Bitmap.CompressFormat.PNG, /* quality= */ 100, outputStream);
} catch (IOException e) { } catch (IOException e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment