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

Throw a clear error from Cea608/708Parser.parseToLegacySubtitle

Browse Source 
This would have immediately exposed the mistakes fixed by
7ca26f898d

Issue: androidx/media#904
PiperOrigin-RevId: 592244943
This commit is contained in:
ibaker 2023-12-19 08:30:39 -08:00 committed by Copybara-Service
parent 8940900c69
commit 486230fbd7
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/extractor/src/main/java/androidx/media3/extractor/text/cea/Cea608Parser.java
View File

@ -40,6 +40,7 @@ import androidx.media3.common.util.NullableType;
import androidx.media3.common.util.ParsableByteArray; import androidx.media3.common.util.ParsableByteArray;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.extractor.text.CuesWithTiming; import androidx.media3.extractor.text.CuesWithTiming;
import androidx.media3.extractor.text.Subtitle;
import androidx.media3.extractor.text.SubtitleParser; import androidx.media3.extractor.text.SubtitleParser;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -425,6 +426,12 @@ public final class Cea608Parser implements SubtitleParser {
return CUE_REPLACEMENT_BEHAVIOR; return CUE_REPLACEMENT_BEHAVIOR;
} }
@Override
public Subtitle parseToLegacySubtitle(byte[] data, int offset, int length) {
throw new UnsupportedOperationException(
"Cannot produce Subtitle instances directly. Use Cea608Decoder instead.");
}
@Override @Override
public void parse( public void parse(
byte[] data, byte[] data,

7
libraries/extractor/src/main/java/androidx/media3/extractor/text/cea/Cea708Parser.java
View File

@ -39,6 +39,7 @@ import androidx.media3.common.util.ParsableBitArray;
import androidx.media3.common.util.ParsableByteArray; import androidx.media3.common.util.ParsableByteArray;
import androidx.media3.common.util.UnstableApi; import androidx.media3.common.util.UnstableApi;
import androidx.media3.extractor.text.CuesWithTiming; import androidx.media3.extractor.text.CuesWithTiming;
import androidx.media3.extractor.text.Subtitle;
import androidx.media3.extractor.text.SubtitleParser; import androidx.media3.extractor.text.SubtitleParser;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
@ -201,6 +202,12 @@ public final class Cea708Parser implements SubtitleParser {
return CUE_REPLACEMENT_BEHAVIOR; return CUE_REPLACEMENT_BEHAVIOR;
} }
@Override
public Subtitle parseToLegacySubtitle(byte[] data, int offset, int length) {
throw new UnsupportedOperationException(
"Cannot produce Subtitle instances directly. Use Cea708Decoder instead.");
}
@Override @Override
public void parse( public void parse(
byte[] data, byte[] data,