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

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); return getVideoMediaMimeType(codecs);
} else if (mimeTypeIsRawText(containerMimeType)) { } else if (mimeTypeIsRawText(containerMimeType)) {
return containerMimeType; return containerMimeType;
} else if (MimeTypes.APPLICATION_MP4.equals(containerMimeType) && "stpp".equals(codecs)) { } else if (MimeTypes.APPLICATION_MP4.equals(containerMimeType)) {
return MimeTypes.APPLICATION_TTML; if ("stpp".equals(codecs)) {
} else { return MimeTypes.APPLICATION_TTML;
return null; } 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 { try {
DEFAULT_PARSER_CLASSES.add( 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)); .asSubclass(SubtitleParser.class));
} catch (ClassNotFoundException e) { } catch (ClassNotFoundException e) {
// Parser not found. // Parser not found.