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

Add MediaParser-based implementation of ChunkExtractor

Browse Source 
PiperOrigin-RevId: 315720712
This commit is contained in:
aquilescanta 2020-06-10 18:42:53 +01:00 committed by Oliver Woodman
parent 3ce57ae2e8
commit e7da26368a
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
library/common/src/main/java/com/google/android/exoplayer2/util/MimeTypes.java
View File

@ -529,6 +529,16 @@ public final class MimeTypes {
} }
} }
/** Returns whether the given {@code mimeType} is a WebM MIME type. */
public static boolean isWebm(@Nullable String mimeType) {
if (mimeType == null) {
return false;
}
return mimeType.startsWith(MimeTypes.VIDEO_WEBM)
|| mimeType.startsWith(MimeTypes.AUDIO_WEBM)
|| mimeType.startsWith(MimeTypes.APPLICATION_WEBM);
}
/** /**
* Returns the top-level type of {@code mimeType}, or null if {@code mimeType} is null or does not * Returns the top-level type of {@code mimeType}, or null if {@code mimeType} is null or does not
* contain a forward slash character ({@code '/'}). * contain a forward slash character ({@code '/'}).

8
library/dash/src/main/java/com/google/android/exoplayer2/source/dash/DefaultDashChunkSource.java
View File

@ -771,11 +771,6 @@ public class DefaultDashChunkSource implements DashChunkSource {
return getFirstSegmentNum() + availableSegmentCount - 1; return getFirstSegmentNum() + availableSegmentCount - 1;
} }
private static boolean mimeTypeIsWebm(String mimeType) {
return mimeType.startsWith(MimeTypes.VIDEO_WEBM) || mimeType.startsWith(MimeTypes.AUDIO_WEBM)
|| mimeType.startsWith(MimeTypes.APPLICATION_WEBM);
}
@Nullable @Nullable
private static ChunkExtractor createChunkExtractor( private static ChunkExtractor createChunkExtractor(
int trackType, int trackType,
@ -784,6 +779,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
List<Format> closedCaptionFormats, List<Format> closedCaptionFormats,
@Nullable TrackOutput playerEmsgTrackOutput) { @Nullable TrackOutput playerEmsgTrackOutput) {
String containerMimeType = representation.format.containerMimeType; String containerMimeType = representation.format.containerMimeType;
Extractor extractor; Extractor extractor;
if (MimeTypes.isText(containerMimeType)) { if (MimeTypes.isText(containerMimeType)) {
if (MimeTypes.APPLICATION_RAWCC.equals(containerMimeType)) { if (MimeTypes.APPLICATION_RAWCC.equals(containerMimeType)) {
@ -793,7 +789,7 @@ public class DefaultDashChunkSource implements DashChunkSource {
// All other text types are raw formats that do not need an extractor. // All other text types are raw formats that do not need an extractor.
return null; return null;
} }
} else if (mimeTypeIsWebm(containerMimeType)) { } else if (MimeTypes.isWebm(containerMimeType)) {
extractor = new MatroskaExtractor(MatroskaExtractor.FLAG_DISABLE_SEEK_FOR_CUES); extractor = new MatroskaExtractor(MatroskaExtractor.FLAG_DISABLE_SEEK_FOR_CUES);
} else { } else {
int flags = 0; int flags = 0;