Commit 05c2ff34 by huangdarwin Committed by Tofunmi Adigun-Hameed

Test: Suppress SSIM timeouts on galaxy fold/flip.

This is a failure only in SSIM, so it seems unlikely we'll prioritize this over
other work or bugs soon. Suppress test failures to reduce triage burden.

PiperOrigin-RevId: 532200729
(cherry picked from commit 7050340b73529b1b8480b71676b512b9e0cf4c98)
parent 14026a5f
...@@ -73,8 +73,11 @@ public class ExportTest { ...@@ -73,8 +73,11 @@ public class ExportTest {
.build(); .build();
MediaItem mediaItem = MediaItem mediaItem =
MediaItem.fromUri(Uri.parse(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING)); 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) new TransformerAndroidTestRunner.Builder(context, transformer)
.setRequestCalculateSsim(true) .setRequestCalculateSsim(requestCalculateSsim)
.build() .build()
.run(testId, mediaItem); .run(testId, mediaItem);
} }
...@@ -114,8 +117,11 @@ public class ExportTest { ...@@ -114,8 +117,11 @@ public class ExportTest {
MediaItem.fromUri(Uri.parse(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING)); MediaItem.fromUri(Uri.parse(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING));
EditedMediaItem editedMediaItem = EditedMediaItem editedMediaItem =
new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build(); 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) new TransformerAndroidTestRunner.Builder(context, transformer)
.setRequestCalculateSsim(true) .setRequestCalculateSsim(requestCalculateSsim)
.build() .build()
.run(testId, editedMediaItem); .run(testId, editedMediaItem);
} }
...@@ -187,8 +193,11 @@ public class ExportTest { ...@@ -187,8 +193,11 @@ public class ExportTest {
MediaItem.fromUri(Uri.parse(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING)); MediaItem.fromUri(Uri.parse(MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING));
EditedMediaItem editedMediaItem = EditedMediaItem editedMediaItem =
new EditedMediaItem.Builder(mediaItem).setRemoveAudio(true).build(); 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) new TransformerAndroidTestRunner.Builder(context, transformer)
.setRequestCalculateSsim(true) .setRequestCalculateSsim(requestCalculateSsim)
.build() .build()
.run(testId, editedMediaItem); .run(testId, editedMediaItem);
} }
......
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
package com.google.android.exoplayer2.transformer.mh; package com.google.android.exoplayer2.transformer.mh;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.junit.Assume.assumeTrue;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
...@@ -32,6 +33,7 @@ import com.google.android.exoplayer2.transformer.Transformer; ...@@ -32,6 +33,7 @@ import com.google.android.exoplayer2.transformer.Transformer;
import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner; import com.google.android.exoplayer2.transformer.TransformerAndroidTestRunner;
import com.google.android.exoplayer2.transformer.VideoEncoderSettings; import com.google.android.exoplayer2.transformer.VideoEncoderSettings;
import com.google.android.exoplayer2.util.MimeTypes; import com.google.android.exoplayer2.util.MimeTypes;
import com.google.android.exoplayer2.util.Util;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -51,6 +53,8 @@ public final class TranscodeQualityTest { ...@@ -51,6 +53,8 @@ public final class TranscodeQualityTest {
/* outputFormat= */ AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_FORMAT)) { /* outputFormat= */ AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_FORMAT)) {
return; return;
} }
// TODO: b/239983127 - Remove this test skip on these devices.
assumeTrue(!Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1"));
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
...@@ -96,6 +100,8 @@ public final class TranscodeQualityTest { ...@@ -96,6 +100,8 @@ public final class TranscodeQualityTest {
.build())) { .build())) {
return; return;
} }
// TODO: b/239983127 - Remove this test skip on these devices.
assumeTrue(!Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1"));
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
......
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