sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-27 15:07:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Refine test skipping logic

Browse source 
Skip wearable devices, which don't have the same CDD requirements on codecs from Android 5 (API 21).

Limit an existing skipping case to pre API 33 devices, so that we can catch failures on Android 13 (API 33) onwards, and add OnePlus 9 Pro which also times out calculating SSIM. Remove TODOs for removing test/SSIM skipping now they are restricted to API version.

PiperOrigin-RevId: 581985554
This commit is contained in:
andrewlewis 2023-11-13 09:12:41 -08:00 committed by Copybara-Service
parent c00161fb8f
commit 1b13c87825
2 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/ExportTest.java
View file

@ -84,11 +84,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 skipCalculateSsim =
boolean requestCalculateSsim = (Util.SDK_INT < 33 && (Util.MODEL.equals("SM-F711U1") || Util.MODEL.equals("SM-F926U1")))
!Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1"); || (Util.SDK_INT == 33 && Util.MODEL.equals("LE2121"));
new TransformerAndroidTestRunner.Builder(context, transformer) new TransformerAndroidTestRunner.Builder(context, transformer)
.setRequestCalculateSsim(requestCalculateSsim) .setRequestCalculateSsim(!skipCalculateSsim)
.build() .build()
.run(testId, mediaItem); .run(testId, mediaItem);
} }
@ -128,11 +128,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 skipCalculateSsim =
boolean requestCalculateSsim = (Util.SDK_INT < 33 && (Util.MODEL.equals("SM-F711U1") || Util.MODEL.equals("SM-F926U1")))
!Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1"); || (Util.SDK_INT == 33 && Util.MODEL.equals("LE2121"));
new TransformerAndroidTestRunner.Builder(context, transformer) new TransformerAndroidTestRunner.Builder(context, transformer)
.setRequestCalculateSsim(requestCalculateSsim) .setRequestCalculateSsim(!skipCalculateSsim)
.build() .build()
.run(testId, editedMediaItem); .run(testId, editedMediaItem);
} }
@ -254,11 +254,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 skipCalculateSsim =
boolean requestCalculateSsim = (Util.SDK_INT < 33 && (Util.MODEL.equals("SM-F711U1") || Util.MODEL.equals("SM-F926U1")))
!Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1"); || (Util.SDK_INT == 33 && Util.MODEL.equals("LE2121"));
new TransformerAndroidTestRunner.Builder(context, transformer) new TransformerAndroidTestRunner.Builder(context, transformer)
.setRequestCalculateSsim(requestCalculateSsim) .setRequestCalculateSsim(!skipCalculateSsim)
.build() .build()
.run(testId, editedMediaItem); .run(testId, editedMediaItem);
} }

19
libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TranscodeQualityTest.java
View file

@ -17,7 +17,7 @@
package androidx.media3.transformer.mh; package androidx.media3.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 static org.junit.Assume.assumeFalse;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
@ -52,9 +52,9 @@ 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. assumeFalse(
assumeTrue(!Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1")); (Util.SDK_INT < 33 && (Util.MODEL.equals("SM-F711U1") || Util.MODEL.equals("SM-F926U1")))
|| (Util.SDK_INT == 33 && Util.MODEL.equals("LE2121")));
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)
.setVideoMimeType(MimeTypes.VIDEO_H264) .setVideoMimeType(MimeTypes.VIDEO_H264)
@ -98,9 +98,9 @@ public final class TranscodeQualityTest {
.build())) { .build())) {
return; return;
} }
// TODO: b/239983127 - Remove this test skip on these devices. assumeFalse(
assumeTrue(!Util.MODEL.equals("SM-F711U1") && !Util.MODEL.equals("SM-F926U1")); (Util.SDK_INT < 33 && (Util.MODEL.equals("SM-F711U1") || Util.MODEL.equals("SM-F926U1")))
|| (Util.SDK_INT == 33 && Util.MODEL.equals("LE2121")));
Transformer transformer = Transformer transformer =
new Transformer.Builder(context).setVideoMimeType(MimeTypes.VIDEO_H265).build(); new Transformer.Builder(context).setVideoMimeType(MimeTypes.VIDEO_H265).build();
MediaItem mediaItem = MediaItem mediaItem =
@ -125,8 +125,9 @@ public final class TranscodeQualityTest {
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
String testId = "transcodeAvcToAvc320x240_ssim"; String testId = "transcodeAvcToAvc320x240_ssim";
// Note: We never skip this test as the input and output formats should be within CDD // Don't skip based on format support as input and output formats should be within CDD
// requirements on all supported API versions. // requirements on all supported API versions, except for wearable devices.
assumeFalse(Util.isWear(context));
Transformer transformer = Transformer transformer =
new Transformer.Builder(context) new Transformer.Builder(context)