sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-03 10:55:48 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update Mimetypes to include supported image mimetypes

Browse source 
PiperOrigin-RevId: 555433856
This commit is contained in:
tofunmi 2023-08-10 10:38:11 +00:00 committed by Tianyi Feng
parent d4b452d475
commit 7a85236655
2 changed files with 18 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
libraries/common/src/main/java/androidx/media3/common/MimeTypes.java
View file

@ -156,6 +156,9 @@ public final class MimeTypes {
public static final String IMAGE_JPEG = BASE_TYPE_IMAGE + "/jpeg";
@UnstableApi public static final String IMAGE_PNG = BASE_TYPE_IMAGE + "/png";
@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";
/**
* A non-standard codec string for E-AC3-JOC. Use of this constant allows for disambiguation

24
libraries/common/src/test/java/androidx/media3/common/MimeTypesTest.java
View file

@ -111,15 +111,21 @@ public final class MimeTypesTest {
assertThat(MimeTypes.isText(MimeTypes.VIDEO_H264)).isFalse();
assertThat(MimeTypes.isText(MimeTypes.AUDIO_MP4)).isFalse();
assertThat(MimeTypes.isText(MimeTypes.AUDIO_AAC)).isFalse();
assertThat(MimeTypes.isText(MimeTypes.IMAGE_JPEG)).isFalse();
assertThat(MimeTypes.isText("application/custom")).isFalse();
}
@Test
public void isImage_returnsCorrectResult() {
assertThat(MimeTypes.isImage(MimeTypes.IMAGE_JPEG)).isTrue();
assertThat(MimeTypes.isImage(MimeTypes.IMAGE_PNG)).isTrue();
assertThat(MimeTypes.isImage(MimeTypes.IMAGE_HEIF)).isTrue();
assertThat(MimeTypes.isImage(MimeTypes.IMAGE_BMP)).isTrue();
assertThat(MimeTypes.isImage(MimeTypes.IMAGE_WEBP)).isTrue();
assertThat(MimeTypes.isImage("image/custom")).isTrue();
assertThat(MimeTypes.isImage(MimeTypes.VIDEO_MP4)).isFalse();
assertThat(MimeTypes.isImage(MimeTypes.AUDIO_AAC)).isFalse();
assertThat(MimeTypes.isImage("application/custom")).isFalse();
}
@ -259,15 +265,6 @@ public final class MimeTypesTest {
assert_getObjectTypeFromMp4aRFC6381CodecString_for_returns("mp4a.D0.9", 0xd0, 9);
}
private static void assert_getObjectTypeFromMp4aRFC6381CodecString_for_returns(
String codec, int expectedObjectTypeIndicator, int expectedAudioObjectTypeIndicator) {
@Nullable
MimeTypes.Mp4aObjectType objectType = MimeTypes.getObjectTypeFromMp4aRFC6381CodecString(codec);
assertThat(objectType).isNotNull();
assertThat(objectType.objectTypeIndication).isEqualTo(expectedObjectTypeIndicator);
assertThat(objectType.audioObjectTypeIndication).isEqualTo(expectedAudioObjectTypeIndicator);
}
@Test
public void allSamplesAreSyncSamples_forAac_usesCodec() {
assertThat(MimeTypes.allSamplesAreSyncSamples(MimeTypes.AUDIO_AAC, "mp4a.40." + AACObjectHE))
@ -280,4 +277,13 @@ public final class MimeTypesTest {
assertThat(MimeTypes.allSamplesAreSyncSamples(MimeTypes.AUDIO_AAC, /* codec= */ null))
.isFalse();
}
private static void assert_getObjectTypeFromMp4aRFC6381CodecString_for_returns(
String codec, int expectedObjectTypeIndicator, int expectedAudioObjectTypeIndicator) {
@Nullable
MimeTypes.Mp4aObjectType objectType = MimeTypes.getObjectTypeFromMp4aRFC6381CodecString(codec);
assertThat(objectType).isNotNull();
assertThat(objectType.objectTypeIndication).isEqualTo(expectedObjectTypeIndicator);
assertThat(objectType.audioObjectTypeIndication).isEqualTo(expectedAudioObjectTypeIndicator);
}
}