Move text classes from lib-exoplayer to lib-extractor and lib-common

PiperOrigin-RevId: 398247348

Move text classes from lib-exoplayer to lib-extractor and lib-common
PiperOrigin-RevId: 398247348
f2a027e0 · bachinger · 59cd783d · f2a027e0 · f2a027e0 · f2a027e0
Commit f2a027e0 authored Sep 22, 2021 by bachinger
Showing with 8 additions and 8 deletions
library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java → library/common/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java
library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java → library/common/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java
library/core/src/main/java/com/google/android/exoplayer2/text/span/LanguageFeatureSpan.java → library/common/src/main/java/com/google/android/exoplayer2/text/span/LanguageFeatureSpan.java
library/core/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java → library/common/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java
library/core/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java → library/common/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java
library/core/src/main/java/com/google/android/exoplayer2/text/span/TextAnnotation.java → library/common/src/main/java/com/google/android/exoplayer2/text/span/TextAnnotation.java
library/core/src/main/java/com/google/android/exoplayer2/text/span/TextEmphasisSpan.java → library/common/src/main/java/com/google/android/exoplayer2/text/span/TextEmphasisSpan.java
library/core/src/main/java/com/google/android/exoplayer2/text/span/package-info.java → library/common/src/main/java/com/google/android/exoplayer2/text/span/package-info.java
library/core/src/test/java/com/google/android/exoplayer2/text/CueTest.java → library/common/src/test/java/com/google/android/exoplayer2/text/CueTest.java
library/core/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java → library/common/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java
library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java
library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java
library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java
library/core/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java
library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java
library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java
library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java
library/core/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java
library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/span/LanguageFeatureSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/span/LanguageFeatureSpan.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/span/RubySpan.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/span/SpanUtil.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/span/TextAnnotation.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/span/TextAnnotation.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/span/TextEmphasisSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/span/TextEmphasisSpan.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/span/package-info.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/span/package-info.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/CueTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/CueTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/span/SpanUtilTest.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea608Decoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/Cea708Decoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/CeaSubtitle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/cea/package-info.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbParser.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/DvbSubtitle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/dvb/package-info.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/DeleteTextSpan.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/DeleteTextSpan.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TextEmphasis.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TextEmphasis.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParser.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParser.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
+++ b/library/core/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,

--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java
--- a/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java
+++ b/library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TextEmphasisTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TextEmphasisTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParserTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParserTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
--- a/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
+++ b/library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java