diff --git a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java index e415bb1ce2..aa1813be55 100644 --- a/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java +++ b/libraries/transformer/src/androidTest/java/androidx/media3/transformer/mh/HdrEditingTest.java @@ -210,10 +210,13 @@ public final class HdrEditingTest { public void exportAndTranscode_dolbyVisionFile_whenHdrEditingIsSupported() throws Exception { Context context = ApplicationProvider.getApplicationContext(); Format format = MP4_ASSET_DOLBY_VISION_HDR.videoFormat; - assumeDeviceSupportsHdrEditing(testId, format); - + // Check HDR support for both VIDEO_DOLBY_VISION and VIDEO_H265 mime types. + if (EncoderUtil.getSupportedEncodersForHdrEditing(format.sampleMimeType, format.colorInfo) + .isEmpty()) { + assumeDeviceSupportsHdrEditing( + testId, format.buildUpon().setSampleMimeType(MimeTypes.VIDEO_H265).build()); + } assumeFormatsSupported(context, testId, /* inputFormat= */ format, /* outputFormat= */ format); - Transformer transformer = new Transformer.Builder(context).build(); MediaItem mediaItem = MediaItem.fromUri(Uri.parse(MP4_ASSET_DOLBY_VISION_HDR.uri)); EditedMediaItem editedMediaItem =