diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java index dc0d777f0d..65263b2a35 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java @@ -73,8 +73,11 @@ public class ExportTest { .build(); MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING)); + // TODO: b/239983127 - Make requestCalculateSsim always true. + boolean requestCalculateSsim = + !Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1"); new TransformerAndroidTestRunner.Builder(context, transformer) - .setRequestCalculateSsim(true) + .setRequestCalculateSsim(requestCalculateSsim) .build() .run(testId, mediaItem); } @@ -114,8 +117,11 @@ public class ExportTest { MediaItem.fromUri(Uri.parse(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING)); EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build(); + // TODO: b/239983127 - Make requestCalculateSsim always true. + boolean requestCalculateSsim = + !Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1"); new TransformerAndroidTestRunner.Builder(context, transformer) - .setRequestCalculateSsim(true) + .setRequestCalculateSsim(requestCalculateSsim) .build() .run(testId, editedMediaItem); } @@ -187,8 +193,11 @@ public class ExportTest { MediaItem.fromUri(Uri.parse(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING)); EditedMediaItem editedMediaItem = new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build(); + // TODO: b/239983127 - Make requestCalculateSsim always true. + boolean requestCalculateSsim = + !Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1"); new TransformerAndroidTestRunner.Builder(context, transformer) - .setRequestCalculateSsim(true) + .setRequestCalculateSsim(requestCalculateSsim) .build() .run(testId, editedMediaItem); } diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java index 3ae1c6ff7f..76d6d2ada3 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java @@ -17,11 +17,13 @@ package androidx.media3.transformer.mh; import static com.google.common.truth.Truth.assertThat; +import static org.junit.Assume.assumeTrue; import android.content.Context; import android.net.Uri; import androidx.media3.common.MediaItem; import androidx.media3.common.MimeTypes; +import androidx.media3.common.util.Util; import androidx.media3.transformer.AndroidTestUtil; import androidx.media3.transformer.DefaultEncoderFactory; import androidx.media3.transformer.EditedMediaItem; @@ -51,6 +53,8 @@ public final class TranscodeQualityTest { /* outputFormat= */ AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_FORMAT)) { return; } + // TODO: b/239983127 - Remove this test skip on these devices. + assumeTrue(!Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1")); Transformer transformer = new Transformer.Builder(context) @@ -96,6 +100,8 @@ public final class TranscodeQualityTest { .build())) { return; } + // TODO: b/239983127 - Remove this test skip on these devices. + assumeTrue(!Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1")); Transformer transformer = new Transformer.Builder(context)