From 37806ee792eb595d8524899a0386548d4600a56b Mon Sep 17 00:00:00 2001 From: cdrolle Date: Fri, 30 Sep 2016 07:33:10 -0700 Subject: [PATCH] Added Basic CEA-708 caption support to ExoPlayer V2, roughly equivalent to the current state of CEA-608. It's still missing window (and the associated positioning and formatting) support, emulating a 3-line rollup. Currently this has only been tested with the RawCC container, though it should work with anything that makes use of SeiReader (i.e. MPEG2-TS) with minimal changes to SeiReader. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=134781660 --- .../source/dash/manifest/DashManifestParser.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java index 143a0e995b..78cb8f5c7f 100644 --- a/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java +++ b/library/src/main/java/com/google/android/exoplayer2/source/dash/manifest/DashManifestParser.java @@ -654,10 +654,10 @@ public class DashManifestParser extends DefaultHandler } else if (MimeTypes.isVideo(containerMimeType)) { return MimeTypes.getVideoMediaMimeType(codecs); } else if (MimeTypes.APPLICATION_RAWCC.equals(containerMimeType)) { - // We currently only support CEA-608 through RawCC - if (codecs != null - && (codecs.contains("eia608") || codecs.contains("cea608"))) { - return MimeTypes.APPLICATION_CEA608; + if (codecs != null) { + if (codecs.contains("eia608") || codecs.contains("cea608")) { + return MimeTypes.APPLICATION_CEA608; + } } return null; } else if (mimeTypeIsRawText(containerMimeType)) {