From 186f516b658e5b0e5f262fb5fd2f6e28cf76af26 Mon Sep 17 00:00:00 2001 From: huangdarwin Date: Fri, 30 Sep 2022 17:02:37 +0000 Subject: [PATCH] HDR: Add tests with HLG10 input. PiperOrigin-RevId: 478019046 (cherry picked from commit 6e5a4c05b5f4404b09628ae9e9029d046b601865) --- .../media3/transformer/mh/SetHdrEditingTest.java | 14 +++----------- .../transformer/mh/SetHdrToSdrToneMapTest.java | 1 - .../media3/transformer/mh/TransformationTest.java | 5 +---- .../analysis/EncoderPerformanceAnalysisTest.java | 3 +-- 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java index 2eb9d6012a..ff5914aaa3 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrEditingTest.java @@ -42,7 +42,6 @@ import java.util.concurrent.atomic.AtomicBoolean; import org.junit.Test; import org.junit.runner.RunWith; -// TODO(b/239172735): Add HLG tests after finding a shareable HLG file. /** {@link Transformer} instrumentation test for applying an HDR frame edit. */ @RunWith(AndroidJUnit4.class) public class SetHdrEditingTest { @@ -90,10 +89,7 @@ public class SetHdrEditingTest { String testId = "transformAndTranscode_hdr10File_whenHdrEditingIsSupported"; Context context = ApplicationProvider.getApplicationContext(); if (!deviceSupportsHdrEditing(VIDEO_H265, HDR10_DEFAULT_COLOR_INFO)) { - recordTestSkipped( - context, - testId, - /* reason= */ "Skipping on this device due to lack of HDR10 editing support."); + recordTestSkipped(context, testId, /* reason= */ "Device lacks HDR10 editing support."); return; } @@ -119,10 +115,7 @@ public class SetHdrEditingTest { String testId = "transformAndTranscode_hdr10File_toneMapsOrThrows_whenHdrEditingUnsupported"; Context context = ApplicationProvider.getApplicationContext(); if (deviceSupportsHdrEditing(VIDEO_H265, HDR10_DEFAULT_COLOR_INFO)) { - recordTestSkipped( - context, - testId, - /* reason= */ "Skipping on this device due to presence of HDR10 editing support."); + recordTestSkipped(context, testId, /* reason= */ "Device supports HDR10 editing."); return; } @@ -188,8 +181,7 @@ public class SetHdrEditingTest { recordTestSkipped( context, testId, - /* reason= */ "Skipping on this API version due to lack of support for" - + " MediaFormat#getInteger(String, int)."); + /* reason= */ "API version lacks support for MediaFormat#getInteger(String, int)."); return; } diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrToSdrToneMapTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrToSdrToneMapTest.java index 22b9e4d458..a1a40d2802 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrToSdrToneMapTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/SetHdrToSdrToneMapTest.java @@ -36,7 +36,6 @@ import androidx.test.ext.junit.runners.AndroidJUnit4; import org.junit.Test; import org.junit.runner.RunWith; -// TODO(b/239172735): Add HLG tests after finding a shareable HLG file. /** {@link Transformer} instrumentation test for applying an HDR to SDR tone mapping edit. */ @RunWith(AndroidJUnit4.class) public class SetHdrToSdrToneMapTest { diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformationTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformationTest.java index 94d0129453..882b3089e9 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformationTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/TransformationTest.java @@ -174,10 +174,7 @@ public class TransformationTest { if (Util.SDK_INT < 25) { // TODO(b/210593256): Remove test skipping after removing the MediaMuxer dependency. - recordTestSkipped( - context, - testId, - /* reason= */ "Skipping on this API version due to lack of muxing support"); + recordTestSkipped(context, testId, /* reason= */ "API version lacks muxing support"); return; } diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java index 475d491f92..8a63393ba7 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/analysis/EncoderPerformanceAnalysisTest.java @@ -113,8 +113,7 @@ public class EncoderPerformanceAnalysisTest { recordTestSkipped( context, testId, - /* reason= */ "Skipping on this API version due to lack of support for setting operating" - + " rate and priority."); + /* reason= */ "API version lacks support for setting operating rate and priority."); return; }