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

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

Browse source 
PiperOrigin-RevId: 398247348
This commit is contained in:
bachinger 2021-09-22 16:40:14 +01:00
parent 59cd783dd4
commit f2a027e068
65 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

0
library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java → library/common/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleDecoder.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java → library/common/src/main/java/com/google/android/exoplayer2/text/SimpleSubtitleOutputBuffer.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java → library/common/src/main/java/com/google/android/exoplayer2/text/span/HorizontalTextInVerticalContextSpan.java
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/CueTest.java → library/common/src/test/java/com/google/android/exoplayer2/text/CueTest.java
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
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
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/PgsSubtitle.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/pgs/package-info.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDecoder.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaDialogueFormat.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaStyle.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/SsaSubtitle.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ssa/package-info.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripDecoder.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/SubripSubtitle.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/subrip/package-info.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/DeleteTextSpan.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/DeleteTextSpan.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TextEmphasis.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TextEmphasis.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlDecoder.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlNode.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRegion.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtil.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlStyle.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/TtmlSubtitle.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/ttml/package-info.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoder.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/Tx3gSubtitle.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/tx3g/package-info.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoder.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttSubtitle.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParser.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParser.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCssStyle.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueInfo.java
View file

16
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParser.java
View file

@ -15,7 +15,6 @@
*/ */
package com.google.android.exoplayer2.text.webvtt; 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.Math.min;
import static java.lang.annotation.RetentionPolicy.SOURCE; 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.Cue;
import com.google.android.exoplayer2.text.span.HorizontalTextInVerticalContextSpan; import com.google.android.exoplayer2.text.span.HorizontalTextInVerticalContextSpan;
import com.google.android.exoplayer2.text.span.RubySpan; 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.text.span.TextAnnotation;
import com.google.android.exoplayer2.util.Assertions; import com.google.android.exoplayer2.util.Assertions;
import com.google.android.exoplayer2.util.Log; import com.google.android.exoplayer2.util.Log;
@ -662,7 +662,7 @@ public final class WebvttCueParser {
return; return;
} }
if (style.getStyle() != WebvttCssStyle.UNSPECIFIED) { if (style.getStyle() != WebvttCssStyle.UNSPECIFIED) {
addOrReplaceSpan( SpanUtil.addOrReplaceSpan(
spannedText, spannedText,
new StyleSpan(style.getStyle()), new StyleSpan(style.getStyle()),
start, start,
@ -676,7 +676,7 @@ public final class WebvttCueParser {
spannedText.setSpan(new UnderlineSpan(), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); spannedText.setSpan(new UnderlineSpan(), start, end, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
if (style.hasFontColor()) { if (style.hasFontColor()) {
addOrReplaceSpan( SpanUtil.addOrReplaceSpan(
spannedText, spannedText,
new ForegroundColorSpan(style.getFontColor()), new ForegroundColorSpan(style.getFontColor()),
start, start,
@ -684,7 +684,7 @@ public final class WebvttCueParser {
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
if (style.hasBackgroundColor()) { if (style.hasBackgroundColor()) {
addOrReplaceSpan( SpanUtil.addOrReplaceSpan(
spannedText, spannedText,
new BackgroundColorSpan(style.getBackgroundColor()), new BackgroundColorSpan(style.getBackgroundColor()),
start, start,
@ -692,7 +692,7 @@ public final class WebvttCueParser {
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
} }
if (style.getFontFamily() != null) { if (style.getFontFamily() != null) {
addOrReplaceSpan( SpanUtil.addOrReplaceSpan(
spannedText, spannedText,
new TypefaceSpan(style.getFontFamily()), new TypefaceSpan(style.getFontFamily()),
start, start,
@ -701,7 +701,7 @@ public final class WebvttCueParser {
} }
switch (style.getFontSizeUnit()) { switch (style.getFontSizeUnit()) {
case WebvttCssStyle.FONT_SIZE_UNIT_PIXEL: case WebvttCssStyle.FONT_SIZE_UNIT_PIXEL:
addOrReplaceSpan( SpanUtil.addOrReplaceSpan(
spannedText, spannedText,
new AbsoluteSizeSpan((int) style.getFontSize(), true), new AbsoluteSizeSpan((int) style.getFontSize(), true),
start, start,
@ -709,7 +709,7 @@ public final class WebvttCueParser {
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
break; break;
case WebvttCssStyle.FONT_SIZE_UNIT_EM: case WebvttCssStyle.FONT_SIZE_UNIT_EM:
addOrReplaceSpan( SpanUtil.addOrReplaceSpan(
spannedText, spannedText,
new RelativeSizeSpan(style.getFontSize()), new RelativeSizeSpan(style.getFontSize()),
start, start,
@ -717,7 +717,7 @@ public final class WebvttCueParser {
Spanned.SPAN_EXCLUSIVE_EXCLUSIVE); Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
break; break;
case WebvttCssStyle.FONT_SIZE_UNIT_PERCENT: case WebvttCssStyle.FONT_SIZE_UNIT_PERCENT:
addOrReplaceSpan( SpanUtil.addOrReplaceSpan(
spannedText, spannedText,
new RelativeSizeSpan(style.getFontSize() / 100), new RelativeSizeSpan(style.getFontSize() / 100),
start, start,

0
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoder.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttParserUtil.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitle.java
View file

0
library/core/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java → library/extractor/src/main/java/com/google/android/exoplayer2/text/webvtt/package-info.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/ssa/SsaDecoderTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/subrip/SubripDecoderTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TextEmphasisTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TextEmphasisTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlDecoderTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlRenderUtilTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/ttml/TtmlStyleTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/tx3g/Tx3gDecoderTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/Mp4WebvttDecoderTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParserTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCssParserTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttCueParserTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttDecoderTest.java
View file

0
library/core/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java → library/extractor/src/test/java/com/google/android/exoplayer2/text/webvtt/WebvttSubtitleTest.java
View file