Commit b9a3aa5c by huangdarwin Committed by Marc Baechinger

HDR: Add tests with HLG10 input.

PiperOrigin-RevId: 478019046
parent 7286155f
...@@ -42,7 +42,6 @@ import java.util.concurrent.atomic.AtomicBoolean; ...@@ -42,7 +42,6 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; 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. */ /** {@link Transformer} instrumentation test for applying an HDR frame edit. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class SetHdrEditingTest { public class SetHdrEditingTest {
...@@ -90,10 +89,7 @@ public class SetHdrEditingTest { ...@@ -90,10 +89,7 @@ public class SetHdrEditingTest {
String testId = "transformAndTranscode_hdr10File_whenHdrEditingIsSupported"; String testId = "transformAndTranscode_hdr10File_whenHdrEditingIsSupported";
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
if (!deviceSupportsHdrEditing(VIDEO_H265, HDR10_DEFAULT_COLOR_INFO)) { if (!deviceSupportsHdrEditing(VIDEO_H265, HDR10_DEFAULT_COLOR_INFO)) {
recordTestSkipped( recordTestSkipped(context, testId, /* reason= */ "Device lacks HDR10 editing support.");
context,
testId,
/* reason= */ "Skipping on this device due to lack of HDR10 editing support.");
return; return;
} }
...@@ -119,10 +115,7 @@ public class SetHdrEditingTest { ...@@ -119,10 +115,7 @@ public class SetHdrEditingTest {
String testId = "transformAndTranscode_hdr10File_toneMapsOrThrows_whenHdrEditingUnsupported"; String testId = "transformAndTranscode_hdr10File_toneMapsOrThrows_whenHdrEditingUnsupported";
Context context = ApplicationProvider.getApplicationContext(); Context context = ApplicationProvider.getApplicationContext();
if (deviceSupportsHdrEditing(VIDEO_H265, HDR10_DEFAULT_COLOR_INFO)) { if (deviceSupportsHdrEditing(VIDEO_H265, HDR10_DEFAULT_COLOR_INFO)) {
recordTestSkipped( recordTestSkipped(context, testId, /* reason= */ "Device supports HDR10 editing.");
context,
testId,
/* reason= */ "Skipping on this device due to presence of HDR10 editing support.");
return; return;
} }
...@@ -188,8 +181,7 @@ public class SetHdrEditingTest { ...@@ -188,8 +181,7 @@ public class SetHdrEditingTest {
recordTestSkipped( recordTestSkipped(
context, context,
testId, testId,
/* reason= */ "Skipping on this API version due to lack of support for" /* reason= */ "API version lacks support for MediaFormat#getInteger(String, int).");
+ " MediaFormat#getInteger(String, int).");
return; return;
} }
......
...@@ -36,7 +36,6 @@ import com.google.android.exoplayer2.util.Util; ...@@ -36,7 +36,6 @@ 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;
// 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. */ /** {@link Transformer} instrumentation test for applying an HDR to SDR tone mapping edit. */
@RunWith(AndroidJUnit4.class) @RunWith(AndroidJUnit4.class)
public class SetHdrToSdrToneMapTest { public class SetHdrToSdrToneMapTest {
......
...@@ -174,10 +174,7 @@ public class TransformationTest { ...@@ -174,10 +174,7 @@ public class TransformationTest {
if (Util.SDK_INT < 25) { if (Util.SDK_INT < 25) {
// TODO(b/210593256): Remove test skipping after removing the MediaMuxer dependency. // TODO(b/210593256): Remove test skipping after removing the MediaMuxer dependency.
recordTestSkipped( recordTestSkipped(context, testId, /* reason= */ "API version lacks muxing support");
context,
testId,
/* reason= */ "Skipping on this API version due to lack of muxing support");
return; return;
} }
......
...@@ -113,8 +113,7 @@ public class EncoderPerformanceAnalysisTest { ...@@ -113,8 +113,7 @@ public class EncoderPerformanceAnalysisTest {
recordTestSkipped( recordTestSkipped(
context, context,
testId, testId,
/* reason= */ "Skipping on this API version due to lack of support for setting operating" /* reason= */ "API version lacks support for setting operating rate and priority.");
+ " rate and priority.");
return; return;
} }
......
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