loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change test to output 16x width and height

Browse Source 
PiperOrigin-RevId: 647716870
This commit is contained in:
dancho 2024-06-28 10:00:57 -07:00 committed by Copybara-Service
parent 174d5ea530
commit 9939d77d14
5 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_0.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 47 KiB

After

Width:  |  Height:  |  Size: 24 KiB

BIN
libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_1.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 70 KiB

After

Width:  |  Height:  |  Size: 38 KiB

BIN
libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_2.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 51 KiB

After

Width:  |  Height:  |  Size: 28 KiB

BIN
libraries/test_data/src/test/assets/test-generated-goldens/transformer_sequence_effect_test/export_withCompositionPresentationAndWithPerMediaItemEffects_3.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 34 KiB

After

Width:  |  Height:  |  Size: 22 KiB

15
libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerSequenceEffectTest.java
View File

@ -18,7 +18,6 @@
package androidx.media3.transformer; package androidx.media3.transformer;
import static androidx.media3.common.util.Assertions.checkNotNull; import static androidx.media3.common.util.Assertions.checkNotNull;
import static androidx.media3.common.util.Util.SDK_INT;
import static androidx.media3.effect.DebugTraceUtil.EVENT_SURFACE_TEXTURE_TRANSFORM_FIX; import static androidx.media3.effect.DebugTraceUtil.EVENT_SURFACE_TEXTURE_TRANSFORM_FIX;
import static androidx.media3.test.utils.BitmapPixelTestUtil.readBitmap; import static androidx.media3.test.utils.BitmapPixelTestUtil.readBitmap;
import static androidx.media3.transformer.AndroidTestUtil.BT601_MOV_ASSET; import static androidx.media3.transformer.AndroidTestUtil.BT601_MOV_ASSET;
@ -45,7 +44,6 @@ import static androidx.media3.transformer.SequenceEffectTestUtil.decoderProduces
import static androidx.media3.transformer.SequenceEffectTestUtil.oneFrameFromImage; import static androidx.media3.transformer.SequenceEffectTestUtil.oneFrameFromImage;
import static androidx.media3.transformer.SequenceEffectTestUtil.tryToExportCompositionWithDecoder; import static androidx.media3.transformer.SequenceEffectTestUtil.tryToExportCompositionWithDecoder;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assume.assumeFalse;
import android.content.Context; import android.content.Context;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
@ -88,6 +86,7 @@ public final class TransformerSequenceEffectTest {
private static final String OVERLAY_PNG_ASSET_PATH = "media/png/media3test.png"; private static final String OVERLAY_PNG_ASSET_PATH = "media/png/media3test.png";
private static final int EXPORT_WIDTH = 360; private static final int EXPORT_WIDTH = 360;
private static final int EXPORT_HEIGHT = 240; private static final int EXPORT_HEIGHT = 240;
private static final int SQUARE_SIZE = 240;
private final Context context = ApplicationProvider.getApplicationContext(); private final Context context = ApplicationProvider.getApplicationContext();
@Rule public final TestName testName = new TestName(); @Rule public final TestName testName = new TestName();
@ -458,14 +457,6 @@ public final class TransformerSequenceEffectTest {
@Test @Test
public void export_withCompositionPresentationAndWithPerMediaItemEffects() throws Exception { public void export_withCompositionPresentationAndWithPerMediaItemEffects() throws Exception {
// Reference: b/296225823#comment5
assumeFalse(
"Some older MediaTek encoders have a pixel alignment of 16, which results in a 360 pixel"
+ " width being re-scaled to 368.",
SDK_INT == 27
&& (Ascii.equalsIgnoreCase(Util.MODEL, "redmi 6a")
|| Ascii.equalsIgnoreCase(Util.MODEL, "vivo 1820")));
assumeFormatsSupported( assumeFormatsSupported(
context, context,
testId, testId,
@ -474,7 +465,9 @@ public final class TransformerSequenceEffectTest {
Composition composition = Composition composition =
createComposition( createComposition(
Presentation.createForWidthAndHeight( Presentation.createForWidthAndHeight(
EXPORT_WIDTH, /* height= */ EXPORT_WIDTH, Presentation.LAYOUT_SCALE_TO_FIT), /* width= */ SQUARE_SIZE,
/* height= */ SQUARE_SIZE,
Presentation.LAYOUT_SCALE_TO_FIT),
oneFrameFromImage( oneFrameFromImage(
JPG_ASSET.uri, JPG_ASSET.uri,
ImmutableList.of( ImmutableList.of(