diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java index a2b68b4632..9949bda907 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/AndroidTestUtil.java @@ -58,14 +58,14 @@ public final class AndroidTestUtil { .build(); /** Baseline profile level 3.0 H.264 stream, which should be supported on all devices. */ - public static final String MP4_ASSET_WITH_INCREASING_TIMESTAMPS_360P_15S_URI_STRING = - "asset:///media/mp4/sample_with_increasing_timestamps_360p.mp4"; + public static final String MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_URI_STRING = + "asset:///media/mp4/sample_with_increasing_timestamps_320w_240h.mp4"; - public static final Format MP4_ASSET_WITH_INCREASING_TIMESTAMPS_360P_15S_FORMAT = + public static final Format MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_FORMAT = new Format.Builder() .setSampleMimeType(MimeTypes.VIDEO_H264) - .setWidth(640) - .setHeight(360) + .setWidth(320) + .setHeight(240) .setFrameRate(30.00f) .build(); @@ -279,8 +279,8 @@ public final class AndroidTestUtil { return MP4_ASSET_FORMAT; case MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING: return MP4_ASSET_WITH_INCREASING_TIMESTAMPS_FORMAT; - case MP4_ASSET_WITH_INCREASING_TIMESTAMPS_360P_15S_URI_STRING: - return MP4_ASSET_WITH_INCREASING_TIMESTAMPS_360P_15S_FORMAT; + case MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_URI_STRING: + return MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_FORMAT; case MP4_ASSET_SEF_URI_STRING: return MP4_ASSET_SEF_FORMAT; case MP4_REMOTE_10_SECONDS_URI_STRING: diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/TranscodeQualityTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/TranscodeQualityTest.java index 50c2e48153..1b78bbeb0c 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/TranscodeQualityTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/TranscodeQualityTest.java @@ -96,9 +96,9 @@ public final class TranscodeQualityTest { } @Test - public void transcodeAvcToAvc360p_ssimIsGreaterThan90Percent() throws Exception { + public void transcodeAvcToAvc360x240_ssimIsGreaterThan90Percent() throws Exception { Context context = ApplicationProvider.getApplicationContext(); - String testId = "transcodeAvcToAvc360p_ssim"; + String testId = "transcodeAvcToAvc320x240_ssim"; // Note: We never skip this test as the input and output formats should be within CDD // requirements on all supported API versions. @@ -115,7 +115,9 @@ public final class TranscodeQualityTest { new TransformerAndroidTestRunner.Builder(context, transformer) .setCalculateSsim(true) .build() - .run(testId, AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_360P_15S_URI_STRING); + .run( + testId, + AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_URI_STRING); assertThat(result.ssim).isGreaterThan(0.90); } diff --git a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java index 27cdc8b276..b4d12ef001 100644 --- a/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java +++ b/library/transformer/src/androidTest/java/com/google/android/exoplayer2/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java @@ -51,7 +51,7 @@ public class EncoderPerformanceAnalysisTest { private static final ImmutableList INPUT_FILES = ImmutableList.of( - AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_360P_15S_URI_STRING, + AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_320W_240H_15S_URI_STRING, AndroidTestUtil.MP4_ASSET_WITH_INCREASING_TIMESTAMPS_URI_STRING, AndroidTestUtil.MP4_REMOTE_4K60_PORTRAIT_URI_STRING); diff --git a/testdata/src/test/assets/media/mp4/sample_with_increasing_timestamps_320w_240h.mp4 b/testdata/src/test/assets/media/mp4/sample_with_increasing_timestamps_320w_240h.mp4 new file mode 100644 index 0000000000..c3b140bea5 Binary files /dev/null and b/testdata/src/test/assets/media/mp4/sample_with_increasing_timestamps_320w_240h.mp4 differ