loliball/media3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add MIME type to match any image

Browse Source 
PiperOrigin-RevId: 627486539
This commit is contained in:
claincly 2024-04-23 13:25:03 -07:00 committed by Copybara-Service
parent 8ff9e4a838
commit 124c70ac26
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libraries/common/src/main/java/androidx/media3/common/MimeTypes.java
View File

@ -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_HEIF = BASE_TYPE_IMAGE + "/heif";
@UnstableApi public static final String IMAGE_BMP = BASE_TYPE_IMAGE + "/bmp"; @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_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 * A non-standard codec string for E-AC3-JOC. Use of this constant allows for disambiguation

4
libraries/transformer/src/main/java/androidx/media3/transformer/ImageAssetLoader.java
View File

@ -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 static final int QUEUE_BITMAP_INTERVAL_MS = 10;
private final EditedMediaItem editedMediaItem; private final EditedMediaItem editedMediaItem;
@ -136,7 +134,7 @@ public final class ImageAssetLoader implements AssetLoader {
new Format.Builder() new Format.Builder()
.setHeight(bitmap.getHeight()) .setHeight(bitmap.getHeight())
.setWidth(bitmap.getWidth()) .setWidth(bitmap.getWidth())
.setSampleMimeType(MIME_TYPE_IMAGE_ALL) .setSampleMimeType(MimeTypes.IMAGE_RAW)
.setColorInfo(ColorInfo.SRGB_BT709_FULL) .setColorInfo(ColorInfo.SRGB_BT709_FULL)
.build(); .build();
Format outputFormat = Format outputFormat =