diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java b/library/common/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java rename to library/common/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java b/library/common/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java rename to library/common/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java b/library/common/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java rename to library/common/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/span/LanguageFeatureSpan.java b/library/common/src/main/java/com/google/android/exoplayer2/text/span/LanguageFeatureSpan.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/span/LanguageFeatureSpan.java rename to library/common/src/main/java/com/google/android/exoplayer2/text/span/LanguageFeatureSpan.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java b/library/common/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java rename to library/common/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java b/library/common/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java rename to library/common/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/span/TextAnnotation.java b/library/common/src/main/java/com/google/android/exoplayer2/text/span/TextAnnotation.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/span/TextAnnotation.java rename to library/common/src/main/java/com/google/android/exoplayer2/text/span/TextAnnotation.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/span/TextEmphasisSpan.java b/library/common/src/main/java/com/google/android/exoplayer2/text/span/TextEmphasisSpan.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/span/TextEmphasisSpan.java rename to library/common/src/main/java/com/google/android/exoplayer2/text/span/TextEmphasisSpan.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/span/package-info.java b/library/common/src/main/java/com/google/android/exoplayer2/text/span/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/span/package-info.java rename to library/common/src/main/java/com/google/android/exoplayer2/text/span/package-info.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/CueTest.java b/library/common/src/test/java/com/google/android/exoplayer2/text/CueTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/CueTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/text/CueTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java b/library/common/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java rename to library/common/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/DeleteTextSpan.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/DeleteTextSpan.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/DeleteTextSpan.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/DeleteTextSpan.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TextEmphasis.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TextEmphasis.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TextEmphasis.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TextEmphasis.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParser.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParser.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParser.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParser.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java similarity index 99% rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java index 63cfc8b8dd..f49e080d9c 100644 --- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java +++ b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java @@ -15,7 +15,6 @@ */ package com.google.android.exoplayer2.text.webvtt; -import static com.google.android.exoplayer2.text.span.SpanUtil.addOrReplaceSpan; import static java.lang.Math.min; import static java.lang.annotation.RetentionPolicy.SOURCE; @@ -39,6 +38,7 @@ import androidx.annotation.Nullable; import com.google.android.exoplayer2.text.Cue; import com.google.android.exoplayer2.text.span.HorizontalTextInVerticalContextSpan; import com.google.android.exoplayer2.text.span.RubySpan; +import com.google.android.exoplayer2.text.span.SpanUtil; import com.google.android.exoplayer2.text.span.TextAnnotation; import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Log; @@ -662,7 +662,7 @@ public final class WebvttCueParser { return; } if (style.getStyle() != WebvttCssStyle.UNSPECIFIED) { - addOrReplaceSpan( + SpanUtil.addOrReplaceSpan( spannedText, new StyleSpan(style.getStyle()), start, @@ -676,7 +676,7 @@ public final class WebvttCueParser { spannedText.setSpan(new UnderlineSpan(), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); } if (style.hasFontColor()) { - addOrReplaceSpan( + SpanUtil.addOrReplaceSpan( spannedText, new ForegroundColorSpan(style.getFontColor()), start, @@ -684,7 +684,7 @@ public final class WebvttCueParser { Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); } if (style.hasBackgroundColor()) { - addOrReplaceSpan( + SpanUtil.addOrReplaceSpan( spannedText, new BackgroundColorSpan(style.getBackgroundColor()), start, @@ -692,7 +692,7 @@ public final class WebvttCueParser { Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); } if (style.getFontFamily() != null) { - addOrReplaceSpan( + SpanUtil.addOrReplaceSpan( spannedText, new TypefaceSpan(style.getFontFamily()), start, @@ -701,7 +701,7 @@ public final class WebvttCueParser { } switch (style.getFontSizeUnit()) { case WebvttCssStyle.FONT_SIZE_UNIT_PIXEL: - addOrReplaceSpan( + SpanUtil.addOrReplaceSpan( spannedText, new AbsoluteSizeSpan((int) style.getFontSize(), true), start, @@ -709,7 +709,7 @@ public final class WebvttCueParser { Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); break; case WebvttCssStyle.FONT_SIZE_UNIT_EM: - addOrReplaceSpan( + SpanUtil.addOrReplaceSpan( spannedText, new RelativeSizeSpan(style.getFontSize()), start, @@ -717,7 +717,7 @@ public final class WebvttCueParser { Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); break; case WebvttCssStyle.FONT_SIZE_UNIT_PERCENT: - addOrReplaceSpan( + SpanUtil.addOrReplaceSpan( spannedText, new RelativeSizeSpan(style.getFontSize() / 100), start, diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java diff --git a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java b/library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java similarity index 100% rename from library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java rename to library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TextEmphasisTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TextEmphasisTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TextEmphasisTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TextEmphasisTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParserTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParserTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParserTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParserTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java diff --git a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java b/library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java similarity index 100% rename from library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java rename to library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java