From 969c50d60f2019e73f49e10804cd562731616e28 Mon Sep 17 00:00:00 2001 From: sheenachhabra Date: Thu, 2 Jan 2025 02:57:31 -0800 Subject: [PATCH] Fix HDR editing support check in dolby vision test A device (for example pixel 7) might support HDR encoding but with H265 sample mime type but the existing condition made assumption false on such devices. The test still does not pass on pixel 7 because the format matching condition is incorrect. It will be fixed in a separate CL. PiperOrigin-RevId: 711368798 --- .../androidx/media3/transformer/mh/HdrEditingTest.java | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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 =