From 43f8d080dfc3e8958715e50685b33c4248eceee5 Mon Sep 17 00:00:00 2001 From: tofunmi Date: Tue, 16 May 2023 10:28:04 +0100 Subject: [PATCH] Update mixed input test to include images of different aspect ratios Makes this test a little more thorough. PiperOrigin-RevId: 532386515 (cherry picked from commit 88642587ac9faa4ba0d7ea9870fa1898ef90277e) --- .../media3/transformer/AndroidTestUtil.java | 1 + .../TransformerMixedInputEndToEndTest.java | 15 +++++++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java index 016f93483a..7d24c881f1 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/AndroidTestUtil.java @@ -64,6 +64,7 @@ public final class AndroidTestUtil { public static final String PNG_ASSET_URI_STRING = "asset:///media/bitmap/input_images/media3test.png"; + public static final String JPG_ASSET_URI_STRING = "asset:///media/bitmap/input_images/london.jpg"; public static final String MP4_ASSET_URI_STRING = "asset:///media/mp4/sample.mp4"; public static final Format MP4_ASSET_FORMAT = diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMixedInputEndToEndTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMixedInputEndToEndTest.java index d57403da2e..146c75ee14 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMixedInputEndToEndTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/TransformerMixedInputEndToEndTest.java @@ -17,6 +17,7 @@ package androidx.media3.transformer; +import static androidx.media3.transformer.AndroidTestUtil.JPG_ASSET_URI_STRING; import static androidx.media3.transformer.AndroidTestUtil.MP4_ASSET_URI_STRING; import static androidx.media3.transformer.AndroidTestUtil.PNG_ASSET_URI_STRING; import static com.google.common.truth.Truth.assertThat; @@ -89,8 +90,6 @@ public class TransformerMixedInputEndToEndTest { int imageFrameCount = 32; EditedMediaItem imageEditedMediaItem = createImageEditedMediaItem(PNG_ASSET_URI_STRING, /* frameCount= */ imageFrameCount); - // Result of the following command: - // ffprobe -count_frames -select_streams v:0 -show_entries stream=nb_read_frames sample.mp4 EditedMediaItem videoEditedMediaItem = createVideoEditedMediaItem(MP4_ASSET_URI_STRING, /* height= */ 480); ExportTestResult result = @@ -117,10 +116,10 @@ public class TransformerMixedInputEndToEndTest { .build(); int imageFrameCount = 33; - EditedMediaItem imageEditedMediaItem = + EditedMediaItem imageEditedMediaItem1 = createImageEditedMediaItem(PNG_ASSET_URI_STRING, /* frameCount= */ imageFrameCount); - // Result of the following command: - // ffprobe -count_frames -select_streams v:0 -show_entries stream=nb_read_frames sample.mp4 + EditedMediaItem imageEditedMediaItem2 = + createImageEditedMediaItem(JPG_ASSET_URI_STRING, /* frameCount= */ imageFrameCount); EditedMediaItem videoEditedMediaItem = createVideoEditedMediaItem(MP4_ASSET_URI_STRING, /* height= */ 360); ExportTestResult result = @@ -132,10 +131,10 @@ public class TransformerMixedInputEndToEndTest { ImmutableList.of( videoEditedMediaItem, videoEditedMediaItem, - imageEditedMediaItem, - imageEditedMediaItem, + imageEditedMediaItem1, + imageEditedMediaItem2, videoEditedMediaItem, - imageEditedMediaItem, + imageEditedMediaItem1, videoEditedMediaItem))); assertThat(result.exportResult.videoFrameCount)