From 124c70ac266b1c44b88573a9532681d2e47e5888 Mon Sep 17 00:00:00 2001 From: claincly Date: Tue, 23 Apr 2024 13:25:03 -0700 Subject: [PATCH] Add MIME type to match any image PiperOrigin-RevId: 627486539 --- .../src/main/java/androidx/media3/common/MimeTypes.java | 1 + .../java/androidx/media3/transformer/ImageAssetLoader.java | 4 +--- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java b/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java index 6d46ef9a14..49120d80e4 100644 --- a/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java +++ b/libraries/common/src/main/java/androidx/media3/common/MimeTypes.java @@ -166,6 +166,7 @@ public final class MimeTypes { @UnstableApi public static final String IMAGE_HEIF = BASE_TYPE_IMAGE + "/heif"; @UnstableApi public static final String IMAGE_BMP = BASE_TYPE_IMAGE + "/bmp"; @UnstableApi public static final String IMAGE_WEBP = BASE_TYPE_IMAGE + "/webp"; + @UnstableApi public static final String IMAGE_RAW = BASE_TYPE_IMAGE + "/raw"; /** * A non-standard codec string for E-AC3-JOC. Use of this constant allows for disambiguation diff --git a/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java b/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java index f85f72a1e3..183b245163 100644 --- a/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java +++ b/libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java @@ -84,8 +84,6 @@ public final class ImageAssetLoader implements AssetLoader { } } - public static final String MIME_TYPE_IMAGE_ALL = MimeTypes.BASE_TYPE_IMAGE + "/*"; - private static final int QUEUE_BITMAP_INTERVAL_MS = 10; private final EditedMediaItem editedMediaItem; @@ -136,7 +134,7 @@ public final class ImageAssetLoader implements AssetLoader { new Format.Builder() .setHeight(bitmap.getHeight()) .setWidth(bitmap.getWidth()) - .setSampleMimeType(MIME_TYPE_IMAGE_ALL) + .setSampleMimeType(MimeTypes.IMAGE_RAW) .setColorInfo(ColorInfo.SRGB_BT709_FULL) .build(); Format outputFormat =