sjs/media
1
0
Fork 0
mirror of https://github.com/samsonjs/media.git synced 2026-04-05 11:15:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the Mp4 embedded WebVTT playback

Browse source 
Issue: #1185
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=117136646
This commit is contained in:
olly 2016-03-14 08:47:18 -07:00 committed by Oliver Woodman
parent 028ce2582c
commit c98f7e8348
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
library/src/main/java/com/google/android/exoplayer/dash/mpd/MediaPresentationDescriptionParser.java
View file

@ -629,11 +629,14 @@ public class MediaPresentationDescriptionParser extends DefaultHandler
return getVideoMediaMimeType(codecs);
} else if (mimeTypeIsRawText(containerMimeType)) {
return containerMimeType;
} else if (MimeTypes.APPLICATION_MP4.equals(containerMimeType) && "stpp".equals(codecs)) {
return MimeTypes.APPLICATION_TTML;
} else {
return null;
} else if (MimeTypes.APPLICATION_MP4.equals(containerMimeType)) {
if ("stpp".equals(codecs)) {
return MimeTypes.APPLICATION_TTML;
} else if ("wvtt".equals(codecs)) {
return MimeTypes.APPLICATION_MP4VTT;
}
}
return null;
}
/**

2
library/src/main/java/com/google/android/exoplayer/text/TextTrackRenderer.java
View file

@ -90,7 +90,7 @@ public final class TextTrackRenderer extends SampleSourceTrackRenderer implement
}
try {
DEFAULT_PARSER_CLASSES.add(
Class.forName("com.google.android.exoplayer.text.mp4webvtt.Mp4WebvttParser")
Class.forName("com.google.android.exoplayer.text.webvtt.Mp4WebvttParser")
.asSubclass(SubtitleParser.class));
} catch (ClassNotFoundException e) {
// Parser not found.